diff options
| -rw-r--r-- | res/values/strings.xml | 11 | ||||
| -rwxr-xr-x | src/com/android/packageinstaller/UninstallAppProgress.java | 4 |
2 files changed, 11 insertions, 4 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 diff --git a/src/com/android/packageinstaller/UninstallAppProgress.java b/src/com/android/packageinstaller/UninstallAppProgress.java index 3a178273..07276334 100755 --- a/src/com/android/packageinstaller/UninstallAppProgress.java +++ b/src/com/android/packageinstaller/UninstallAppProgress.java @@ -211,7 +211,9 @@ public class UninstallAppProgress extends Activity implements OnClickListener { + msg.arg1 + " no blocking user"); statusText = getString(R.string.uninstall_failed); } else { - statusText = getString(R.string.uninstall_blocked_profile_owner); + statusText = mAllUsers + ? getString(R.string.uninstall_all_blocked_profile_owner) : + getString(R.string.uninstall_blocked_profile_owner); } break; } |