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

Support (non-editable) display of DND with a filter != PRIORITY

Browse Source 
Whenever setInterruptionFilter() is called with NONE or ALARMS, the Do Not Disturb mode now shows the current policy (nothing allowed or alarms/media allowed), instead of the normal PRIORITY policy. This policy is read-only in the UI since it cannot be customized.

This should be, or at least become, pretty rare (with small exceptions, apps targeting V that call setInterruptionFilter() will use an implicit mode instead of changing the global zen mode, plus using these filters is quite nonstandard in itself).

Fixes: 361586248
Test: atest & manual (toggling DND via cmd shell)
Flag: android.app.modes_ui
Change-Id: If2439480235d30aa310ad8925341183b9761784c
This commit is contained in:
Matías Hernández
2024-08-30 11:03:45 +02:00
parent 2d07418b8b
commit 50c954923f
19 changed files with 151 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/robotests/src/com/android/settings/notification/modes/InterruptionFilterPreferenceControllerTest.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.notification.modes;
import static android.app.NotificationManager.INTERRUPTION_FILTER_ALL;
import static android.app.NotificationManager.INTERRUPTION_FILTER_NONE;
import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
import static android.service.notification.ZenPolicy.STATE_DISALLOW;
@@ -67,6 +68,26 @@ public final class InterruptionFilterPreferenceControllerTest {
mController = new InterruptionFilterPreferenceController(mContext, "something", mBackend);
}
@Test
public void updateState_dnd_enabled() {
TwoStatePreference preference = mock(TwoStatePreference.class);
ZenMode dnd = TestModeBuilder.MANUAL_DND_ACTIVE;
mController.updateState(preference, dnd);
verify(preference).setEnabled(true);
}
@Test
public void updateState_specialDnd_disabled() {
TwoStatePreference preference = mock(TwoStatePreference.class);
ZenMode specialDnd = TestModeBuilder.manualDnd(INTERRUPTION_FILTER_NONE, true);
mController.updateState(preference, specialDnd);
verify(preference).setEnabled(false);
}
@Test
public void testUpdateState_disabled() {
TwoStatePreference preference = mock(TwoStatePreference.class);

15
tests/robotests/src/com/android/settings/notification/modes/ZenModeAppsLinkPreferenceControllerTest.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.notification.modes;
import static android.app.NotificationManager.INTERRUPTION_FILTER_NONE;
import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
import static android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID;
@@ -149,6 +150,20 @@ public final class ZenModeAppsLinkPreferenceControllerTest {
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void updateState_dnd_enabled() {
ZenMode dnd = TestModeBuilder.MANUAL_DND_ACTIVE;
mController.updateState(mPreference, dnd);
assertThat(mPreference.isEnabled()).isTrue();
}
@Test
public void updateState_specialDnd_disabled() {
ZenMode specialDnd = TestModeBuilder.manualDnd(INTERRUPTION_FILTER_NONE, true);
mController.updateState(mPreference, specialDnd);
assertThat(mPreference.isEnabled()).isFalse();
}
@Test
public void testUpdateState_disabled() {
ZenMode zenMode = new TestModeBuilder()

22
tests/robotests/src/com/android/settings/notification/modes/ZenModeDisplayLinkPreferenceControllerTest.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.notification.modes;
import static android.app.NotificationManager.INTERRUPTION_FILTER_NONE;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -63,6 +65,26 @@ public final class ZenModeDisplayLinkPreferenceControllerTest {
mContext, "something", mBackend, mHelperBackend);
}
@Test
public void updateState_dnd_enabled() {
Preference preference = mock(Preference.class);
ZenMode dnd = TestModeBuilder.MANUAL_DND_ACTIVE;
mController.updateState(preference, dnd);
verify(preference).setEnabled(true);
}
@Test
public void updateState_specialDnd_disabled() {
Preference preference = mock(Preference.class);
ZenMode specialDnd = TestModeBuilder.manualDnd(INTERRUPTION_FILTER_NONE, true);
mController.updateState(preference, specialDnd);
verify(preference).setEnabled(false);
}
@Test
public void testUpdateState_disabled() {
Preference preference = mock(Preference.class);

4
tests/robotests/src/com/android/settings/notification/modes/ZenModeExitAtAlarmPreferenceControllerTest.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.notification.modes;
import static android.service.notification.SystemZenRules.PACKAGE_ANDROID;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
@@ -77,6 +79,7 @@ public class ZenModeExitAtAlarmPreferenceControllerTest {
scheduleInfo.exitAtAlarm = false;
ZenMode mode = new TestModeBuilder()
.setPackage(PACKAGE_ANDROID)
.setConditionId(ZenModeConfig.toScheduleConditionId(scheduleInfo))
.build();
@@ -105,6 +108,7 @@ public class ZenModeExitAtAlarmPreferenceControllerTest {
scheduleInfo.exitAtAlarm = true;
ZenMode mode = new TestModeBuilder()
.setPackage(PACKAGE_ANDROID)
.setConditionId(ZenModeConfig.toScheduleConditionId(scheduleInfo))
.build();
mPrefController.updateZenMode(preference, mode);

22
tests/robotests/src/com/android/settings/notification/modes/ZenModeOtherLinkPreferenceControllerTest.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.notification.modes;
import static android.app.NotificationManager.INTERRUPTION_FILTER_NONE;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.mock;
@@ -61,6 +63,26 @@ public final class ZenModeOtherLinkPreferenceControllerTest {
mContext, "something", mHelperBackend);
}
@Test
public void updateState_dnd_enabled() {
CircularIconsPreference preference = mock(CircularIconsPreference.class);
ZenMode dnd = TestModeBuilder.MANUAL_DND_ACTIVE;
mController.updateState(preference, dnd);
verify(preference).setEnabled(true);
}
@Test
public void updateState_specialDnd_disabled() {
CircularIconsPreference preference = mock(CircularIconsPreference.class);
ZenMode specialDnd = TestModeBuilder.manualDnd(INTERRUPTION_FILTER_NONE, true);
mController.updateState(preference, specialDnd);
verify(preference).setEnabled(false);
}
@Test
public void updateState_disabled() {
CircularIconsPreference pref = mock(CircularIconsPreference.class);

15
tests/robotests/src/com/android/settings/notification/modes/ZenModePeopleLinkPreferenceControllerTest.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.notification.modes;
import static android.app.NotificationManager.INTERRUPTION_FILTER_NONE;
import static android.service.notification.ZenPolicy.CONVERSATION_SENDERS_IMPORTANT;
import static android.service.notification.ZenPolicy.PEOPLE_TYPE_ANYONE;
import static android.service.notification.ZenPolicy.PEOPLE_TYPE_CONTACTS;
@@ -116,6 +117,20 @@ public final class ZenModePeopleLinkPreferenceControllerTest {
anyBoolean())).thenReturn(new ColorDrawable(Color.BLACK));
}
@Test
public void updateState_dnd_enabled() {
ZenMode dnd = TestModeBuilder.MANUAL_DND_ACTIVE;
mController.updateState(mPreference, dnd);
assertThat(mPreference.isEnabled()).isTrue();
}
@Test
public void updateState_specialDnd_disabled() {
ZenMode specialDnd = TestModeBuilder.manualDnd(INTERRUPTION_FILTER_NONE, true);
mController.updateState(mPreference, specialDnd);
assertThat(mPreference.isEnabled()).isFalse();
}
@Test
public void updateState_disabled() {
ZenMode zenMode = new TestModeBuilder()