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

am 6be075d6: Check the user limit before showing an ADD menu item

Browse Source 
* commit '6be075d6c3de7a9fd28942e9e15f4790d0e73ca3':
  Check the user limit before showing an ADD menu item
This commit is contained in:
Amith Yamasani
2012-09-11 11:11:20 -07:00
committed by Android Git Automerger
parent ebca7f3e8e 6be075d6c3
commit f07f0d9b53
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -172,9 +172,11 @@ public class UserSettings extends SettingsPreferenceFragment
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
if (UserHandle.myUserId() == UserHandle.USER_OWNER) {
MenuItem addUserItem = menu.add(0, MENU_ADD_USER, 0, R.string.user_add_user_menu);
addUserItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
| MenuItem.SHOW_AS_ACTION_WITH_TEXT);
if (mUserManager.getMaxSupportedUsers() > mUserManager.getUsers().size()) {
MenuItem addUserItem = menu.add(0, MENU_ADD_USER, 0, R.string.user_add_user_menu);
addUserItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
| MenuItem.SHOW_AS_ACTION_WITH_TEXT);
}
} else {
MenuItem removeThisUser = menu.add(0, MENU_REMOVE_USER, 0, R.string.user_remove_user_menu);
removeThisUser.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
@@ -338,6 +340,7 @@ public class UserSettings extends SettingsPreferenceFragment
pref.setIcon(R.drawable.ic_user);
mUserListCategory.addPreference(pref);
}
getActivity().invalidateOptionsMenu();
}
/* TODO: Put this in an AsyncTask */