Adding an easy uninstall for active device admin

Currently the uninstall button is disabled for a package
with an active device admin. This change enables the button,
which when clicked gives the user an option to deactivate
all the DAs in the package and then uninstall the package.

Bug: b/22359208

cherry pick of I8b955305927751185a4c982dadb5b1b6b07efe5e

Change-Id: Ib2ab0e35b74fc8dba7168174b2bc8fd383fe94fe
This commit is contained in:
Suprabh Shukla
2016-01-27 13:00:10 -08:00
parent d119f50314
commit 02a06eff42
3 changed files with 54 additions and 6 deletions

View File

@@ -4557,6 +4557,8 @@
<string name="remove_device_admin">Deactivate</string>
<!-- Label for button to uninstall the device admin application [CHAR LIMIT=40] -->
<string name="uninstall_device_admin">Uninstall</string>
<!-- Label for button to deactivate and uninstall the device admin [CHAR_LIMIT=50]-->
<string name="remove_and_uninstall_device_admin">Deactivate and Uninstall</string>
<!-- Label for screen showing to select device policy -->
<string name="select_device_admin_msg">Device administrators</string>
<!-- Message when there are no available device admins to display -->