diff options
| author | Amith Yamasani <yamasani@google.com> | 2013-04-28 22:13:22 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2013-04-28 22:13:22 -0700 |
| commit | b0171715876b672c94c8a5aaafde95ff47b234b4 (patch) | |
| tree | 4489b5fdaef13558e695675a28e278864251e868 /src/com/android/settings/users | |
| parent | c5b036571ed2eeae73b0551848e7f7efdc016a52 (diff) | |
| download | packages_apps_Settings-b0171715876b672c94c8a5aaafde95ff47b234b4.tar.gz packages_apps_Settings-b0171715876b672c94c8a5aaafde95ff47b234b4.tar.bz2 packages_apps_Settings-b0171715876b672c94c8a5aaafde95ff47b234b4.zip | |
Three kinds of owner info - owner, user and profile
Bug: 8736733
Put the summary "Restricted profile" under the user name in app restrictions panel.
Bug: 8736734
Change-Id: I6b724bd10a9246eb57831bffb737a48c01e0c285
Diffstat (limited to 'src/com/android/settings/users')
| -rw-r--r-- | src/com/android/settings/users/UserSettings.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index 962f7b826..04f774321 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -350,11 +350,15 @@ public class UserSettings extends SettingsPreferenceFragment } else if (info.id == UserHandle.myUserId()) { // Jump to owner info panel Bundle extras = new Bundle(); - extras.putBoolean(OwnerInfoSettings.EXTRA_SHOW_NICKNAME, true); + if (!info.isRestricted()) { + extras.putBoolean(OwnerInfoSettings.EXTRA_SHOW_NICKNAME, true); + } + int titleResId = info.id == UserHandle.USER_OWNER ? R.string.owner_info_settings_title + : (info.isRestricted() ? R.string.profile_info_settings_title + : R.string.user_info_settings_title); ((PreferenceActivity) getActivity()).startPreferencePanel( OwnerInfoSettings.class.getName(), - extras, R.string.user_info_settings_title, null, - null, 0); + extras, titleResId, null, null, 0); } } |