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

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

Browse Source
This commit is contained in:
Treehugger Robot
2024-12-03 19:51:15 +00:00
committed by Android (Google) Code Review
parent 30427fa945 a2f5c08370
commit ed4d949e5a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -464,7 +464,8 @@ 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;
if (!isCurrentUserAdmin() && canSwitchUserNow() && !isCurrentUserGuest()) { if (!isCurrentUserAdmin() && canSwitchUserNow() && !isCurrentUserGuest()
&& !mUserManager.isProfile()) {
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));