From 495c64674420e701a988c25c0b8d7d1934514780 Mon Sep 17 00:00:00 2001 From: Beverly Date: Fri, 17 Nov 2017 10:00:20 -0500 Subject: [PATCH] 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 --- .../ZenModeAlarmsPreferenceController.java | 2 +- ...odeAutomaticRulesPreferenceController.java | 3 +- .../ZenModeAutomationSettings.java | 2 +- .../ZenModeCallsPreferenceController.java | 3 +- .../ZenModeEventsPreferenceController.java | 8 ++-- ...eMediaSystemOtherPreferenceController.java | 7 ++-- .../ZenModeMessagesPreferenceController.java | 3 +- .../ZenModeRemindersPreferenceController.java | 7 ++-- ...ModeRepeatCallersPreferenceController.java | 5 +-- .../notification/ZenModeRuleSettingsBase.java | 9 +++++ .../ZenModeScreenOffPreferenceController.java | 2 +- .../ZenModeScreenOnPreferenceController.java | 2 +- .../notification/ZenModeSettings.java | 40 +++++++++---------- .../notification/ZenRulePreference.java | 2 +- 14 files changed, 49 insertions(+), 46 deletions(-) diff --git a/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java b/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java index df9966d7bfa..ef8d0263da1 100644 --- a/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java +++ b/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; diff --git a/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java b/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java index 0ec5d697820..f91bdd64f26 100644 --- a/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java +++ b/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; diff --git a/src/com/android/settings/notification/ZenModeAutomationSettings.java b/src/com/android/settings/notification/ZenModeAutomationSettings.java index ae75798e8a7..d096e8c7a15 100644 --- a/src/com/android/settings/notification/ZenModeAutomationSettings.java +++ b/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 getPreferenceControllers(Context context) { diff --git a/src/com/android/settings/notification/ZenModeCallsPreferenceController.java b/src/com/android/settings/notification/ZenModeCallsPreferenceController.java index 48f9d1ce493..d952c11c149 100644 --- a/src/com/android/settings/notification/ZenModeCallsPreferenceController.java +++ b/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 - AbstractZenModePreferenceController { +public class ZenModeCallsPreferenceController extends AbstractZenModePreferenceController { protected static final String KEY = "zen_mode_calls"; private final ZenModeBackend mBackend; diff --git a/src/com/android/settings/notification/ZenModeEventsPreferenceController.java b/src/com/android/settings/notification/ZenModeEventsPreferenceController.java index 335002c2d07..3763fed10b7 100644 --- a/src/com/android/settings/notification/ZenModeEventsPreferenceController.java +++ b/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 - AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener{ +public class ZenModeEventsPreferenceController extends AbstractZenModePreferenceController + 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=" - + allowEvents); + Log.d(TAG, "onPrefChange allowEvents=" + allowEvents); } mBackend.saveSoundPolicy(Policy.PRIORITY_CATEGORY_EVENTS, allowEvents); return true; diff --git a/src/com/android/settings/notification/ZenModeMediaSystemOtherPreferenceController.java b/src/com/android/settings/notification/ZenModeMediaSystemOtherPreferenceController.java index 8893ff588fd..8afe881e434 100644 --- a/src/com/android/settings/notification/ZenModeMediaSystemOtherPreferenceController.java +++ b/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 - AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener{ +public class ZenModeMediaSystemOtherPreferenceController extends AbstractZenModePreferenceController + 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, - "onPrefChange allowMediaSystemOther=" + allowMedia); + Log.d(TAG, "onPrefChange allowMediaSystemOther=" + allowMedia); } mBackend.saveSoundPolicy(Policy.PRIORITY_CATEGORY_MEDIA_SYSTEM_OTHER, allowMedia); return true; diff --git a/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java b/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java index 257a7c91330..dad6cf13e5c 100644 --- a/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java +++ b/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 - AbstractZenModePreferenceController { +public class ZenModeMessagesPreferenceController extends AbstractZenModePreferenceController { protected static final String KEY = "zen_mode_messages"; private final ZenModeBackend mBackend; diff --git a/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java b/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java index a8fe220d3d2..edc7cf90d5c 100644 --- a/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java +++ b/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 - AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener{ +public class ZenModeRemindersPreferenceController extends AbstractZenModePreferenceController + 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=" - + allowReminders); + if (ZenModeSettingsBase.DEBUG) Log.d(TAG, "onPrefChange allowReminders=" + allowReminders); mBackend.saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_REMINDERS, allowReminders); return true; diff --git a/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java b/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java index eb52d55244f..1d184096a65 100644 --- a/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java +++ b/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 - AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener{ - +public class ZenModeRepeatCallersPreferenceController extends AbstractZenModePreferenceController + implements Preference.OnPreferenceChangeListener { protected static final String KEY = "zen_mode_repeat_callers"; private final ZenModeBackend mBackend; diff --git a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java index b0715dca303..9eccfdc9990 100644 --- a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java +++ b/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 getPreferenceControllers(Context context) { + return null; + } + @Override public void onResume() { super.onResume(); diff --git a/src/com/android/settings/notification/ZenModeScreenOffPreferenceController.java b/src/com/android/settings/notification/ZenModeScreenOffPreferenceController.java index 809969186e1..2b7070609d1 100644 --- a/src/com/android/settings/notification/ZenModeScreenOffPreferenceController.java +++ b/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; diff --git a/src/com/android/settings/notification/ZenModeScreenOnPreferenceController.java b/src/com/android/settings/notification/ZenModeScreenOnPreferenceController.java index fac9bfd4806..8e0b3485eff 100644 --- a/src/com/android/settings/notification/ZenModeScreenOnPreferenceController.java +++ b/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; diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java index 6cdf00b360c..fbc9f7db5c4 100644 --- a/src/com/android/settings/notification/ZenModeSettings.java +++ b/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 buildPreferenceControllers(Context context, Lifecycle lifecycle) { List 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 getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.zen_mode_settings; - return Arrays.asList(sir); - } - @Override - public List getNonIndexableKeys(Context context) { - List keys = super.getNonIndexableKeys(context); - keys.add(ZenModeButtonPreferenceController.KEY); - return keys; - } + @Override + public List getXmlResourcesToIndex(Context context, + boolean enabled) { + final SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.zen_mode_settings; + return Arrays.asList(sir); + } - @Override - public List getPreferenceControllers(Context context) { - return buildPreferenceControllers(context, null); - } - }; + @Override + public List getNonIndexableKeys(Context context) { + List keys = super.getNonIndexableKeys(context); + keys.add(ZenModeButtonPreferenceController.KEY); + return keys; + } + + @Override + public List getPreferenceControllers(Context + context) { + return buildPreferenceControllers(context, null); + } + }; } diff --git a/src/com/android/settings/notification/ZenRulePreference.java b/src/com/android/settings/notification/ZenRulePreference.java index a838f29414d..4d7181a0cdc 100644 --- a/src/com/android/settings/notification/ZenRulePreference.java +++ b/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;