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

Commit cefa4395 authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

Merge "Settings: Support new alarms-only zen value."

parents abbe2d4c b5bbff8c

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -5689,6 +5689,9 @@ 
    <!-- Sound & notification > Sound section: Zen mode option: Important interruptions [CHAR LIMIT=60] -->

    <string name="zen_mode_option_important_interruptions">Allow only priority interruptions</string>



    <!-- Sound & notification > Sound section: Zen mode option: Alarms only [CHAR LIMIT=60] -->

    <string name="zen_mode_option_alarms">Allow only alarms</string>



    <!-- Sound & notification > Sound section: Zen mode option: No interruptions [CHAR LIMIT=60] -->

    <string name="zen_mode_option_no_interruptions">Don\'t interrupt</string>

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

+3 −1
Original line number Diff line number Diff line
@@ -88,12 +88,14 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index 


    private static final SettingPrefWithCallback PREF_ZEN_MODE = new SettingPrefWithCallback(

            SettingPref.TYPE_GLOBAL, KEY_ZEN_MODE, Global.ZEN_MODE, Global.ZEN_MODE_OFF,

            Global.ZEN_MODE_OFF, Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS,

            Global.ZEN_MODE_OFF, Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, Global.ZEN_MODE_ALARMS,

            Global.ZEN_MODE_NO_INTERRUPTIONS) {

        protected String getCaption(Resources res, int value) {

            switch (value) {

                case Global.ZEN_MODE_NO_INTERRUPTIONS:

                    return res.getString(R.string.zen_mode_option_no_interruptions);

                case Global.ZEN_MODE_ALARMS:

                    return res.getString(R.string.zen_mode_option_alarms);

                case Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS:

                    return res.getString(R.string.zen_mode_option_important_interruptions);

                default: