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

Merge "Don't show private accounts when locked" into main

Browse Source
This commit is contained in:
Manish Singh
2024-03-19 18:09:25 +00:00
committed by Android (Google) Code Review
parent 1b9988e77f c5e07bb662
commit b41979a012
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/MainClear.java
View File

@@ -17,6 +17,7 @@
package com.android.settings; package com.android.settings;
import static android.app.admin.DevicePolicyResources.Strings.Settings.PERSONAL_CATEGORY_HEADER; import static android.app.admin.DevicePolicyResources.Strings.Settings.PERSONAL_CATEGORY_HEADER;
import static android.app.admin.DevicePolicyResources.Strings.Settings.PRIVATE_CATEGORY_HEADER;
import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_CATEGORY_HEADER; import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_CATEGORY_HEADER;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -505,6 +506,9 @@ public class MainClear extends InstrumentedFragment implements OnGlobalLayoutLis
final UserInfo userInfo = profiles.get(profileIndex); final UserInfo userInfo = profiles.get(profileIndex);
final int profileId = userInfo.id; final int profileId = userInfo.id;
final UserHandle userHandle = new UserHandle(profileId); final UserHandle userHandle = new UserHandle(profileId);
if (Utils.shouldHideUser(userHandle, um)) {
continue;
}
Account[] accounts = mgr.getAccountsAsUser(profileId); Account[] accounts = mgr.getAccountsAsUser(profileId);
final int accountLength = accounts.length; final int accountLength = accounts.length;
if (accountLength == 0) { if (accountLength == 0) {
@@ -529,6 +533,13 @@ public class MainClear extends InstrumentedFragment implements OnGlobalLayoutLis
titleText.setText(devicePolicyManager.getResources().getString( titleText.setText(devicePolicyManager.getResources().getString(
WORK_CATEGORY_HEADER, () -> getString( WORK_CATEGORY_HEADER, () -> getString(
com.android.settingslib.R.string.category_work))); com.android.settingslib.R.string.category_work)));
} else if (android.os.Flags.allowPrivateProfile()
&& android.multiuser.Flags.enablePrivateSpaceFeatures()
&& android.multiuser.Flags.handleInterleavedSettingsForPrivateSpace()
&& userInfo.isPrivateProfile()) {
titleText.setText(devicePolicyManager.getResources().getString(
PRIVATE_CATEGORY_HEADER, () -> getString(
com.android.settingslib.R.string.category_private)));
} else { } else {
titleText.setText(devicePolicyManager.getResources().getString( titleText.setText(devicePolicyManager.getResources().getString(
PERSONAL_CATEGORY_HEADER, () -> getString( PERSONAL_CATEGORY_HEADER, () -> getString(