summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorRubin Xu <rubinxu@google.com>2014-12-12 19:09:25 +0000
committerRubin Xu <rubinxu@google.com>2014-12-17 17:45:32 +0000
commitf16d8735066ead696943177d4884e00f298508c9 (patch)
tree43157dd6590275d205213baaa132a3c88f2a686f /res/values
parent5d1c66f9e07f0ea2ffcd68e2dd10f4cdb68c27ba (diff)
downloadandroid_packages_apps_PackageInstaller-f16d8735066ead696943177d4884e00f298508c9.tar.gz
android_packages_apps_PackageInstaller-f16d8735066ead696943177d4884e00f298508c9.tar.bz2
android_packages_apps_PackageInstaller-f16d8735066ead696943177d4884e00f298508c9.zip
Show appropriate UI when uninstalling fails due to being device admin.
If the app being uninstalled is a secondary user's device admin rather than the current user or profile owner, the uninstallation failure activity should state so clearly, and it should not lead the user to the device administrator settings of the current user. Bug: 17668398 Change-Id: Ib81840b7b2928624bc57cce949cfb2a2d9de604a
Diffstat (limited to 'res/values')
-rw-r--r--res/values/strings.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9b0cf678..f0747f27 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -133,6 +133,10 @@
is a current device administrator [CHAR LIMIT=80] -->
<string name="uninstall_failed_device_policy_manager">Can\'t uninstall because this package is an
active device administrator.</string>
+ <!-- String presented to the user when uninstalling a package failed because the target package
+ is a current device administrator for some user [CHAR LIMIT=80] -->
+ <string name="uninstall_failed_device_policy_manager_of_user">Can\'t uninstall because this package is an
+ active device administrator for the user <xliff:g id="username">%1$s</xliff:g>.</string>
<!-- String presented to the user when uninstalling a package failed because a profile owner
has marked the the target package as not able to be uninstalled [CHAR LIMIT=80] -->
<string name="uninstall_blocked_profile_owner">This app is needed for