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

Commit 7e0b577d authored by Tetiana Meronyk's avatar Tetiana Meronyk
Browse files

Flag removal: NewMultiuserSettingsUx 

Bug: 409610378
Test: N/A
Flag: EXEMPT removing new_multiuser_settings_ux
Change-Id: I38f45396d838ff23c168373d59a85a7007856d5d
parent dcf663bb

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

+5 −17
Original line number Diff line number Diff line
@@ -42,16 +42,10 @@ public class AddUserWhenLockedPreferenceController extends TogglePreferenceContr 
        if (!isAvailable()) {

            restrictedSwitchPreference.setVisible(false);

        } else {

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

            restrictedSwitchPreference.setVisible(true);

            if (mUserCaps.mDisallowAddUserSetByAdmin) {

                restrictedSwitchPreference.setDisabledByAdmin(mUserCaps.mEnforcedAdmin);

            }

            } else {

                restrictedSwitchPreference.setDisabledByAdmin(

                        mUserCaps.disallowAddUser() ? mUserCaps.getEnforcedAdmin() : null);

                restrictedSwitchPreference.setVisible(mUserCaps.mUserSwitcherEnabled);

            }

        }

    }
@@ -59,17 +53,11 @@ public class AddUserWhenLockedPreferenceController extends TogglePreferenceContr 
    public int getAvailabilityStatus() {

        if (!mUserCaps.isAdmin()) {

            return DISABLED_FOR_USER;

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

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

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

            return DISABLED_FOR_USER;

        } else {

            return AVAILABLE;

        }

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

            return DISABLED_FOR_USER;

        } else {

            return mUserCaps.mUserSwitcherEnabled ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;

        }

    }



    @Override

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

+13 −31
Original line number Diff line number Diff line
@@ -48,21 +48,10 @@ public class GuestTelephonyPreferenceController extends TogglePreferenceControll 
    @Override

    public int getAvailabilityStatus() {

        if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY)

                || UserManager.isHeadlessSystemUserMode()) {

            return DISABLED_FOR_USER;

        }

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

            if (!mUserCaps.isAdmin()) {

                || UserManager.isHeadlessSystemUserMode() || !mUserCaps.isAdmin()) {

            return DISABLED_FOR_USER;

        }

        return AVAILABLE;

        } else {

            if (!mUserCaps.isAdmin() || !mUserCaps.mCanAddGuest) {

                return DISABLED_FOR_USER;

            } else {

                return mUserCaps.mUserSwitcherEnabled ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;

            }

        }

    }



    @Override
@@ -95,7 +84,6 @@ public class GuestTelephonyPreferenceController extends TogglePreferenceControll 
        if (!isAvailable()) {

            restrictedSwitchPreference.setVisible(false);

        } else {

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

            restrictedSwitchPreference.setVisible(true);

            final RestrictedLockUtils.EnforcedAdmin disallowRemoveUserAdmin =

                    RestrictedLockUtilsInternal.checkIfRestrictionEnforced(mContext,
@@ -108,12 +96,6 @@ public class GuestTelephonyPreferenceController extends TogglePreferenceControll 
                // Adding user is restricted by system

                restrictedSwitchPreference.setVisible(false);

            }

            } else {

                restrictedSwitchPreference.setDisabledByAdmin(

                        mUserCaps.disallowAddUser() ? mUserCaps.getEnforcedAdmin() : null);

                restrictedSwitchPreference.setVisible(mUserCaps.mUserSwitcherEnabled

                        && isAvailable());

            }

        }

    }

}

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

+0 −4
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.settings.users;



import android.content.Context;

import android.multiuser.Flags;

import android.os.UserHandle;

import android.os.UserManager;

import android.provider.Settings;
@@ -87,9 +86,6 @@ public class MultiUserSwitchBarController implements SwitchWidgetController.OnSw 
        Log.d(TAG, "Toggling multi-user feature enabled state to: " + isChecked);

        final boolean success = Settings.Global.putInt(mContext.getContentResolver(),

                Settings.Global.USER_SWITCHER_ENABLED, isChecked ? 1 : 0);

        if (success && mListener != null && !Flags.newMultiuserSettingsUx()) {

            mListener.onMultiUserSwitchChanged(isChecked);

        }

        return success;

    }

}

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

+1 −5
Original line number Diff line number Diff line
@@ -47,10 +47,6 @@ public class MultiUserTopIntroPreferenceController extends BasePreferenceControl 
    @Override

    public void updateState(Preference preference) {

        mUserCaps.updateAddUserCapabilities(mContext);

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

        preference.setVisible(!mUserCaps.mIsGuest);

        } else {

            preference.setVisible(isAvailable());

        }

    }

}

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

+16 −34
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ public class RemoveGuestOnExitPreferenceController extends BasePreferenceControl 
        if (!isAvailable()) {

            restrictedSwitchPreference.setVisible(false);

        } else {

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

            restrictedSwitchPreference.setVisible(true);

            final RestrictedLockUtils.EnforcedAdmin disallowRemoveUserAdmin =

                    RestrictedLockUtilsInternal.checkIfRestrictionEnforced(mContext,
@@ -86,11 +85,6 @@ public class RemoveGuestOnExitPreferenceController extends BasePreferenceControl 
                // Adding user is restricted by system

                restrictedSwitchPreference.setVisible(false);

            }

            } else {

                restrictedSwitchPreference.setDisabledByAdmin(

                        mUserCaps.disallowAddUser() ? mUserCaps.getEnforcedAdmin() : null);

                restrictedSwitchPreference.setVisible(mUserCaps.mUserSwitcherEnabled);

            }

        }

    }
@@ -100,7 +94,6 @@ public class RemoveGuestOnExitPreferenceController extends BasePreferenceControl 
        // then disable this controller

        // also disable this controller for non-admin users

        // also disable when config_guestUserAllowEphemeralStateChange is false

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

        if (mUserManager.isGuestUserAlwaysEphemeral()

                || !UserManager.isGuestUserAllowEphemeralStateChange()

                || !mUserCaps.isAdmin()) {
@@ -108,17 +101,6 @@ public class RemoveGuestOnExitPreferenceController extends BasePreferenceControl 
        } else {

            return AVAILABLE;

        }

        } else {

            if (mUserManager.isGuestUserAlwaysEphemeral()

                    || !UserManager.isGuestUserAllowEphemeralStateChange()

                    || !mUserCaps.isAdmin()

                    || mUserCaps.disallowAddUser()

                    || mUserCaps.disallowAddUserSetByAdmin()) {

                return DISABLED_FOR_USER;

            } else {

                return mUserCaps.mUserSwitcherEnabled ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;

            }

        }

    }



    private boolean isChecked() {