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

Merge "Update main toggle state in User Settings onResume()" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-09-06 14:29:09 +00:00
committed by Android (Google) Code Review
parent 680df21339 9ba90e5b3b
commit c3cfb42524
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/users/MultiUserSwitchBarController.java
View File

@@ -53,6 +53,12 @@ public class MultiUserSwitchBarController implements SwitchWidgetController.OnSw
mSwitchBar = switchBar; mSwitchBar = switchBar;
mListener = listener; mListener = listener;
mUserCapabilities = UserCapabilities.create(context); mUserCapabilities = UserCapabilities.create(context);
updateState();
mSwitchBar.setListener(this);
}
void updateState() {
mUserCapabilities.updateAddUserCapabilities(mContext);
mSwitchBar.setChecked(mUserCapabilities.mUserSwitcherEnabled); mSwitchBar.setChecked(mUserCapabilities.mUserSwitcherEnabled);
if (Flags.fixDisablingOfMuToggleWhenRestrictionApplied()) { if (Flags.fixDisablingOfMuToggleWhenRestrictionApplied()) {
@@ -74,7 +80,6 @@ public class MultiUserSwitchBarController implements SwitchWidgetController.OnSw
mSwitchBar.setEnabled(mUserCapabilities.mIsMain); mSwitchBar.setEnabled(mUserCapabilities.mIsMain);
} }
} }
mSwitchBar.setListener(this);
} }
@Override @Override
@@ -92,7 +97,7 @@ public class MultiUserSwitchBarController implements SwitchWidgetController.OnSw
Log.d(TAG, "Toggling multi-user feature enabled state to: " + isChecked); Log.d(TAG, "Toggling multi-user feature enabled state to: " + isChecked);
final boolean success = Settings.Global.putInt(mContext.getContentResolver(), final boolean success = Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.USER_SWITCHER_ENABLED, isChecked ? 1 : 0); Settings.Global.USER_SWITCHER_ENABLED, isChecked ? 1 : 0);
if (success && mListener != null) { if (success && mListener != null && !Flags.newMultiuserSettingsUx()) {
mListener.onMultiUserSwitchChanged(isChecked); mListener.onMultiUserSwitchChanged(isChecked);
} }
return success; return success;

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

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