Change theme to DialogWhenLarge

Fix some layouts to correctly display as dialogs when using a large
screen device. Still needs the WeightedLinearLayout trick.

Bug: 3298362
Change-Id: I76ad192ca8c27a0d9f4ce106dc4e1e922c01c02b

1 files changed, 57 insertions, 23 deletions

diff --git a/res/layout/uninstall_confirm.xml b/res/layout/uninstall_confirm.xml
index 78cd64be..4b273964 100755
--- a/res/layout/uninstall_confirm.xml
+++ b/res/layout/uninstall_confirm.xml
@@ -21,14 +21,16 @@
   to let the uinstallation continue or abort.
 -->
 
-<RelativeLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/padded"
+    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:orientation="vertical"
         android:paddingTop="6dip"
@@ -60,30 +62,62 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:paddingTop="16dip"
             android:paddingLeft="6dip"
-            android:paddingRight="6dip" />
+            android:paddingRight="6dip"
+            android:paddingBottom="16dip" />
 
-   </LinearLayout>
+    </LinearLayout>
 
     <!-- OK confirm and cancel buttons.  -->
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:orientation="horizontal"
-        style="@android:style/ButtonBar"
-    >
-        <Button android:id="@+id/ok_button"
-            android:layout_width="0dip"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/ok"
-        />
+            android:minHeight="54dip"
+            android:orientation="vertical"
+            android:divider="?android:attr/dividerHorizontal"
+            android:showDividers="beginning"
+            android:dividerPadding="16dip">
 
-        <Button android:id="@+id/cancel_button"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/cancel"
-        />
+        <LinearLayout
+                style="?android:attr/buttonBarStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:paddingLeft="2dip"
+                android:paddingRight="2dip"
+                android:measureWithLargestChild="true">
+
+            <LinearLayout android:id="@+id/leftSpacer"
+                android:layout_weight="0.25"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:visibility="gone" />
+
+            <Button android:id="@+id/ok_button"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:layout_weight="1"
+                android:text="@string/ok"
+                android:maxLines="2"
+                style="?android:attr/buttonBarButtonStyle" />
+
+            <Button android:id="@+id/cancel_button"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:layout_weight="1"
+                android:text="@string/cancel"
+                android:maxLines="2"
+                style="?android:attr/buttonBarButtonStyle" />
+
+            <LinearLayout android:id="@+id/rightSpacer"
+                android:layout_width="0dip"
+                android:layout_weight="0.25"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:visibility="gone" />
+
+        </LinearLayout>
     </LinearLayout>
-</RelativeLayout>
+</LinearLayout>