diff options
author | Amith Yamasani <yamasani@google.com> | 2014-07-28 16:28:36 -0700 |
---|---|---|
committer | Amith Yamasani <yamasani@google.com> | 2014-07-29 13:50:40 -0700 |
commit | b8e0f608cf28f20b95b65a4f7c0b345298d98e41 (patch) | |
tree | 6d61e79fadf672162304a2a202fb15cb8a8fffce /res/layout | |
parent | 01daaca5475930e394295b06f5a46dc057b44b0f (diff) | |
download | packages_apps_Settings-b8e0f608cf28f20b95b65a4f7c0b345298d98e41.zip packages_apps_Settings-b8e0f608cf28f20b95b65a4f7c0b345298d98e41.tar.gz packages_apps_Settings-b8e0f608cf28f20b95b65a4f7c0b345298d98e41.tar.bz2 |
Implement SET_PROFILE_OWNER intent
This will be shown when a system priv-app tries to add a profile owner
to a device that's already been through setupwizard.
Refactored the Add Device Admin dialog to also be used for this
purpose with additional warning text.
Also, make sure that profile owners cannot be deactivated.
Bug: 16207721
Change-Id: I25499a22718b2219a5a56b158ca2681243751549
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/device_admin_add.xml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/res/layout/device_admin_add.xml b/res/layout/device_admin_add.xml index c54ecce..25b7f01 100644 --- a/res/layout/device_admin_add.xml +++ b/res/layout/device_admin_add.xml @@ -39,6 +39,7 @@ android:layout_height="wrap_content" 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" @@ -46,6 +47,7 @@ android:layout_gravity="center_vertical" android:scaleType="fitCenter" android:contentDescription="@null" /> + <TextView android:id="@+id/admin_name" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -62,21 +64,32 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> + + <TextView android:id="@+id/profile_owner_warning" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:padding="0dp" + android:visibility="gone" + android:text="@string/adding_profile_owner_warning" /> + <TextView android:id="@+id/admin_description" android:layout_width="fill_parent" android:layout_height="0dip" android:layout_weight="0" android:padding="0dip" /> + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center_vertical"> + <ImageView android:id="@+id/add_msg_expander" android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center_vertical" android:contentDescription="@null" /> + <TextView android:id="@+id/add_msg" android:layout_width="fill_parent" android:layout_height="wrap_content" |