PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove overflow from guest user settings"

Browse Source
This commit is contained in:
Tetiana Meronyk
2022-08-26 12:17:18 +00:00
committed by Android (Google) Code Review
parent 06664b8c37 53a45bea3d
commit 4b3a489ad3
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/users/UserSettings.java
View File

@@ -279,7 +279,7 @@ public class UserSettings extends SettingsPreferenceFragment
final SettingsActivity activity = (SettingsActivity) getActivity(); final SettingsActivity activity = (SettingsActivity) getActivity();
final SettingsMainSwitchBar switchBar = activity.getSwitchBar(); final SettingsMainSwitchBar switchBar = activity.getSwitchBar();
switchBar.setTitle(getContext().getString(R.string.multiple_users_main_switch_title)); switchBar.setTitle(getContext().getString(R.string.multiple_users_main_switch_title));
if (mUserCaps.mIsAdmin) { if (isCurrentUserAdmin()) {
switchBar.show(); switchBar.show();
} else { } else {
switchBar.hide(); switchBar.hide();
@@ -358,7 +358,7 @@ public class UserSettings extends SettingsPreferenceFragment
mMePreference = new UserPreference(getPrefContext(), null /* attrs */, myUserId); mMePreference = new UserPreference(getPrefContext(), null /* attrs */, myUserId);
mMePreference.setKey(KEY_USER_ME); mMePreference.setKey(KEY_USER_ME);
mMePreference.setOnPreferenceClickListener(this); mMePreference.setOnPreferenceClickListener(this);
if (mUserCaps.mIsAdmin) { if (isCurrentUserAdmin()) {
mMePreference.setSummary(R.string.user_admin); mMePreference.setSummary(R.string.user_admin);
} }
@@ -449,10 +449,7 @@ public class UserSettings extends SettingsPreferenceFragment
@Override @Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
int pos = 0; int pos = 0;
// TODO(b/191509236): The menu item does not need to be accessible for guest users, if (!isCurrentUserAdmin() && canSwitchUserNow() && !isCurrentUserGuest()) {
// regardless of mGuestUserAutoCreated
if (!mUserCaps.mIsAdmin && canSwitchUserNow() && !(isCurrentUserGuest()
&& mGuestUserAutoCreated)) {
String nickname = mUserManager.getUserName(); String nickname = mUserManager.getUserName();
MenuItem removeThisUser = menu.add(0, MENU_REMOVE_USER, pos++, MenuItem removeThisUser = menu.add(0, MENU_REMOVE_USER, pos++,
getResources().getString(R.string.user_remove_user_menu, nickname)); getResources().getString(R.string.user_remove_user_menu, nickname));
@@ -1211,12 +1208,12 @@ public class UserSettings extends SettingsPreferenceFragment
// don't show the guest user icon, instead we show two preferences for guest user to // don't show the guest user icon, instead we show two preferences for guest user to
// exit and reset itself. Hence we don't add mMePreference, i.e. guest user to the // exit and reset itself. Hence we don't add mMePreference, i.e. guest user to the
// list of users visible in the UI. // list of users visible in the UI.
if (!mUserCaps.mIsGuest) { if (!isCurrentUserGuest()) {
userPreferences.add(mMePreference); userPreferences.add(mMePreference);
} }
boolean canOpenUserDetails = boolean canOpenUserDetails =
mUserCaps.mIsAdmin || (canSwitchUserNow() && !mUserCaps.mDisallowSwitchUser); isCurrentUserAdmin() || (canSwitchUserNow() && !mUserCaps.mDisallowSwitchUser);
for (UserInfo user : users) { for (UserInfo user : users) {
if (user.isGuest()) { if (user.isGuest()) {
// Guest user is added to guest category via updateGuestCategory // Guest user is added to guest category via updateGuestCategory
@@ -1341,6 +1338,10 @@ public class UserSettings extends SettingsPreferenceFragment
return mUserCaps.mIsGuest; return mUserCaps.mIsGuest;
} }
private boolean isCurrentUserAdmin() {
return mUserCaps.mIsAdmin;
}
private boolean canSwitchUserNow() { private boolean canSwitchUserNow() {
return mUserManager.getUserSwitchability() == UserManager.SWITCHABILITY_STATUS_OK; return mUserManager.getUserSwitchability() == UserManager.SWITCHABILITY_STATUS_OK;
} }
@@ -1388,7 +1389,7 @@ public class UserSettings extends SettingsPreferenceFragment
UserPreference pref = null; UserPreference pref = null;
boolean isGuestAlreadyCreated = false; boolean isGuestAlreadyCreated = false;
boolean canOpenUserDetails = boolean canOpenUserDetails =
mUserCaps.mIsAdmin || (canSwitchUserNow() && !mUserCaps.mDisallowSwitchUser); isCurrentUserAdmin() || (canSwitchUserNow() && !mUserCaps.mDisallowSwitchUser);
mGuestUserCategory.removeAll(); mGuestUserCategory.removeAll();
mGuestUserCategory.setVisible(false); mGuestUserCategory.setVisible(false);
@@ -1436,7 +1437,7 @@ public class UserSettings extends SettingsPreferenceFragment
// "reset guest on exit" preference is shown hence also make guest category visible // "reset guest on exit" preference is shown hence also make guest category visible
mGuestUserCategory.setVisible(true); mGuestUserCategory.setVisible(true);
} }
if (mUserCaps.mIsGuest) { if (isCurrentUserGuest()) {
// guest category is not visible for guest user. // guest category is not visible for guest user.
mGuestUserCategory.setVisible(false); mGuestUserCategory.setVisible(false);
} }