Fix layouts some more

Bug: 4770335
Change-Id: Iceef40eb1bf01457d715a21a5ebef942de484195

6 files changed, 121 insertions, 85 deletions

diff --git a/res/layout/app_details.xml b/res/layout/app_details.xml
index 1c6730a7..b3683700 100755
--- a/res/layout/app_details.xml
+++ b/res/layout/app_details.xml
@@ -22,7 +22,6 @@ installation screens
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/app_snippet"
-    android:layout_weight="1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="16dip"
diff --git a/res/layout/install_confirm.xml b/res/layout/install_confirm.xml
index a37c84d9..a54b2ef0 100755
--- a/res/layout/install_confirm.xml
+++ b/res/layout/install_confirm.xml
@@ -24,7 +24,6 @@
 <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:orientation="vertical"
-        android:layout_weight="1"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
diff --git a/res/layout/install_start.xml b/res/layout/install_start.xml
index 8f861cc6..5e0f9579 100755
--- a/res/layout/install_start.xml
+++ b/res/layout/install_start.xml
@@ -14,18 +14,24 @@
      limitations under the License.
 -->
 
-<LinearLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <include
         layout="@layout/app_details"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:id="@+id/app_snippet"/>
+
     <include
-       layout="@layout/install_confirm"
-       android:id="@+id/install_confirm_panel"/>
-</LinearLayout>
+        layout="@layout/install_confirm"
+        android:id="@+id/install_confirm_panel"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/app_snippet"
+        android:layout_alignParentBottom="true"/>
+</RelativeLayout>
 
 
diff --git a/res/layout/op_progress.xml b/res/layout/op_progress.xml
index 4e8f9b1f..dde1e82e 100755
--- a/res/layout/op_progress.xml
+++ b/res/layout/op_progress.xml
@@ -14,47 +14,11 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
+        android:layout_height="match_parent"
         android:orientation="vertical">
-    <include
-            layout="@layout/app_details"
-            android:id="@+id/app_snippet"/>
-    <TextView
-            android:id="@+id/center_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:text="@string/installing"
-            android:paddingTop="16dip"
-            android:paddingLeft="16dip"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
-    <TextView
-            android:id="@+id/center_explanation"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:visibility="gone"
-            android:paddingTop="8dip"
-            android:paddingLeft="16dip"
-            android:paddingBottom="16dip"
-            android:textAppearance="?android:attr/textAppearanceSmall"/>
-
-    <ProgressBar
-            android:id="@+id/progress_bar"
-            style="?android:attr/progressBarStyleHorizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="24dip"
-            android:paddingLeft="16dip"
-            android:paddingRight="16dip"
-            android:max="100" />
-
-    <!-- Launch and close buttons.  -->
+            <!-- Launch and close buttons.  -->
     <LinearLayout android:id="@+id/buttons_panel"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -109,6 +73,55 @@
 
         </LinearLayout>
     </LinearLayout>
-</LinearLayout>
+
+    <include
+            layout="@layout/app_details"
+            android:id="@+id/app_snippet"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true" />
+
+    <TextView
+            android:id="@+id/center_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/app_snippet"
+            android:gravity="center_horizontal"
+            android:text="@string/installing"
+            android:paddingTop="16dip"
+            android:paddingLeft="16dip"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <!-- This explanation text is shown only after the progress bar below goes away. -->
+    <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_above="@id/buttons_panel"
+            android:layout_below="@id/center_text"
+            android:paddingTop="8dip"
+            android:paddingLeft="16dip"
+            android:paddingBottom="16dip">
+        <TextView
+                android:id="@+id/center_explanation"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:visibility="gone"
+                android:textAppearance="?android:attr/textAppearanceSmall"/>
+    </ScrollView>
+
+    <!-- This progress bar goes away when the explanation above is displayed. -->
+    <ProgressBar
+            android:id="@+id/progress_bar"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/center_text"
+            android:paddingTop="24dip"
+            android:paddingLeft="16dip"
+            android:paddingRight="16dip"
+            android:max="100" />
+
+</RelativeLayout>
 
 
diff --git a/res/layout/uninstall_confirm.xml b/res/layout/uninstall_confirm.xml
index fa600580..6e0d94d1 100755
--- a/res/layout/uninstall_confirm.xml
+++ b/res/layout/uninstall_confirm.xml
@@ -33,7 +33,6 @@
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:orientation="vertical"
-        style="@style/padded"
         android:paddingTop="6dip"
         android:paddingBottom="6dip">
 
@@ -44,7 +43,7 @@
             android:layout_height="wrap_content"
             android:textColor="?android:attr/textColorSecondary"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:paddingTop="16dip"
+            style="@style/padded"
             android:visibility="gone" />
 
         <!-- The snippet (title & icon) about the application being uninstalled. -->
@@ -59,8 +58,7 @@
             android:layout_height="wrap_content"
             android:textColor="?android:attr/textColorSecondary"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:paddingTop="16dip"
-            android:paddingBottom="16dip" />
+            android:padding="16dip" />
 
     </LinearLayout>
 
diff --git a/res/layout/uninstall_progress.xml b/res/layout/uninstall_progress.xml
index 95df9161..9cf69612 100755
--- a/res/layout/uninstall_progress.xml
+++ b/res/layout/uninstall_progress.xml
@@ -14,42 +14,10 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_weight="1"
         android:orientation="vertical">
-    <include
-            layout="@layout/app_details"
-            android:id="@+id/app_snippet"/>
-    <TextView
-            android:id="@+id/center_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:paddingTop="16dip"
-            style="@style/padded"
-            android:paddingBottom="16dip"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-    <Button android:id="@+id/device_manager_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="invisible"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:layout_gravity="center_horizontal"
-            android:maxLines="2"
-            android:text="@string/manage_device_administrators"/>
-    <ProgressBar
-            android:id="@+id/progress_bar"
-            style="?android:attr/progressBarStyleHorizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="24dip"
-            android:paddingLeft="16dip"
-            android:paddingRight="16dip"
-            android:max="100" />
 
     <!-- Button bar with OK button -->
     <LinearLayout android:id="@+id/ok_panel"
@@ -97,4 +65,57 @@
 
         </LinearLayout>
     </LinearLayout>
-</LinearLayout>
+
+    <include
+            layout="@layout/app_details"
+            android:id="@+id/app_snippet"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_alignParentTop="true" />
+
+    <LinearLayout
+            android:id="@+id/uninstall_holder"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@id/ok_panel"
+            android:layout_below="@id/app_snippet"
+            android:orientation="vertical">
+                
+        <ScrollView
+                android:id="@+id/uninstalling_scrollview"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:padding="16dip"
+                android:fillViewport="false">
+                
+            <TextView
+                    android:id="@+id/center_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_horizontal"
+                    android:text="@string/uninstalling"
+                    android:textAppearance="?android:attr/textAppearanceMedium"/>
+        </ScrollView>
+
+        <ProgressBar
+                android:id="@+id/progress_bar"
+                style="?android:attr/progressBarStyleHorizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="24dip"
+                android:paddingLeft="16dip"
+                android:paddingRight="16dip"
+                android:max="100" />
+
+        <Button android:id="@+id/device_manager_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:visibility="gone"
+                android:maxLines="2"
+                android:text="@string/manage_device_administrators" />
+                
+    </LinearLayout>
+
+</RelativeLayout>