Code cleanup in Zen Mode Settings

Changes in response to code review from automerged commit ag/3171711

Test: make -j40 RunSettingsRoboTests
Bug: n/a
Change-Id: I5df3db4e8ff421ca9911c84ae3f621a0e3d08092

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

@@ -26,7 +26,7 @@ import android.util.Log;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class ZenModeAlarmsPreferenceController extends
-        AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener{
+        AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener {
 
     protected static final String KEY = "zen_mode_alarms";
     private final ZenModeBackend mBackend;

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

@@ -22,11 +22,10 @@ import android.content.Context;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
 import android.support.v7.preference.PreferenceScreen;
-
 import java.util.Map;
 
 public class ZenModeAutomaticRulesPreferenceController extends
-        AbstractZenModeAutomaticRulePreferenceController  {
+        AbstractZenModeAutomaticRulePreferenceController {
 
     private final String KEY_AUTOMATIC_RULES;
     private PreferenceCategory mPreferenceCategory;

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

@@ -34,7 +34,7 @@ import java.util.List;
 public class ZenModeAutomationSettings extends ZenModeSettingsBase {
     private static final String KEY_ADD_RULE = "zen_mode_add_automatic_rule";
     private static final String KEY_AUTOMATIC_RULES = "zen_mode_automatic_rules";
-    protected final ManagedServiceSettings.Config CONFIG = getConditionProviderConfig();
+    protected static final ManagedServiceSettings.Config CONFIG = getConditionProviderConfig();
 
     @Override
     protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {

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

@@ -23,8 +23,7 @@ import android.support.v7.preference.Preference;
 
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
-public class ZenModeCallsPreferenceController extends
+public class ZenModeCallsPreferenceController extends AbstractZenModePreferenceController {
-        AbstractZenModePreferenceController {
 
     protected static final String KEY = "zen_mode_calls";
     private final ZenModeBackend mBackend;

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

@@ -23,10 +23,11 @@ import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 import android.util.Log;
 
+
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
-public class ZenModeEventsPreferenceController extends
+public class ZenModeEventsPreferenceController extends AbstractZenModePreferenceController
-        AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener{
+        implements Preference.OnPreferenceChangeListener {
 
     protected static final String KEY = "zen_mode_events";
         private final ZenModeBackend mBackend;
@@ -68,8 +69,7 @@ public class ZenModeEventsPreferenceController extends
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean allowEvents = (Boolean) newValue;
         if (ZenModeSettingsBase.DEBUG) {
-            Log.d(TAG, "onPrefChange allowEvents="
+            Log.d(TAG, "onPrefChange allowEvents=" + allowEvents);
-                    + allowEvents);
         }
         mBackend.saveSoundPolicy(Policy.PRIORITY_CATEGORY_EVENTS, allowEvents);
         return true;

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

@@ -25,8 +25,8 @@ import android.util.Log;
 
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
-public class ZenModeMediaSystemOtherPreferenceController extends
+public class ZenModeMediaSystemOtherPreferenceController extends AbstractZenModePreferenceController
-        AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener{
+        implements Preference.OnPreferenceChangeListener {
 
     protected static final String KEY = "zen_mode_media";
     private final ZenModeBackend mBackend;
@@ -71,8 +71,7 @@ public class ZenModeMediaSystemOtherPreferenceController extends
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean allowMedia = (Boolean) newValue;
         if (ZenModeSettingsBase.DEBUG) {
-            Log.d(TAG,
+            Log.d(TAG, "onPrefChange allowMediaSystemOther=" + allowMedia);
-                    "onPrefChange allowMediaSystemOther=" + allowMedia);
         }
         mBackend.saveSoundPolicy(Policy.PRIORITY_CATEGORY_MEDIA_SYSTEM_OTHER, allowMedia);
         return true;

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

@@ -7,8 +7,7 @@ import android.support.v7.preference.Preference;
 
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
-public class ZenModeMessagesPreferenceController extends
+public class ZenModeMessagesPreferenceController extends AbstractZenModePreferenceController {
-        AbstractZenModePreferenceController {
 
     protected static final String KEY = "zen_mode_messages";
     private final ZenModeBackend mBackend;

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

@@ -25,8 +25,8 @@ import android.util.Log;
 
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
-public class ZenModeRemindersPreferenceController extends
+public class ZenModeRemindersPreferenceController extends AbstractZenModePreferenceController
-        AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener{
+        implements Preference.OnPreferenceChangeListener {
 
     protected static final String KEY = "zen_mode_reminders";
     private final ZenModeBackend mBackend;
@@ -67,8 +67,7 @@ public class ZenModeRemindersPreferenceController extends
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean allowReminders = (Boolean) newValue;
-        if (ZenModeSettingsBase.DEBUG) Log.d(TAG, "onPrefChange allowReminders="
+        if (ZenModeSettingsBase.DEBUG) Log.d(TAG, "onPrefChange allowReminders=" + allowReminders);
-                + allowReminders);
         mBackend.saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_REMINDERS,
                 allowReminders);
         return true;

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

@@ -25,9 +25,8 @@ import android.util.Log;
 
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
-public class ZenModeRepeatCallersPreferenceController extends
+public class ZenModeRepeatCallersPreferenceController extends AbstractZenModePreferenceController
-        AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener{
+        implements Preference.OnPreferenceChangeListener {
-
 
     protected static final String KEY = "zen_mode_repeat_callers";
     private final ZenModeBackend mBackend;

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

@@ -47,6 +47,10 @@ import com.android.settings.SettingsActivity;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.widget.SwitchBar;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.Arrays;
+import java.util.List;
 
 import java.util.Arrays;
 import java.util.List;
@@ -145,6 +149,11 @@ public abstract class ZenModeRuleSettingsBase extends ZenModeSettingsBase
         mZenMode.setDependency(getZenModeDependency());
     }
 
+    @Override
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        return null;
+    }
+
     @Override
     public void onResume() {
         super.onResume();

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

@@ -25,7 +25,7 @@ import android.util.Log;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class ZenModeScreenOffPreferenceController extends
-        AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener{
+        AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener {
 
     protected static final String KEY = "zen_mode_screen_off";
     private final ZenModeBackend mBackend;

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

@@ -25,7 +25,7 @@ import android.util.Log;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class ZenModeScreenOnPreferenceController extends
-        AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener{
+        AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener {
 
     protected static final String KEY = "zen_mode_screen_on";
     private final ZenModeBackend mBackend;

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

@@ -38,7 +38,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 public class ZenModeSettings extends ZenModeSettingsBase {
-
     @Override
     protected int getPreferenceScreenResId() {
         return R.xml.zen_mode_settings;
@@ -59,7 +58,6 @@ public class ZenModeSettings extends ZenModeSettingsBase {
         return R.string.help_uri_interruptions;
     }
 
-
     private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
             Lifecycle lifecycle) {
         List<AbstractPreferenceController> controllers = new ArrayList<>();
@@ -195,24 +193,26 @@ public class ZenModeSettings extends ZenModeSettingsBase {
      */
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
-        @Override
-        public List<SearchIndexableResource> getXmlResourcesToIndex(
-                Context context, boolean enabled) {
-            final SearchIndexableResource sir = new SearchIndexableResource(context);
-            sir.xmlResId = R.xml.zen_mode_settings;
-            return Arrays.asList(sir);
-        }
 
-        @Override
+                @Override
-        public List<String> getNonIndexableKeys(Context context) {
+                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
-            List<String> keys = super.getNonIndexableKeys(context);
+                        boolean enabled) {
-            keys.add(ZenModeButtonPreferenceController.KEY);
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
-            return keys;
+                    sir.xmlResId = R.xml.zen_mode_settings;
-        }
+                    return Arrays.asList(sir);
+                }
 
-        @Override
+                @Override
-        public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+                public List<String> getNonIndexableKeys(Context context) {
-            return buildPreferenceControllers(context, null);
+                    List<String> keys = super.getNonIndexableKeys(context);
-        }
+                    keys.add(ZenModeButtonPreferenceController.KEY);
-    };
+                    return keys;
+                }
+
+                @Override
+                public List<AbstractPreferenceController> getPreferenceControllers(Context
+                        context) {
+                    return buildPreferenceControllers(context, null);
+                }
+            };
 }

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

@@ -40,7 +40,7 @@ import com.android.settingslib.TwoTargetPreference;
 import java.util.Map;
 
 public class ZenRulePreference extends TwoTargetPreference {
-    protected final ManagedServiceSettings.Config CONFIG =
+    private static final ManagedServiceSettings.Config CONFIG =
             ZenModeAutomationSettings.getConditionProviderConfig();
     final CharSequence mName;
     final String mId;