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

Commit d3c07da6 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Don't reference the notification led if it doesn't exist." into nyc-dev

parents 5354f8a2 184da33b

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -6278,6 +6278,8 @@ 








    <!-- [CHAR LIMIT=130] Zen mode settings:  visual interruptions: screen is off: summary -->









    <string name="zen_mode_screen_off_summary">Prevent notifications silenced by Do Not Disturb from turning on the screen or pulsing the notification light</string>









    <!-- [CHAR LIMIT=130] Zen mode settings:  visual interruptions: screen is off: summary -->









    <string name="zen_mode_screen_off_summary_no_led">Prevent notifications silenced by Do Not Disturb from turning on the screen</string>

















    <!-- [CHAR LIMIT=130] Zen mode settings:  visual interruptions summary -->









    <string name="zen_mode_all_visual_interruptions">Off</string>
































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



+4
−0






























Original line number
Diff line number
Diff line







@@ -55,6 +55,10 @@ public class ZenModeVisualInterruptionSettings extends ZenModeSettingsBase {







        mPolicy = NotificationManager.from(mContext).getNotificationPolicy();



















        mScreenOff = (SwitchPreference) root.findPreference(KEY_SCREEN_OFF);









        if (!getResources()









                .getBoolean(com.android.internal.R.bool.config_intrusiveNotificationLed)) {









            mScreenOff.setSummary(R.string.zen_mode_screen_off_summary_no_led);









        }









        mScreenOff.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {









            @Override









            public boolean onPreferenceChange(Preference preference, Object newValue) {