Tabletize Device administrator screen and fix the layout for DeviceAdminAdd.

Bug: 3376986

Convert the DeviceAdminSettings screen to a fragment, remove fat titlebar.
Convert the DeviceAdminAdd screen to layout nicely in the new holo DialogWhenLarge
style.

Change-Id: I20a9d16aed135a2178969dfff807075b0b79237c

1 files changed, 44 insertions, 38 deletions

diff --git a/res/layout/device_admin_add.xml b/res/layout/device_admin_add.xml
index f3ba59e..ac30ed9 100644
--- a/res/layout/device_admin_add.xml
+++ b/res/layout/device_admin_add.xml
@@ -21,25 +21,12 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:background="@*android:drawable/title_bar_medium">
-        <TextView android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textColor="?android:attr/textColorPrimary"
-            android:shadowColor="?android:attr/colorBackground"
-            android:shadowRadius="2" />
-    </LinearLayout>
-
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1.0"
+        android:layout_marginLeft="16dip"
+        android:layout_marginRight="16dip"
         android:gravity="top">
         <LinearLayout
             android:layout_width="match_parent"
@@ -111,31 +98,50 @@
         </LinearLayout>
     </ScrollView>
 
-    <LinearLayout style="@android:style/ButtonBar"
+    <LinearLayout android:id="@+id/buttonPanel"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
-        <View
-           android:layout_width="0dip"
-           android:layout_height="0dip"
-           android:layout_weight="1" />
-        <Button android:id="@+id/action_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-        <View
-           android:layout_width="0dip"
-           android:layout_height="0dip"
-           android:layout_weight="1" />
-        <Button android:id="@+id/cancel_button"
-            android:layout_width="wrap_content"
+        android:minHeight="54dip"
+        android:orientation="vertical"
+        android:divider="?android:attr/dividerHorizontal"
+        android:showDividers="beginning"
+        android:dividerPadding="16dip">
+        <LinearLayout
+            style="?android:attr/buttonBarStyle"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/cancel" />
-        <View
-           android:layout_width="0dip"
-           android:layout_height="0dip"
-           android:layout_weight="1" />
-    </LinearLayout>
+            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/action_button"
+                android:layout_width="0dip"
+                android:layout_gravity="left"
+                android:layout_weight="1"
+                android:maxLines="2"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_height="wrap_content" />
+            <Button android:id="@+id/cancel_button"
+                android:layout_width="0dip"
+                android:layout_gravity="right"
+                android:layout_weight="1"
+                android:maxLines="2"
+                android:text="@string/cancel"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_height="wrap_content" />
+            <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>
 
 </LinearLayout>