summaryrefslogtreecommitdiffstats
path: root/res/layout/device_admin_add.xml
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2011-10-04 13:48:50 -0700
committerAdam Powell <adamp@google.com>2011-10-04 13:48:50 -0700
commita70e1468cf175fd59df4a121b20bd4644bd71572 (patch)
treefc96c52a1ef441cf97d3ab60d20c12463a10855c /res/layout/device_admin_add.xml
parent4838c59f88e1c110d5f51ff4de514d42ebbb2cc6 (diff)
downloadpackages_apps_Settings-a70e1468cf175fd59df4a121b20bd4644bd71572.zip
packages_apps_Settings-a70e1468cf175fd59df4a121b20bd4644bd71572.tar.gz
packages_apps_Settings-a70e1468cf175fd59df4a121b20bd4644bd71572.tar.bz2
Bug 5126088 - update layout for activate device policy activity
Change-Id: Ifd5963adc0dc30c0a650bac822dbbd7cb938c144
Diffstat (limited to 'res/layout/device_admin_add.xml')
-rw-r--r--res/layout/device_admin_add.xml17
1 files changed, 7 insertions, 10 deletions
diff --git a/res/layout/device_admin_add.xml b/res/layout/device_admin_add.xml
index b1ad72c..d6a0dcb 100644
--- a/res/layout/device_admin_add.xml
+++ b/res/layout/device_admin_add.xml
@@ -25,8 +25,9 @@
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1.0"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
+ android:paddingLeft="16dip"
+ android:paddingRight="16dip"
+ android:scrollbarStyle="outsideOverlay"
android:gravity="top">
<LinearLayout
android:layout_width="match_parent"
@@ -36,12 +37,12 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal">
+ android:orientation="horizontal"
+ android:layout_marginTop="16dip">
<ImageView android:id="@+id/admin_icon"
android:layout_width="@android:dimen/app_icon_size"
android:layout_height="@android:dimen/app_icon_size"
- android:layout_marginLeft="5dip"
- android:layout_marginRight="11dip"
+ android:layout_marginRight="16dip"
android:layout_gravity="center_vertical"
android:scaleType="fitCenter"/>
<TextView android:id="@+id/admin_name"
@@ -101,18 +102,14 @@
<LinearLayout android:id="@+id/buttonPanel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:minHeight="54dip"
android:orientation="vertical"
android:divider="?android:attr/dividerHorizontal"
- android:showDividers="beginning"
- android:dividerPadding="16dip">
+ android:showDividers="beginning">
<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"