am 38048fa6: Fix blank screen in uninstall

Merge commit '38048fa68f75aa8d08ae6c0d2b5b32a5b52ce246'

* commit '38048fa68f75aa8d08ae6c0d2b5b32a5b52ce246':
  Fix blank screen in uninstall

2 files changed, 19 insertions, 25 deletions

diff --git a/res/layout/uninstall_progress.xml b/res/layout/uninstall_progress.xml
index e07494c8..e6c77eef 100755
--- a/res/layout/uninstall_progress.xml
+++ b/res/layout/uninstall_progress.xml
@@ -26,27 +26,23 @@
         <include
             layout="@layout/app_details"
             android:id="@+id/app_snippet"/>
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="fill_parent"
-            android:paddingLeft="6dip"
+        <TextView
+            android:id="@+id/center_text"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true">
-            <TextView
-                android:id="@+id/center_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-            <ProgressBar
-                android:id="@+id/progress_bar"
-                style="?android:attr/progressBarStyleHorizontal"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="24dip"
-                android:max="100" />
-        </LinearLayout>
+            android:layout_centerVertical="true"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="24dip"
+            android:layout_below="@id/center_text"
+            android:max="100" />
         <RelativeLayout
+            android:id="@+id/ok_panel"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:background="@color/title_background"
@@ -54,12 +50,8 @@
             <Button
                 android:id="@+id/ok_button"
                 android:paddingRight="6dip"
-                android:paddingBottom="6dip"
                 android:layout_alignParentRight="true"
-                android:layout_alignParentBottom="true"
                 android:text="@string/ok"
-                android:layout_centerVertical="true"
-                android:gravity="center"
                 android:layout_width="150dip"
                 android:layout_height="wrap_content"/>
         </RelativeLayout>
diff --git a/src/com/android/packageinstaller/UninstallAppProgress.java b/src/com/android/packageinstaller/UninstallAppProgress.java
index 50a5aecb..42d9937d 100755
--- a/src/com/android/packageinstaller/UninstallAppProgress.java
+++ b/src/com/android/packageinstaller/UninstallAppProgress.java
@@ -46,6 +46,7 @@ public class UninstallAppProgress extends Activity implements OnClickListener {
     private TextView mStatusTextView;
     private Button mOkButton;
     private ProgressBar mProgressBar;
+    private View mOkPanel;
     private volatile int mResultCode = -1;
     private final int UNINSTALL_COMPLETE = 1;
     public final static int SUCCEEDED=1;
@@ -61,9 +62,9 @@ public class UninstallAppProgress extends Activity implements OnClickListener {
                     } else {
                         mStatusTextView.setText(R.string.uninstall_failed);
                     }
-                    mProgressBar.setVisibility(View.GONE);
+                    mProgressBar.setVisibility(View.INVISIBLE);
                     // Show the ok button
-                    mOkButton.setVisibility(View.VISIBLE);
+                    mOkPanel.setVisibility(View.VISIBLE);
                     break;
                 default:
                     break;
@@ -102,9 +103,10 @@ public class UninstallAppProgress extends Activity implements OnClickListener {
         mProgressBar = (ProgressBar) findViewById(R.id.progress_bar);
         mProgressBar.setIndeterminate(true);
         // Hide button till progress is being displayed
+        mOkPanel = (View)findViewById(R.id.ok_panel);
         mOkButton = (Button)findViewById(R.id.ok_button);
         mOkButton.setOnClickListener(this);
-        mOkButton.setVisibility(View.GONE);
+        mOkPanel.setVisibility(View.INVISIBLE);
         PackageDeleteObserver observer = new PackageDeleteObserver();
         getPackageManager().deletePackage(mAppInfo.packageName, observer, 0);
     }