commit 2c5895d615d4ed8f379965656f62ae5310a9167e
author Beverly <beverlyt@google.com> Tue Dec 05 15:50:26 2017 -0500
committer Beverly <beverlyt@google.com> Wed Dec 06 14:53:09 2017 -0500
tree 979bfe1e673473a8a1273526c0ad13e7ae36adc9
parent d7d5754cfdba7fc5394927504018f3ac74e44832

Default DND rules show at top and can't be deleted

Test: make ROBOTEST_FILTER=ZenModeAutomaticRulesPreferenceControllerTest RunSettingsRoboTests -j40
Bug: 63077372
Change-Id: I43e7e2a70df5defe931a7ecedc6f946853dab476

src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java

diff --git a/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java b/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java
index cc70a6f..668b06c 100644
--- a/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java
+++ b/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java
@@ -35,6 +35,7 @@
 
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -45,6 +46,7 @@
     protected Fragment mParent;
     protected Set<Map.Entry<String, AutomaticZenRule>> mRules;
     protected PackageManager mPm;
+    private static List<String> mDefaultRuleIds;
 
     public AbstractZenModeAutomaticRulePreferenceController(Context context, String key, Fragment
             parent, Lifecycle lifecycle) {
@@ -60,6 +62,13 @@
         mRules = getZenModeRules();
     }
 
+    private static List<String> getDefaultRuleIds() {
+        if (mDefaultRuleIds == null) {
+            mDefaultRuleIds = ZenModeConfig.DEFAULT_RULE_IDS;
+        }
+        return mDefaultRuleIds;
+    }
+
     private Set<Map.Entry<String, AutomaticZenRule>> getZenModeRules() {
         Map<String, AutomaticZenRule> ruleMap =
                 NotificationManager.from(mContext).getAutomaticZenRules();
@@ -99,6 +108,13 @@
                 @Override
                 public int compare(Map.Entry<String, AutomaticZenRule> lhs,
                         Map.Entry<String, AutomaticZenRule> rhs) {
+                    // if it's a default rule, should be at the top of automatic rules
+                    boolean lhsIsDefaultRule = getDefaultRuleIds().contains(lhs.getKey());
+                    boolean rhsIsDefaultRule = getDefaultRuleIds().contains(rhs.getKey());
+                    if (lhsIsDefaultRule != rhsIsDefaultRule) {
+                        return lhsIsDefaultRule ? -1 : 1;
+                    }
+
                     int byDate = Long.compare(lhs.getValue().getCreationTime(),
                             rhs.getValue().getCreationTime());
                     if (byDate != 0) {