Work on the device admin settings UI.

Improve the look of the UI, and add the confirmation screen
for enabling an administrator.  This uses the new framework APIs
to show its description and policies it will control.

1 files changed, 51 insertions, 21 deletions

diff --git a/res/layout/device_admin_settings.xml b/res/layout/device_admin_settings.xml
index 221e45f..40b20e6 100644
--- a/res/layout/device_admin_settings.xml
+++ b/res/layout/device_admin_settings.xml
@@ -24,14 +24,21 @@
 	    android:layout_height="match_parent"
 	    android:orientation="vertical"
 	    android:visibility="gone">
-	    <TextView
-	        android:layout_width="match_parent"
-	        android:layout_height="wrap_content"
-	        android:paddingLeft="20dip"
-	        android:paddingTop="5dip"
-	        android:text="@string/active_device_admin_msg"
-	        android:gravity="center"
-	        android:textAppearance="?android:attr/textAppearanceMedium" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+		    android:background="@*android:drawable/title_bar_medium">
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+	            android:text="@string/active_device_admin_msg"
+                android:gravity="center"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:textColor="?android:attr/textColorPrimary"
+                android:shadowColor="?android:attr/colorBackground"
+                android:shadowRadius="2" />
+        </LinearLayout>
         <LinearLayout
 	        android:layout_width="match_parent"
 	        android:layout_height="wrap_content"
@@ -56,13 +63,27 @@
         </LinearLayout>
         <TextView android:id="@+id/active_description"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-        <Button android:id="@+id/remove_button"
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android_layout_gravity="center_vertical|east"
-            android:text="@string/remove_device_admin"
-        />
+            android:layout_weight="1"
+            android:padding="10dip" />
+	    <LinearLayout style="@android:style/ButtonBar"
+	        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/remove_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+               android:text="@string/remove_device_admin" />
+            <View
+               android:layout_width="0dip"
+               android:layout_height="0dip"
+               android:layout_weight="1" />
+	    </LinearLayout>
     </LinearLayout>
     
     <LinearLayout
@@ -71,17 +92,26 @@
         android:layout_height="match_parent"
         android:orientation="vertical"
         android:visibility="gone">
-        <TextView
-            android:layout_width="match_parent"
+        <LinearLayout
+	        android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="20dip"
-            android:paddingTop="5dip"
-            android:text="@string/select_device_admin_msg"
-            android:gravity="center"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
+	        android:orientation="horizontal"
+            android:background="@*android:drawable/title_bar_medium">
+	        <TextView
+	            android:layout_width="match_parent"
+			    android:layout_height="match_parent"
+	            android:text="@string/select_device_admin_msg"
+	            android:gravity="center"
+	            android:textAppearance="?android:attr/textAppearanceLarge"
+		        android:textColor="?android:attr/textColorPrimary"
+		        android:shadowColor="?android:attr/colorBackground"
+		        android:shadowRadius="2" />
+        </LinearLayout>
         <ListView android:id="@android:id/list"
                 android:layout_width="match_parent" 
                 android:layout_height="match_parent"
+                android:paddingTop="10dip"
+                android:paddingBottom="10dip"
                 android:drawSelectorOnTop="false"
                 android:fastScrollEnabled="true" />
     </LinearLayout>