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

Merge "Update the getHideInSettingsInQuietMode to getHideInUiInQuietMode" into main

Browse Source
This commit is contained in:
Olivier Nshimiye
2023-11-23 15:53:28 +00:00
committed by Android (Google) Code Review
parent e3d823cffd fcafdcffb0
commit 02399366cd
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/Utils.java
View File

@@ -1209,7 +1209,9 @@ public final class Utils extends com.android.settingslib.Utils {
for (UserHandle userHandle : profiles) { for (UserHandle userHandle : profiles) {
UserProperties userProperties = userManager.getUserProperties(userHandle); UserProperties userProperties = userManager.getUserProperties(userHandle);
if (userProperties.getShowInSettings() == UserProperties.SHOW_IN_SETTINGS_SEPARATE) { if (userProperties.getShowInSettings() == UserProperties.SHOW_IN_SETTINGS_SEPARATE) {
if (Flags.allowPrivateProfile() && userProperties.getHideInSettingsInQuietMode()) { if (Flags.allowPrivateProfile()
&& userProperties.getShowInQuietMode()
== UserProperties.SHOW_IN_QUIET_MODE_HIDDEN) {
if (!userManager.isQuietModeEnabled(userHandle)) { if (!userManager.isQuietModeEnabled(userHandle)) {
return true; return true;
} else { } else {

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

@@ -42,6 +42,7 @@ import android.content.IntentFilter;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.UserInfo; import android.content.pm.UserInfo;
import android.content.pm.UserProperties;
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;
@@ -312,7 +313,8 @@ public class AccountPreferenceController extends AbstractPreferenceController
&& !(Flags.allowPrivateProfile() && profile.isPrivateProfile()) && !(Flags.allowPrivateProfile() && profile.isPrivateProfile())
&& (mType & ProfileSelectFragment.ProfileType.PERSONAL) != 0)) && (mType & ProfileSelectFragment.ProfileType.PERSONAL) != 0))
&& !(mUm.getUserProperties(profile.getUserHandle()) && !(mUm.getUserProperties(profile.getUserHandle())
.getHideInSettingsInQuietMode() && profile.isQuietModeEnabled())) { .getShowInQuietMode() == UserProperties.SHOW_IN_QUIET_MODE_HIDDEN
&& profile.isQuietModeEnabled())) {
updateProfileUi(profile); updateProfileUi(profile);
} }
} }

2
src/com/android/settings/dashboard/profileselector/ProfileSelectDialog.java
View File

@@ -235,7 +235,7 @@ public class ProfileSelectDialog extends DialogFragment implements UserAdapter.O
private static boolean shouldHideUserInQuietMode( private static boolean shouldHideUserInQuietMode(
UserHandle userHandle, UserManager userManager) { UserHandle userHandle, UserManager userManager) {
UserProperties userProperties = userManager.getUserProperties(userHandle); UserProperties userProperties = userManager.getUserProperties(userHandle);
return userProperties.getHideInSettingsInQuietMode() return userProperties.getShowInQuietMode() == UserProperties.SHOW_IN_QUIET_MODE_HIDDEN
&& userManager.isQuietModeEnabled(userHandle); && userManager.isQuietModeEnabled(userHandle);
} }
} }