From 8e6f99e22bc69e95647857cce247341061b60b07 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Wed, 24 Apr 2013 14:21:06 -0700
Subject: [PATCH] Rename limited users to restricted profiles

Bug: 8705996
Change-Id: Ibf6a2e0e14ce095758fb9be982710b584b76f15d
---
 res/values/strings.xml                           | 10 ++++++++--
 src/com/android/settings/users/UserSettings.java |  8 ++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 318df631137..e4244227491 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4369,7 +4369,7 @@
     <!-- Message to secondary users that only owner can manage users [CHAR LIMIT=none] -->
     <string name="user_cannot_manage_message" product="default">Only the phone\'s owner can manage users.</string>
     <!-- Message to limited users that they cannot add accounts [CHAR LIMIT=100] -->
-    <string name="user_cannot_add_accounts_message">Limited users cannot add accounts</string>
+    <string name="user_cannot_add_accounts_message">Restricted profiles cannot add accounts</string>
 
     <!-- User details remove user menu [CHAR LIMIT=20] -->
     <string name="user_remove_user_menu">Delete <xliff:g id="user_name">%1$s</xliff:g> from this device</string>
@@ -4381,6 +4381,8 @@
     <string name="user_confirm_remove_self_title">Delete yourself?</string>
     <!-- User removal confirmation title [CHAR LIMIT=25] -->
     <string name="user_confirm_remove_title">Remove user?</string>
+    <!-- Profile removal confirmation title [CHAR LIMIT=25] -->
+    <string name="user_profile_confirm_remove_title">Remove profile?</string>
     <!-- User (self) removal confirmation message [CHAR LIMIT=none] -->
     <string name="user_confirm_remove_self_message" product="tablet">You will lose your space and data on this tablet. You can\'t undo this action.</string>
     <!-- User (self) removal confirmation message [CHAR LIMIT=none] -->
@@ -4389,6 +4391,10 @@
     <string name="user_confirm_remove_message" product="tablet">This user\'s space and data will disappear from this tablet. You can\'t undo this action.</string>
     <!-- User removal confirmation message [CHAR LIMIT=none] -->
     <string name="user_confirm_remove_message" product="default">This user\'s space and data will disappear from this phone. You can\'t undo this action.</string>
+    <!-- User profile removal confirmation message [CHAR LIMIT=none] -->
+    <string name="user_profile_confirm_remove_message" product="tablet">This profile\'s space and data will disappear from this tablet. You can\'t undo this action.</string>
+    <!-- User profile removal confirmation message [CHAR LIMIT=none] -->
+    <string name="user_profile_confirm_remove_message" product="default">This profile\'s space and data will disappear from this phone. You can\'t undo this action.</string>
     <!-- Setting label to show that a new user is being added [CHAR LIMIT=30] -->
     <string name="user_adding_new_user">Adding new user\u2026</string>
     <!-- Spoken content description for delete icon beside a user [CHAR LIMIT=none] -->
@@ -4468,7 +4474,7 @@
     <!-- Summary for app entries that are controlled by another entry [CHAR LIMIT=none] -->
     <string name="user_restrictions_controlled_by">Controlled by <xliff:g id="app">%1$s</xliff:g></string>
     <!-- Summary for apps that aren't supported in limited users [CHAR LIMIT=none] -->
-    <string name="app_not_supported_in_limited">This app is not supported in limited users</string>
+    <string name="app_not_supported_in_limited">This app is not supported in restricted profiles</string>
     <!-- Summary text for apps that are allowed to access accounts from the primary user [CHAR LIMIT=none] -->
     <string name="app_sees_restricted_accounts">This app can access your accounts</string>
 
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 2fc043eea39..962f7b82619 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -383,10 +383,14 @@ public class UserSettings extends SettingsPreferenceFragment
                 Dialog dlg = new AlertDialog.Builder(getActivity())
                     .setTitle(UserHandle.myUserId() == mRemovingUserId
                             ? R.string.user_confirm_remove_self_title
-                            : R.string.user_confirm_remove_title)
+                            : (mUserManager.getUserInfo(mRemovingUserId).isRestricted()
+                                    ? R.string.user_profile_confirm_remove_title
+                                    : R.string.user_confirm_remove_title))
                     .setMessage(UserHandle.myUserId() == mRemovingUserId
                             ? R.string.user_confirm_remove_self_message
-                            : R.string.user_confirm_remove_message)
+                            : (mUserManager.getUserInfo(mRemovingUserId).isRestricted()
+                                    ? R.string.user_profile_confirm_remove_message
+                                    : R.string.user_confirm_remove_message))
                     .setPositiveButton(R.string.user_delete_button,
                         new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialog, int which) {