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

Merge "Don't add the "Events" mode anymore, and delete it if disabled" into main

Browse Source
This commit is contained in:
Matías Hernández
2024-09-23 12:49:05 +00:00
committed by Android (Google) Code Review
parent d514d15590 97f06864f8
commit a78f2b834c
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/notification/zen/ZenModeBackend.java
View File

@@ -458,7 +458,7 @@ public class ZenModeBackend {
} }
private static List<String> getDefaultRuleIds() { private static List<String> getDefaultRuleIds() {
return ZenModeConfig.DEFAULT_RULE_IDS; return ZenModeConfig.getDefaultRuleIds();
} }
NotificationManager.Policy toNotificationPolicy(ZenPolicy policy) { NotificationManager.Policy toNotificationPolicy(ZenPolicy policy) {

17
tests/robotests/src/com/android/settings/notification/zen/ZenModeBackendTest.java
View File

@@ -23,14 +23,18 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.app.AutomaticZenRule; import android.app.AutomaticZenRule;
import android.app.Flags;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.app.NotificationManager.Policy; import android.app.NotificationManager.Policy;
import android.content.Context; import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.platform.test.annotations.DisableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
import android.provider.Settings; import android.provider.Settings;
import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeConfig;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor; import org.mockito.ArgumentCaptor;
@@ -53,12 +57,15 @@ public class ZenModeBackendTest {
private NotificationManager mNotificationManager; private NotificationManager mNotificationManager;
private static final String GENERIC_RULE_NAME = "test"; private static final String GENERIC_RULE_NAME = "test";
private static final String DEFAULT_ID_1 = ZenModeConfig.EVENTS_DEFAULT_RULE_ID; private static final String DEFAULT_ID_1 = ZenModeConfig.EVENTS_OBSOLETE_RULE_ID;
private static final String DEFAULT_ID_2 = ZenModeConfig.EVERY_NIGHT_DEFAULT_RULE_ID; private static final String DEFAULT_ID_2 = ZenModeConfig.EVERY_NIGHT_DEFAULT_RULE_ID;
private Context mContext; private Context mContext;
private ZenModeBackend mBackend; private ZenModeBackend mBackend;
@Rule
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
@Before @Before
public void setup() { public void setup() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
@@ -161,6 +168,10 @@ public class ZenModeBackendTest {
} }
@Test @Test
// With MODES_UI the Events rule is not default and is sorted differently. Most likely this
// whole test class should be disabled since ZenModeBackend should never be used with
// MODES_UI. However the other tests pass, so...
@DisableFlags(Flags.FLAG_MODES_UI)
public void updateState_checkRuleOrderingDescending_withDefaultRules() { public void updateState_checkRuleOrderingDescending_withDefaultRules() {
final int NUM_RULES = 4; final int NUM_RULES = 4;
@@ -168,8 +179,8 @@ public class ZenModeBackendTest {
true); true);
Arrays.sort(rules, ZenModeBackend.RULE_COMPARATOR); Arrays.sort(rules, ZenModeBackend.RULE_COMPARATOR);
assertEquals(rules[0].getKey(), DEFAULT_ID_1); assertEquals(DEFAULT_ID_1, rules[0].getKey());
assertEquals(rules[1].getKey(), DEFAULT_ID_2); assertEquals(DEFAULT_ID_2, rules[1].getKey());
// NON-DEFAULT RULES check ordering, most recent at the bottom/end // NON-DEFAULT RULES check ordering, most recent at the bottom/end
for (int i = 0; i < NUM_RULES; i++) { for (int i = 0; i < NUM_RULES; i++) {
assertEquals(GENERIC_RULE_NAME + (NUM_RULES - 1 - i), rules[i + 2].getKey()); assertEquals(GENERIC_RULE_NAME + (NUM_RULES - 1 - i), rules[i + 2].getKey());