Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31af2ff6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 00a94388 6e413c4c

src/com/android/settings/users/UserSettings.java

+2 −1
Original line number Diff line number Diff line
@@ -464,7 +464,8 @@ public class UserSettings extends SettingsPreferenceFragment 
    @Override

    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {

        int pos = 0;

        if (!isCurrentUserAdmin() && canSwitchUserNow() && !isCurrentUserGuest()) {

        if (!isCurrentUserAdmin() && canSwitchUserNow() && !isCurrentUserGuest()

                && !mUserManager.isProfile()) {

            String nickname = mUserManager.getUserName();

            MenuItem removeThisUser = menu.add(0, MENU_REMOVE_USER, pos++,

                    getResources().getString(R.string.user_remove_user_menu, nickname));