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

2016-06-15 17:58:09 +00:00
parent 13cbde654f 29056b98f8
commit d98cba58c8
1 changed files with 3 additions and 1 deletions
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -802,7 +802,9 @@ public class UserSettings extends SettingsPreferenceFragment
            userPreferences.add(pref);
            pref.setDisabledByAdmin(
                    mUserCaps.mDisallowAddUser ? mUserCaps.mEnforcedAdmin : null);
-            pref.setSelectable(false);
+            if (!pref.isDisabledByAdmin()) {
+                pref.setSelectable(false);
+            }
        }

        // Sort list of users by serialNum