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

Merge "Only call super.updateState when work profile exists" into main

Browse Source
This commit is contained in:
Treehugger Robot
2025-03-19 16:31:38 -07:00
committed by Android (Google) Code Review
parent 6b98d239d5 2034843773
commit 0a1019cc64
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/notification/PoliteNotifWorkProfileToggleController.java
View File

@@ -102,12 +102,12 @@ public class PoliteNotifWorkProfileToggleController extends TogglePreferenceCont
return CONDITIONALLY_UNAVAILABLE; return CONDITIONALLY_UNAVAILABLE;
} }
return (mManagedProfileId != UserHandle.USER_NULL) ? AVAILABLE : DISABLED_FOR_USER; return hasManagedProfileUser() ? AVAILABLE : DISABLED_FOR_USER;
} }
@Override @Override
public boolean isChecked() { public boolean isChecked() {
if (!isCoolDownEnabledForPrimary()) { if (!isCoolDownEnabledForPrimary() || !hasManagedProfileUser()) {
return false; return false;
} }
return Settings.System.getIntForUser(mContext.getContentResolver(), return Settings.System.getIntForUser(mContext.getContentResolver(),
@@ -131,7 +131,13 @@ public class PoliteNotifWorkProfileToggleController extends TogglePreferenceCont
public void updateState(@Nullable Preference preference) { public void updateState(@Nullable Preference preference) {
if (preference == null) return; if (preference == null) return;
preference.setVisible(isAvailable()); preference.setVisible(isAvailable());
super.updateState(preference); if (isAvailable()) {
super.updateState(preference);
}
}
private boolean hasManagedProfileUser() {
return mManagedProfileId != UserHandle.USER_NULL;
} }
private boolean isCoolDownEnabledForPrimary() { private boolean isCoolDownEnabledForPrimary() {

13
tests/robotests/src/com/android/settings/notification/PoliteNotifWorkProfileToggleControllerTest.java
View File

@@ -26,6 +26,7 @@ import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
import android.os.UserHandle; import android.os.UserHandle;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule; import android.platform.test.flag.junit.SetFlagsRule;
import android.provider.Settings; import android.provider.Settings;
@@ -141,6 +142,17 @@ public class PoliteNotifWorkProfileToggleControllerTest {
assertThat(mController.isChecked()).isFalse(); assertThat(mController.isChecked()).isFalse();
} }
@Test
@Config(shadows = ShadowSystemSettings.class)
@EnableFlags(Flags.FLAG_POLITE_NOTIFICATIONS)
public void isChecked_coolDownEnabled_noWorkProfile_shouldReturnFalse() {
when(mAudioHelper.getManagedProfileId(any())).thenReturn(UserHandle.USER_NULL);
mController = new PoliteNotifWorkProfileToggleController(mContext, PREFERENCE_KEY,
mAudioHelper);
assertThat(mController.isChecked()).isFalse();
}
@Test @Test
@Config(shadows = ShadowSystemSettings.class) @Config(shadows = ShadowSystemSettings.class)
public void setChecked_coolDownEnabled_setTrue_shouldEnablePoliteNotifForWorkProfile() { public void setChecked_coolDownEnabled_setTrue_shouldEnablePoliteNotifForWorkProfile() {
@@ -186,7 +198,6 @@ public class PoliteNotifWorkProfileToggleControllerTest {
assertThat(mPreference.isVisible()).isTrue(); assertThat(mPreference.isVisible()).isTrue();
} }
private void setCoolDownEnabled(boolean enabled) { private void setCoolDownEnabled(boolean enabled) {
Settings.System.putInt(mContext.getContentResolver(), Settings.System.putInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_ENABLED, (enabled ? ON : OFF)); Settings.System.NOTIFICATION_COOLDOWN_ENABLED, (enabled ? ON : OFF));