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

Merge "Make guest field unselectable only if it is not disabled by admin."

Browse Source
This commit is contained in:
Sudheer Shanka
2016-06-15 17:58:09 +00:00
committed by Android (Google) Code Review
parent 13cbde654f 29056b98f8
commit d98cba58c8
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -802,8 +802,10 @@ public class UserSettings extends SettingsPreferenceFragment
userPreferences.add(pref); userPreferences.add(pref);
pref.setDisabledByAdmin( pref.setDisabledByAdmin(
mUserCaps.mDisallowAddUser ? mUserCaps.mEnforcedAdmin : null); mUserCaps.mDisallowAddUser ? mUserCaps.mEnforcedAdmin : null);
if (!pref.isDisabledByAdmin()) {
pref.setSelectable(false); pref.setSelectable(false);
} }
}
// Sort list of users by serialNum // Sort list of users by serialNum
Collections.sort(userPreferences, UserPreference.SERIAL_NUMBER_COMPARATOR); Collections.sort(userPreferences, UserPreference.SERIAL_NUMBER_COMPARATOR);