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/OwnerInfoSettings.java | |
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/OwnerInfoSettings.java')
-rw-r--r-- | src/com/android/settings/OwnerInfoSettings.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/settings/OwnerInfoSettings.java b/src/com/android/settings/OwnerInfoSettings.java index 51d166c2b..2f7721baa 100644 --- a/src/com/android/settings/OwnerInfoSettings.java +++ b/src/com/android/settings/OwnerInfoSettings.java @@ -81,7 +81,11 @@ public class OwnerInfoSettings extends Fragment { } mCheckbox.setChecked(enabled); if (UserHandle.myUserId() != UserHandle.USER_OWNER) { - mCheckbox.setText(R.string.show_user_info_on_lockscreen_label); + if (UserManager.get(getActivity()).isLinkedUser()) { + mCheckbox.setText(R.string.show_profile_info_on_lockscreen_label); + } else { + mCheckbox.setText(R.string.show_user_info_on_lockscreen_label); + } } mCheckbox.setOnCheckedChangeListener(new OnCheckedChangeListener() { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { |