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

Control user switching UI visibility according to config

Browse Source 
Bug: 375394047
Test: atest UserDetailsSettingsTest UserSettingsTest
Test: build platform with config overrides, check the result
Flag: EXEMPT Desktop-only change
Change-Id: Iaf1ac6c98a648066bf77b069039dcd59e243835f
This commit is contained in:
Denis Kuznetsov
2024-11-21 15:31:06 +01:00
parent a3cdf47415
commit 472e415659
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/users/UserCapabilities.java
View File

@@ -36,6 +36,7 @@ public class UserCapabilities {
boolean mIsAdmin; boolean mIsAdmin;
boolean mIsGuest; boolean mIsGuest;
boolean mIsEphemeral; boolean mIsEphemeral;
boolean mUserSwitchingUiEnabled;
boolean mUserSwitcherEnabled; boolean mUserSwitcherEnabled;
boolean mCanAddGuest; boolean mCanAddGuest;
boolean mDisallowAddUser; boolean mDisallowAddUser;
@@ -68,7 +69,8 @@ public class UserCapabilities {
caps.mCanAddRestrictedProfile = caps.mCanAddRestrictedProfile =
offerRestricted && !dpm.isDeviceManaged() && userManager.isUserTypeEnabled( offerRestricted && !dpm.isDeviceManaged() && userManager.isUserTypeEnabled(
UserManager.USER_TYPE_FULL_RESTRICTED); UserManager.USER_TYPE_FULL_RESTRICTED);
caps.mUserSwitchingUiEnabled = context.getResources().getBoolean(
com.android.internal.R.bool.config_allowChangeUserSwitcherEnabled);
caps.updateAddUserCapabilities(context); caps.updateAddUserCapabilities(context);
return caps; return caps;
} }
@@ -134,6 +136,7 @@ public class UserCapabilities {
", mEnforcedAdmin=" + mEnforcedAdmin + ", mEnforcedAdmin=" + mEnforcedAdmin +
", mDisallowSwitchUser=" + mDisallowSwitchUser + ", mDisallowSwitchUser=" + mDisallowSwitchUser +
", mDisallowAddUserSetByAdmin=" + mDisallowAddUserSetByAdmin + ", mDisallowAddUserSetByAdmin=" + mDisallowAddUserSetByAdmin +
", mUserSwitchingUiEnabled=" + mUserSwitchingUiEnabled +
", mUserSwitcherEnabled=" + mUserSwitcherEnabled + ", mUserSwitcherEnabled=" + mUserSwitcherEnabled +
'}'; '}';
} }

2
src/com/android/settings/users/UserDetailsSettings.java
View File

@@ -354,6 +354,8 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
mGrantAdminPref.setChecked(mUserInfo.isAdmin()); mGrantAdminPref.setChecked(mUserInfo.isAdmin());
mSwitchUserPref.setVisible(mUserCaps.mUserSwitchingUiEnabled);
mSwitchUserPref.setTitle( mSwitchUserPref.setTitle(
context.getString(com.android.settingslib.R.string.user_switch_to_user, context.getString(com.android.settingslib.R.string.user_switch_to_user,
mUserInfo.name)); mUserInfo.name));

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

@@ -287,7 +287,7 @@ public class UserSettings extends SettingsPreferenceFragment
final SettingsActivity activity = (SettingsActivity) getActivity(); final SettingsActivity activity = (SettingsActivity) getActivity();
final SettingsMainSwitchBar switchBar = activity.getSwitchBar(); final SettingsMainSwitchBar switchBar = activity.getSwitchBar();
switchBar.setTitle(getContext().getString(R.string.multiple_users_main_switch_title)); switchBar.setTitle(getContext().getString(R.string.multiple_users_main_switch_title));
if (!mUserCaps.mIsGuest) { if (!mUserCaps.mIsGuest && mUserCaps.mUserSwitchingUiEnabled) {
switchBar.show(); switchBar.show();
} else { } else {
switchBar.hide(); switchBar.hide();