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

Commit b0706be4 authored by Tetiana Meronyk's avatar Tetiana Meronyk
Browse files

Set availability of AddUserWhenLockedPreference before it gets displayed. 

This prevents flickering if the preference is meant to be hidden.

Bug: 373269781
Test: manual
Flag: EXEMPT bugfix
Change-Id: Ibf1e1915e9ad872bdaaba30fb7fa9047665531f7
parent 49677b7a

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

+5 −3
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ public class AddUserWhenLockedPreferenceController extends TogglePreferenceContr 
                restrictedSwitchPreference.setVisible(true);

                if (mUserCaps.mDisallowAddUserSetByAdmin) {

                    restrictedSwitchPreference.setDisabledByAdmin(mUserCaps.mEnforcedAdmin);

                } else if (mUserCaps.mDisallowAddUser) {

                    restrictedSwitchPreference.setVisible(false);

                }

            } else {

                restrictedSwitchPreference.setDisabledByAdmin(
@@ -62,7 +60,11 @@ public class AddUserWhenLockedPreferenceController extends TogglePreferenceContr 
        if (!mUserCaps.isAdmin()) {

            return DISABLED_FOR_USER;

        } else if (android.multiuser.Flags.newMultiuserSettingsUx()) {

            if (mUserCaps.mDisallowAddUser && !mUserCaps.mDisallowAddUserSetByAdmin) {

                return DISABLED_FOR_USER;

            } else {

                return AVAILABLE;

            }

        } else if (mUserCaps.disallowAddUser() || mUserCaps.disallowAddUserSetByAdmin()) {

            return DISABLED_FOR_USER;

        } else {