Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-qpr-dev

This commit is contained in:
Treehugger Robot
2024-12-03 19:51:15 +00:00
committed by Android (Google) Code Review

View File

@@ -431,8 +431,8 @@ public class UserSettings extends SettingsPreferenceFragment
int pos = 0; int pos = 0;
// TODO(b/191509236): The menu item does not need to be accessible for guest users, // TODO(b/191509236): The menu item does not need to be accessible for guest users,
// regardless of mGuestUserAutoCreated // regardless of mGuestUserAutoCreated
if (!mUserCaps.mIsAdmin && canSwitchUserNow() && !(isCurrentUserGuest() if (!mUserCaps.mIsAdmin && canSwitchUserNow() && !mUserManager.isProfile()
&& mGuestUserAutoCreated)) { && !(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));