Merge "Control user switching UI visibility according to config" into main

2024-11-22 19:22:12 +00:00
parent 51c3cb49b3 472e415659
commit 851bf18783
3 changed files with 7 additions and 2 deletions
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -287,7 +287,7 @@ public class UserSettings extends SettingsPreferenceFragment
        final SettingsActivity activity = (SettingsActivity) getActivity();
        final SettingsMainSwitchBar switchBar = activity.getSwitchBar();
        switchBar.setTitle(getContext().getString(R.string.multiple_users_main_switch_title));
-        if (!mUserCaps.mIsGuest) {
+        if (!mUserCaps.mIsGuest && mUserCaps.mUserSwitchingUiEnabled) {
            switchBar.show();
        } else {
            switchBar.hide();