summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.com>2014-09-30 18:00:54 +0200
committerTomaž Vajngerl <tomaz.vajngerl@collabora.com>2014-10-04 17:48:27 +0200
commit614a9b04f5dbd021839f5c7391d6a7d02f2d356d (patch)
treedeaa41729914dbc6b2171c1fe65fa75162dd139f /android
parent2a61d1eefacce1132746df6eab3f6a29f95003d7 (diff)
android: show loading animation until the document is loaded
Change-Id: I98eeafe30e90d039175daea65428526a95c9ff1e
Diffstat (limited to 'android')
-rw-r--r--android/experimental/LOAndroid3/res/layout/activity_main.xml12
-rw-r--r--android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java7
-rw-r--r--android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java8
3 files changed, 27 insertions, 0 deletions
diff --git a/android/experimental/LOAndroid3/res/layout/activity_main.xml b/android/experimental/LOAndroid3/res/layout/activity_main.xml
index 9ada4d3cb4c6..799f591aad9e 100644
--- a/android/experimental/LOAndroid3/res/layout/activity_main.xml
+++ b/android/experimental/LOAndroid3/res/layout/activity_main.xml
@@ -44,4 +44,16 @@
android:background="#9FFF"
android:choiceMode="singleChoice"/>
+ <RelativeLayout
+ android:id="@+id/loadingPanel"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center" >
+
+ <ProgressBar
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:indeterminate="true" />
+ </RelativeLayout>
+
</android.support.v4.widget.DrawerLayout>
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index ef75ae59adf8..54478bfc1e82 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -76,6 +76,13 @@ public class LOKitThread extends Thread {
boolean isReady = mTileProvider.isReady();
if (isReady) {
refresh();
+ LOKitShell.getMainHandler().post(new Runnable() {
+ @Override
+ public void run() {
+ LibreOfficeMainActivity.mAppContext.hideProgressBar();
+ }
+ });
+
}
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 64d70d058246..a37438e1a22c 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -195,6 +195,14 @@ public class LibreOfficeMainActivity extends Activity {
}
+ public void showProgressBar() {
+ findViewById(R.id.loadingPanel).setVisibility(View.VISIBLE);
+ }
+
+ public void hideProgressBar() {
+ findViewById(R.id.loadingPanel).setVisibility(View.GONE);
+ }
+
private class DocumentPartClickListener implements android.widget.AdapterView.OnItemClickListener {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {