remove uninstall status screen and present the status of uninstallation in previous screen

rename xml file
change code flow in activities
Ignore back button when installation is in progress

1 files changed, 32 insertions, 29 deletions

diff --git a/res/layout/uninstall_done.xml b/res/layout/uninstall_progress.xml
index e65f29fb..e07494c8 100755
--- a/res/layout/uninstall_done.xml
+++ b/res/layout/uninstall_progress.xml
@@ -14,51 +14,54 @@
      limitations under the License.
 -->
 
-<RelativeLayout
+<ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-     
-    <LinearLayout
-        android:id="@+id/top_box"
-        android:background="@color/title_background"
+    android:layout_height="fill_parent"
+    android:fillViewport="true" >
+    <RelativeLayout
+        android:orientation="vertical"
         android:layout_width="fill_parent"
-        android:layout_height="65dip"
-        android:layout_alignParentTop="true"/>
-
-    <TextView
-        android:id="@+id/center_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:paddingTop="60dip"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:layout_below="@id/top_box"/>
-        <!-- OK confirm and cancel buttons.  -->
-        <!-- LinearLayout
-            android:background="@color/title_background"
+        android:layout_height="fill_parent">
+        <include
+            layout="@layout/app_details"
+            android:id="@+id/app_snippet"/>
+        <LinearLayout
+            android:orientation="vertical"
             android:layout_width="fill_parent"
+            android:paddingLeft="6dip"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:orientation="horizontal" -->
-          
+            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>
         <RelativeLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:background="@color/title_background"
             android:layout_alignParentBottom="true">
-
             <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.paddingTop="6dip"
+                android:layout_centerVertical="true"
                 android:gravity="center"
                 android:layout_width="150dip"
                 android:layout_height="wrap_content"/>
         </RelativeLayout>
-</RelativeLayout>
-
-
+    </RelativeLayout>
+</ScrollView>