diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-01-27 16:22:05 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-01-27 17:27:17 -0800 |
| commit | 61daf83ca8bcf1353e0e81316a2b3809ec7397c5 (patch) | |
| tree | 8884a8cce3e954f2a68ba957b7e296d3130fdc3e /res/layout/device_admin_add.xml | |
| parent | 9e0135fd452162382e3f637d4f24073d1c408abf (diff) | |
| download | packages_apps_Settings-61daf83ca8bcf1353e0e81316a2b3809ec7397c5.zip packages_apps_Settings-61daf83ca8bcf1353e0e81316a2b3809ec7397c5.tar.gz packages_apps_Settings-61daf83ca8bcf1353e0e81316a2b3809ec7397c5.tar.bz2 | |
Update settings UI to support multiple device admins.
Diffstat (limited to 'res/layout/device_admin_add.xml')
| -rw-r--r-- | res/layout/device_admin_add.xml | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/res/layout/device_admin_add.xml b/res/layout/device_admin_add.xml index 4845fca..3ff190b 100644 --- a/res/layout/device_admin_add.xml +++ b/res/layout/device_admin_add.xml @@ -35,10 +35,9 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:background="@*android:drawable/title_bar_medium"> - <TextView + <TextView android:id="@+id/title" android:layout_width="match_parent" android:layout_height="match_parent" - android:text="@string/add_device_admin_msg" android:gravity="center" android:textAppearance="?android:attr/textAppearanceLarge" android:textColor="?android:attr/textColorPrimary" @@ -49,14 +48,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal"> - <ImageView android:id="@+id/active_icon" + <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_gravity="center_vertical" android:scaleType="fitCenter"/> - <TextView android:id="@+id/active_name" + <TextView android:id="@+id/admin_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" @@ -67,7 +66,7 @@ android:singleLine="true" android:ellipsize="marquee" /> </LinearLayout> - <TextView android:id="@+id/active_warning" + <TextView android:id="@+id/admin_warning" android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="10dip" /> @@ -77,7 +76,7 @@ android:orientation="vertical" android:paddingLeft="16dip" android:paddingRight="12dip" /> - <TextView android:id="@+id/active_description" + <TextView android:id="@+id/admin_description" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" @@ -97,11 +96,10 @@ android:layout_width="0dip" android:layout_height="0dip" android:layout_weight="1" /> - <Button android:id="@+id/add_button" + <Button android:id="@+id/action_button" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/add_device_admin" /> + android:layout_weight="1" /> <View android:layout_width="0dip" android:layout_height="0dip" |