Check the user limit before showing an ADD menu item
Change-Id: I0c5cffa149bfbf6824273b7180db55e1fe313021
This commit is contained in:
@@ -172,9 +172,11 @@ public class UserSettings extends SettingsPreferenceFragment
|
|||||||
@Override
|
@Override
|
||||||
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
|
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
|
||||||
if (UserHandle.myUserId() == UserHandle.USER_OWNER) {
|
if (UserHandle.myUserId() == UserHandle.USER_OWNER) {
|
||||||
MenuItem addUserItem = menu.add(0, MENU_ADD_USER, 0, R.string.user_add_user_menu);
|
if (mUserManager.getMaxSupportedUsers() > mUserManager.getUsers().size()) {
|
||||||
addUserItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
|
MenuItem addUserItem = menu.add(0, MENU_ADD_USER, 0, R.string.user_add_user_menu);
|
||||||
| MenuItem.SHOW_AS_ACTION_WITH_TEXT);
|
addUserItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
|
||||||
|
| MenuItem.SHOW_AS_ACTION_WITH_TEXT);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
MenuItem removeThisUser = menu.add(0, MENU_REMOVE_USER, 0, R.string.user_remove_user_menu);
|
MenuItem removeThisUser = menu.add(0, MENU_REMOVE_USER, 0, R.string.user_remove_user_menu);
|
||||||
removeThisUser.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
|
removeThisUser.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
|
||||||
@@ -338,6 +340,7 @@ public class UserSettings extends SettingsPreferenceFragment
|
|||||||
pref.setIcon(R.drawable.ic_user);
|
pref.setIcon(R.drawable.ic_user);
|
||||||
mUserListCategory.addPreference(pref);
|
mUserListCategory.addPreference(pref);
|
||||||
}
|
}
|
||||||
|
getActivity().invalidateOptionsMenu();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* TODO: Put this in an AsyncTask */
|
/* TODO: Put this in an AsyncTask */
|
||||||
|
Reference in New Issue
Block a user