Tweak strings when uninstalling updates

Inform about data deletion and also about other users.

Bug: 26694521
Change-Id: Ib1ab8ca58e111cfbad6895f296e567e289ce34d8

1 files changed, 17 insertions, 3 deletions

diff --git a/src/com/android/packageinstaller/UninstallerActivity.java b/src/com/android/packageinstaller/UninstallerActivity.java
index f1afe424..ae1659f4 100755
--- a/src/com/android/packageinstaller/UninstallerActivity.java
+++ b/src/com/android/packageinstaller/UninstallerActivity.java
@@ -74,11 +74,15 @@ public class UninstallerActivity extends Activity {
 
             final boolean isUpdate =
                     ((dialogInfo.appInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0);
+            UserManager userManager = UserManager.get(getActivity());
             if (isUpdate) {
-                messageBuilder.append(getString(R.string.uninstall_update_text));
+                if (isSingleUser(userManager)) {
+                    messageBuilder.append(getString(R.string.uninstall_update_text));
+                } else {
+                    messageBuilder.append(getString(R.string.uninstall_update_text_multiuser));
+                }
             } else {
-                UserManager userManager = UserManager.get(getActivity());
-                if (dialogInfo.allUsers && userManager.getUserCount() >= 2) {
+                if (dialogInfo.allUsers && !isSingleUser(userManager)) {
                     messageBuilder.append(getString(R.string.uninstall_application_text_all_users));
                 } else if (!dialogInfo.user.equals(android.os.Process.myUserHandle())) {
                     UserInfo userInfo = userManager.getUserInfo(dialogInfo.user.getIdentifier());
@@ -113,6 +117,16 @@ public class UninstallerActivity extends Activity {
                 getActivity().finish();
             }
         }
+
+        /**
+         * Returns whether there is only one user on this device, not including
+         * the system-only user.
+         */
+        private boolean isSingleUser(UserManager userManager) {
+            final int userCount = userManager.getUserCount();
+            return userCount == 1
+                    || (UserManager.isSplitSystemUser() && userCount == 2);
+        }
     }
 
     public static class AppNotFoundDialogFragment extends DialogFragment {