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

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

Merge "Include timers in no-interruptions warning, always show."

parents db375786 d71517be

packages/SystemUI/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ 
    <string name="description_direction_left">"Slide left for <xliff:g id="target_description" example="Unlock">%s</xliff:g>.</string>



    <!-- Zen mode: Alarm warning. [CHAR LIMIT=40] -->

    <string name="zen_alarm_warning">You won\'t hear your alarms</string>

    <string name="zen_alarm_warning">You won\'t hear alarms or timers</string>



    <!-- Zen mode: No interruptions. [CHAR LIMIT=40] -->

    <string name="zen_no_interruptions">No interruptions</string>

packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java

+1 −2
Original line number Diff line number Diff line
@@ -279,8 +279,7 @@ public class ZenModePanel extends LinearLayout { 
        mZenSubheadCollapsed.setVisibility(!mExpanded ? VISIBLE : GONE);

        mMoreSettings.setVisibility(zenImportant && mExpanded ? VISIBLE : GONE);

        mZenConditions.setVisibility(!zenOff && mExpanded ? VISIBLE : GONE);

        mAlarmWarning.setVisibility(zenNone && mExpanded && mController != null

                && mController.hasNextAlarm() ? VISIBLE : GONE);

        mAlarmWarning.setVisibility(zenNone && mExpanded ? VISIBLE : GONE);



        if (zenNone) {

            mZenSubheadExpanded.setText(R.string.zen_no_interruptions);