[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress3' - android/experimental

[Tomaž Vajngerl]

 android/experimental/LOAndroid3/res/layout/activity_main.xml                          |    3 +
 android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java              |   20 +++++++++-
 android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java             |   11 ++---
 android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java |    4 +-
 4 files changed, 27 insertions(+), 11 deletions(-)

New commits:
commit d39e83c2c3478efd83601ca2403ff27895848728
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date:   Wed Oct 1 23:08:27 2014 +0200

    android: show progress spinner also when switching parts
    
    Change-Id: Ie21e71aa03eddef620d470e01daf6f1936a5d7c7

diff --git a/android/experimental/LOAndroid3/res/layout/activity_main.xml b/android/experimental/LOAndroid3/res/layout/activity_main.xml
index 9ada4d3..fd7d63b 100644
--- a/android/experimental/LOAndroid3/res/layout/activity_main.xml
+++ b/android/experimental/LOAndroid3/res/layout/activity_main.xml
@@ -22,7 +22,8 @@
             android:id="@+id/loadingPanel"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:gravity="center" >
+            android:gravity="center"
+            android:background="#9333">
 
             <ProgressBar
                 android:layout_width="wrap_content"
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
index 332e0f8..7161f14 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
@@ -10,7 +10,7 @@ public class LOKitShell {
 
     public static float getDpi() {
         DisplayMetrics metrics = LibreOfficeMainActivity.mAppContext.getResources().getDisplayMetrics();
-        return  metrics.density * 160;
+        return metrics.density * 160;
     }
 
     public static void sendEvent(LOEvent event) {
@@ -27,4 +27,22 @@ public class LOKitShell {
     public static void queueRedraw() {
         LOKitShell.sendEvent(LOEventFactory.redraw());
     }
+
+    public static void showProgressSpinner() {
+        getMainHandler().post(new Runnable() {
+            @Override
+            public void run() {
+                LibreOfficeMainActivity.mAppContext.showProgressSpinner();
+            }
+        });
+    }
+
+    public static void hideProgressSpinner() {
+        getMainHandler().post(new Runnable() {
+            @Override
+            public void run() {
+                LibreOfficeMainActivity.mAppContext.hideProgressSpinner();
+            }
+        });
+    }
 }
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index 31b9eb5..398389b 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -55,8 +55,10 @@ public class LOKitThread extends Thread {
     }
 
     private void changePart(int partIndex) {
+        LOKitShell.showProgressSpinner();
         mTileProvider.changePart(partIndex);
         refresh();
+        LOKitShell.hideProgressSpinner();
     }
 
     private boolean load(String filename) {
@@ -76,14 +78,9 @@ public class LOKitThread extends Thread {
 
         boolean isReady = mTileProvider.isReady();
         if (isReady) {
+            LOKitShell.showProgressSpinner();
             refresh();
-            LOKitShell.getMainHandler().post(new Runnable() {
-                @Override
-                public void run() {
-                    LibreOfficeMainActivity.mAppContext.hideProgressBar();
-                }
-            });
-
+            LOKitShell.hideProgressSpinner();
         }
         return isReady;
     }
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 1fce7d4..8607ebf 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -199,11 +199,11 @@ public class LibreOfficeMainActivity extends Activity {
 
     }
 
-    public void showProgressBar() {
+    public void showProgressSpinner() {
         findViewById(R.id.loadingPanel).setVisibility(View.VISIBLE);
     }
 
-    public void hideProgressBar() {
+    public void hideProgressSpinner() {
         findViewById(R.id.loadingPanel).setVisibility(View.GONE);
     }