diff options
| author | Amith Yamasani <yamasani@google.com> | 2013-05-22 15:08:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-22 15:08:53 -0700 |
| commit | 99f40d47581376ac40341cccdbd5c6645c30ec5e (patch) | |
| tree | 2f45ffa355b09d33afe7c5b7fd39e83b80eaa5bf | |
| parent | 20c94a627ba2cafe379daa68839d0ae982d7fee6 (diff) | |
| parent | 73662629957e03ef23cd1bc33640ce7d1e690e90 (diff) | |
| download | packages_apps_Settings-99f40d47581376ac40341cccdbd5c6645c30ec5e.tar.gz packages_apps_Settings-99f40d47581376ac40341cccdbd5c6645c30ec5e.tar.bz2 packages_apps_Settings-99f40d47581376ac40341cccdbd5c6645c30ec5e.zip | |
am 73662629: am 21f008e1: Merge "Update strings for clarity about restricted profiles" into jb-mr2-dev
* commit '73662629957e03ef23cd1bc33640ce7d1e690e90':
Update strings for clarity about restricted profiles
| -rw-r--r-- | res/values/strings.xml | 4 | ||||
| -rw-r--r-- | src/com/android/settings/users/UserSettings.java | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 846560bc4..4d09484d9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4353,7 +4353,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] --> @@ -4476,7 +4476,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 8961500f9..a19158f04 100644 --- 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 |