Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 222f4447 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Code cleanup in Zen Mode Settings"

parents 268de492 495c6467

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

+1 −2
Original line number Diff line number Diff line
@@ -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

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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −2
Original line number Diff line number Diff line
@@ -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;

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

+4 −4
Original line number Diff line number Diff line
@@ -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;

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

+3 −4
Original line number Diff line number Diff line
@@ -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;