Update main toggle state in User Settings onResume()

The toggle state used to be set on creation and only changed onSwitchToggled(). But the state can also change when restrictions are applied from outside of settings, or when user is added with toggle being off by default.

This change updates the state during execution of onResume() in Users Settings, which also aligns with the update strategy of other Toggles on this Settings page.

Bug: 362706097
Test: atest MultiUserSwitchBarControllerTest
Flag: EXEMPT bugfix
Change-Id: I8a994b2e0ddb672362e69653374b87f85ae1548c
This commit is contained in:
Tetiana Meronyk
2024-08-30 17:08:49 +00:00
parent d0ea9bc2bc
commit 9ba90e5b3b
2 changed files with 8 additions and 2 deletions

View File

@@ -53,6 +53,12 @@ public class MultiUserSwitchBarController implements SwitchWidgetController.OnSw
mSwitchBar = switchBar;
mListener = listener;
mUserCapabilities = UserCapabilities.create(context);
updateState();
mSwitchBar.setListener(this);
}
void updateState() {
mUserCapabilities.updateAddUserCapabilities(mContext);
mSwitchBar.setChecked(mUserCapabilities.mUserSwitcherEnabled);
if (Flags.fixDisablingOfMuToggleWhenRestrictionApplied()) {
@@ -74,7 +80,6 @@ public class MultiUserSwitchBarController implements SwitchWidgetController.OnSw
mSwitchBar.setEnabled(mUserCapabilities.mIsMain);
}
}
mSwitchBar.setListener(this);
}
@Override
@@ -92,7 +97,7 @@ 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) {
if (success && mListener != null && !Flags.newMultiuserSettingsUx()) {
mListener.onMultiUserSwitchChanged(isChecked);
}
return success;

View File

@@ -419,6 +419,7 @@ public class UserSettings extends SettingsPreferenceFragment
mTimeoutToDockUserPreferenceController.getPreferenceKey()));
mRemoveGuestOnExitPreferenceController.updateState(screen.findPreference(
mRemoveGuestOnExitPreferenceController.getPreferenceKey()));
mSwitchBarController.updateState();
if (mShouldUpdateUserList) {
updateUI();
}