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

Code cleanup in Zen Mode Settings

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

Test: make -j40 RunSettingsRoboTests
Bug: n/a
Change-Id: I5df3db4e8ff421ca9911c84ae3f621a0e3d08092
This commit is contained in:
Beverly
2017-11-17 10:00:20 -05:00
parent 12108840a0
commit 495c646744
14 changed files with 49 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java
View File

@@ -22,7 +22,6 @@ 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

2
src/com/android/settings/notification/ZenModeAutomationSettings.java
View File

@@ -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) {

3
src/com/android/settings/notification/ZenModeCallsPreferenceController.java
View File

@@ -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;

8
src/com/android/settings/notification/ZenModeEventsPreferenceController.java
View File

@@ -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;

7
src/com/android/settings/notification/ZenModeMediaSystemOtherPreferenceController.java
View File

@@ -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;

3
src/com/android/settings/notification/ZenModeMessagesPreferenceController.java
View File

@@ -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;

7
src/com/android/settings/notification/ZenModeRemindersPreferenceController.java
View File

@@ -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;

5
src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java
View File

@@ -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;

9
src/com/android/settings/notification/ZenModeRuleSettingsBase.java
View File

@@ -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();

10
src/com/android/settings/notification/ZenModeSettings.java
View File

@@ -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,9 +193,10 @@ 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) {
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);
@@ -211,7 +210,8 @@ public class ZenModeSettings extends ZenModeSettingsBase {
}
@Override
public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
public List<AbstractPreferenceController> getPreferenceControllers(Context
context) {
return buildPreferenceControllers(context, null);
}
};

2
src/com/android/settings/notification/ZenRulePreference.java
View File

@@ -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;