diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-01-26 18:03:42 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-01-27 13:29:14 -0800 |
| commit | b885afe4e7376a21d354ca11d4873930d9cce9ea (patch) | |
| tree | 2b3956de4095040d0cd4b9fc285d7d4fee5fb4f9 /res | |
| parent | d4449a81cd5df3174186c1eaf6e6f471a86aa7b7 (diff) | |
| download | packages_apps_settings-b885afe4e7376a21d354ca11d4873930d9cce9ea.zip packages_apps_settings-b885afe4e7376a21d354ca11d4873930d9cce9ea.tar.gz packages_apps_settings-b885afe4e7376a21d354ca11d4873930d9cce9ea.tar.bz2 | |
More device admin work:
- Show a warning before removing an admin, if desired.
- Additional message that can be shown when adding an admin.
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/device_admin_add.xml | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/res/layout/device_admin_add.xml b/res/layout/device_admin_add.xml index ceb02ae..4845fca 100644 --- a/res/layout/device_admin_add.xml +++ b/res/layout/device_admin_add.xml @@ -20,21 +20,6 @@ android:layout_width="match_parent" 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: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" - android:shadowColor="?android:attr/colorBackground" - android:shadowRadius="2" /> - </LinearLayout> <ScrollView android:layout_width="match_parent" android:layout_height="match_parent" @@ -48,6 +33,21 @@ <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/add_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" android:orientation="horizontal"> <ImageView android:id="@+id/active_icon" android:layout_width="@android:dimen/app_icon_size" @@ -67,11 +67,6 @@ android:singleLine="true" android:ellipsize="marquee" /> </LinearLayout> - <TextView android:id="@+id/active_description" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:padding="10dip" /> <TextView android:id="@+id/active_warning" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -82,6 +77,16 @@ android:orientation="vertical" android:paddingLeft="16dip" android:paddingRight="12dip" /> + <TextView android:id="@+id/active_description" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:padding="10dip" /> + <TextView android:id="@+id/add_msg" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:padding="10dip" /> </LinearLayout> </ScrollView> <LinearLayout style="@android:style/ButtonBar" |