summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorFyodor Kupolov <fkupolov@google.com>2016-04-18 16:45:27 -0700
committerFyodor Kupolov <fkupolov@google.com>2016-04-18 17:46:29 -0700
commit933915289a0a023937dff88f49c82122f8e59f51 (patch)
tree340e10bf6b16e464c774574c79f06b203dcb2eac /res
parent0fa9b50bab2261bd03c892293554f32c9d710926 (diff)
downloadandroid_packages_apps_PackageInstaller-933915289a0a023937dff88f49c82122f8e59f51.tar.gz
android_packages_apps_PackageInstaller-933915289a0a023937dff88f49c82122f8e59f51.tar.bz2
android_packages_apps_PackageInstaller-933915289a0a023937dff88f49c82122f8e59f51.zip
Fix misleading uninstall message for managed profiles
The message now depends on the state of mAllUsers flag in UninstallAppProgress activity: - This app is required for some users or profiles and was uninstalled for others (if mAllUsers==true) - This app is needed for your work profile and can't be uninstalled (if mAllUsers==false) Bug: 28240714 Change-Id: Ia060aebd112d3e4c5fcaee02a777140f085abf87
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml11
1 files changed, 8 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ace1295b..a58c5e59 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -118,10 +118,15 @@
is a current device administrator for some user [CHAR LIMIT=100] -->
<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 admin user when uninstalling a package for all users failed
+ because a profile owner has marked the target package as not able to be uninstalled
+ [CHAR LIMIT=120] -->
+ <string name="uninstall_all_blocked_profile_owner">This app is required for some users or
+ profiles and was uninstalled for others</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=120] -->
- <string name="uninstall_blocked_profile_owner">This app is required for some users or profiles
- and was uninstalled for others</string>
+ has marked the target package as not able to be uninstalled [CHAR LIMIT=120] -->
+ <string name="uninstall_blocked_profile_owner">This app is needed for
+ your profile and can\'t be uninstalled.</string>
<!-- String presented to the user when uninstalling a package failed because a device owner
has marked the the target package as not able to be uninstalled [CHAR LIMIT=80] -->
<string name="uninstall_blocked_device_owner">This app is required