summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorIain Billett <iainbillett@gmail.com>2012-07-03 14:28:26 +0100
committerIain Billett <iainbillett@gmail.com>2012-07-04 18:38:24 +0100
commit478ba74ac4eeb1d1a73397050788a4b03a02da23 (patch)
treed186cd2135d31f409cf66b7f5c5675989024d1ba /android
parente11cd35387962beb1516419c148094899c45d3c7 (diff)
removed progress bar - layout issues - will come back to it.
Change-Id: Ie949a416d2898750e8d76bd119ecb462d920d6ff
Diffstat (limited to 'android')
-rw-r--r--android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java26
1 files changed, 10 insertions, 16 deletions
diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
index 8f20f1bcf7cc..cd1dfd40f4c6 100644
--- a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
+++ b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
@@ -44,6 +44,7 @@ import android.view.animation.Animation;
import android.view.animation.AnimationSet;
import android.view.animation.TranslateAnimation;
import android.widget.ImageView;
+import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.ViewFlipper;
import android.widget.ViewSwitcher;
@@ -624,29 +625,22 @@ public class DocumentLoader
{
ProgressBar progressView;
- protected void onPreExecute (){
+ protected void onPreExecute (){//TODO have another go at putting in a progress bar (shouldn't waste time on it now)
matchParent = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
-
- LinearLayout waitLayout = new LinearLayout( DocumentLoader.this );
- waitLayout.setLayoutParams( matchParent );
- waitLayout.setOrientation( LinearLayout.VERTICAL );
-
+
TextView waitView = new TextView(DocumentLoader.this);
waitView.setTextSize(24);
waitView.setGravity(Gravity.CENTER);
waitView.setBackgroundColor(Color.WHITE);
waitView.setTextColor(Color.BLACK);
waitView.setText("Page " + (1) + ", wait...");
-
- progressView = new ProgressBar( DocumentLoader.this );
-
- waitLayout.addView( waitView );
- waitLayout.addView( progressView );
-
- flipper = new ViewFlipper(DocumentLoader.this);
- flipper = (ViewFlipper)findViewById( R.id.page_flipper );
- //flipper.addView( waitView , 0 , matchParent);
- flipper.addView( waitLayout , 0 , matchParent);
+
+ progressView = new ProgressBar( DocumentLoader.this, null, android.R.attr.progressBarStyleHorizontal);
+ progressView.setProgress( 10 );
+
+ flipper = new ViewFlipper(DocumentLoader.this);
+ flipper = (ViewFlipper)findViewById( R.id.page_flipper );
+ flipper.addView( waitView , 0 , matchParent);
currentPage = 0;
}