Update strings for clarity about restricted profiles

Bug: 9051422
Bug: 9051178
Change-Id: I1b88286fdd0db27bb6980d0ebbc846370fd0082e

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1466ca6..dbdec2d 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4351,7 +4351,7 @@
     <!-- Summary for add user entry in the choice dialog [CHAR LIMIT=none] -->
     <string name="user_add_user_item_summary">Users have their own apps and content</string>
     <!-- Summary for add restricted profile entry in the choice dialog [CHAR LIMIT=none] -->
-    <string name="user_add_profile_item_summary">Restricted profiles can only access the apps and content from your accounts</string>
+    <string name="user_add_profile_item_summary">You can restrict access to apps and content from your account</string>
     <!-- Button text for adding a regular user [CHAR LIMIT=25] -->
     <string name="user_add_user_item_title">User</string>
     <!-- Button text for adding a restricted profile [CHAR LIMIT=25] -->
@@ -4474,7 +4474,7 @@
     <string name="cell_broadcast_settings_summary">Select the types of emergency alerts to display.</string>
 
     <!-- User app limits screen title [CHAR LIMIT=35] -->
-    <string name="user_restrictions_title">Allow apps and content</string>
+    <string name="user_restrictions_title">Application and content restrictions</string>
     <!-- User limits screen, user name rename text [CHAR LIMIT=15] -->
     <string name="user_rename">RENAME</string>
     <!-- Preference label for custom restrictions [CHAR LIMIT=35] -->

diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 8961500..a19158f 100644 (file)
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -376,13 +376,9 @@ public class UserSettings extends SettingsPreferenceFragment
             Bundle extras = new Bundle();
             extras.putInt(AppRestrictionsFragment.EXTRA_USER_ID, userId);
             extras.putBoolean(AppRestrictionsFragment.EXTRA_NEW_USER, newUser);
-            String title = getResources().getString(R.string.user_new_user_name);
-            if (userId > UserHandle.USER_OWNER) {
-                title = mUserManager.getUserInfo(userId).name;
-            }
             ((PreferenceActivity) getActivity()).startPreferencePanel(
                     AppRestrictionsFragment.class.getName(),
-                    extras, 0, title,
+                    extras, R.string.user_restrictions_title, null,
                     null, 0);
         } else if (info.id == UserHandle.myUserId()) {
             // Jump to owner info panel