diff options
| author | Fyodor Kupolov <fkupolov@google.com> | 2016-04-20 18:41:03 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-20 18:41:03 +0000 |
| commit | 45f1ec1a71da2d3f456b5a7635d5775778e48f8c (patch) | |
| tree | 471983484bf93a15a756a29431accd3b0c6e0dc6 /res | |
| parent | 30fb2f87f15b93ae3bc64a1fc955180e9f77082e (diff) | |
| parent | edbf987e33d5710ec765ef3a7e516db65057a8b7 (diff) | |
| download | android_packages_apps_PackageInstaller-45f1ec1a71da2d3f456b5a7635d5775778e48f8c.tar.gz android_packages_apps_PackageInstaller-45f1ec1a71da2d3f456b5a7635d5775778e48f8c.tar.bz2 android_packages_apps_PackageInstaller-45f1ec1a71da2d3f456b5a7635d5775778e48f8c.zip | |
Merge "Fix misleading uninstall message for managed profiles" into nyc-dev
am: edbf987
* commit 'edbf987e33d5710ec765ef3a7e516db65057a8b7':
Fix misleading uninstall message for managed profiles
Change-Id: I8cda03931a07b07528dd1c4b3cb2f2f271b4438f
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 11 |
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 |