commit 4c96267acd8bb37fd537e9d1eeaaa22acb0752d5
author Alexandra Gherghina <alexgherghina@google.com> Fri Aug 22 11:17:29 2014 +0100
committer Alexandra Gherghina <alexgherghina@google.com> Fri Aug 22 11:17:31 2014 +0100
tree f65750ab4794765e93296afeff4bda800bf5bd73
parent fe3794a9372d643afe8cd6d8e70ec4f9e1b47a48

Update strings for removing work profile

Bug: 17139301
Change-Id: I524946ab7856b10ed68a2e90c7f488d20731b169

src/com/android/settings/Utils.java

diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index e88c0fc..4fb166a 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -774,17 +774,24 @@
             DialogInterface.OnClickListener onConfirmListener) {
         UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
         UserInfo userInfo = um.getUserInfo(removingUserId);
+        int titleResId;
+        int messageResId;
+        if (UserHandle.myUserId() == removingUserId) {
+            titleResId = R.string.user_confirm_remove_self_title;
+            messageResId = R.string.user_confirm_remove_self_message;
+        } else if (userInfo.isRestricted()) {
+            titleResId = R.string.user_profile_confirm_remove_title;
+            messageResId = R.string.user_profile_confirm_remove_message;
+        } else if (userInfo.isManagedProfile()) {
+            titleResId = R.string.work_profile_confirm_remove_title;
+            messageResId = R.string.work_profile_confirm_remove_message;
+        } else {
+            titleResId = R.string.user_confirm_remove_title;
+            messageResId = R.string.user_confirm_remove_message;
+        }
         Dialog dlg = new AlertDialog.Builder(context)
-                .setTitle(UserHandle.myUserId() == removingUserId
-                    ? R.string.user_confirm_remove_self_title
-                    : (userInfo.isRestricted()
-                        ? R.string.user_profile_confirm_remove_title
-                        : R.string.user_confirm_remove_title))
-                .setMessage(UserHandle.myUserId() == removingUserId
-                    ? R.string.user_confirm_remove_self_message
-                    : (userInfo.isRestricted()
-                        ? R.string.user_profile_confirm_remove_message
-                        : R.string.user_confirm_remove_message))
+                .setTitle(titleResId)
+                .setMessage(messageResId)
                 .setPositiveButton(R.string.user_delete_button,
                         onConfirmListener)
                 .setNegativeButton(android.R.string.cancel, null)