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

Don't add private profile accounts to Personal tab

Browse Source 
If there are no tabs to show then the single Passwords & accounts page
shows all the profiles under the corresponding headings.
No tabs are shown only when the PS is locked and there's no work
profile. And if PS is locked then we don't want to show any PS setting.
On the other hand if PS is not locked then we'll have tabs.

Bug: 309423484
Test: manual
Change-Id: Iebc62fbc4caf21988af6aa1af4fbd570f4c80ada
This commit is contained in:
Manish Singh
2023-11-15 11:50:47 +00:00
parent 7a556b851c
commit 9e0437bc5b
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/accounts/AccountPreferenceController.java
View File

@@ -45,6 +45,7 @@ import android.content.pm.UserInfo;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.os.Flags;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.text.BidiFormatter; import android.text.BidiFormatter;
@@ -297,13 +298,22 @@ public class AccountPreferenceController extends AbstractPreferenceController
} else { } else {
List<UserInfo> profiles = mUm.getProfiles(UserHandle.myUserId()); List<UserInfo> profiles = mUm.getProfiles(UserHandle.myUserId());
for (UserInfo profile : profiles) { for (UserInfo profile : profiles) {
if ((profile.isManagedProfile() // Check if this controller can handle this profile - e.g. if this controller's
&& (mType & ProfileSelectFragment.ProfileType.WORK) != 0) // mType has the WORK flag set and this profile is a managed profile.
|| (profile.isPrivateProfile() // If there are no tabs then this controller will support all profile types -
// - ProfileType.ALL.
// At the same time we should check the user property to make sure if this profile
// should be shown or not.
if (((profile.isManagedProfile()
&& (mType & ProfileSelectFragment.ProfileType.WORK) != 0)
|| (Flags.allowPrivateProfile()
&& profile.isPrivateProfile()
&& (mType & ProfileSelectFragment.ProfileType.PRIVATE) != 0) && (mType & ProfileSelectFragment.ProfileType.PRIVATE) != 0)
|| (!profile.isManagedProfile() || (!profile.isManagedProfile()
&& !profile.isPrivateProfile() && !(Flags.allowPrivateProfile() && profile.isPrivateProfile())
&& (mType & ProfileSelectFragment.ProfileType.PERSONAL) != 0)) { && (mType & ProfileSelectFragment.ProfileType.PERSONAL) != 0))
&& !(mUm.getUserProperties(profile.getUserHandle())
.getHideInSettingsInQuietMode() && profile.isQuietModeEnabled())) {
updateProfileUi(profile); updateProfileUi(profile);
} }
} }