diff options
author | Amith Yamasani <yamasani@google.com> | 2013-05-22 22:04:59 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-22 22:04:59 +0000 |
commit | 21f008e1f4e2d5e84fdab041d2ef31f305bbcf09 (patch) | |
tree | 90ca9636a85907368411cd9c1da15055ffb9bea2 /src/com/android/settings/users | |
parent | 7229e29f1749ae10bd92b59ec3d663698a5045e7 (diff) | |
parent | 7c4dfccda44efa98b804dd5d07cd28e9e5761ca3 (diff) | |
download | packages_apps_Settings-21f008e1f4e2d5e84fdab041d2ef31f305bbcf09.tar.gz packages_apps_Settings-21f008e1f4e2d5e84fdab041d2ef31f305bbcf09.tar.bz2 packages_apps_Settings-21f008e1f4e2d5e84fdab041d2ef31f305bbcf09.zip |
Merge "Update strings for clarity about restricted profiles" into jb-mr2-dev
Diffstat (limited to 'src/com/android/settings/users')
-rw-r--r-- | src/com/android/settings/users/UserSettings.java | 6 |
1 files changed, 1 insertions, 5 deletions
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 |