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

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

Merge "Settings: Update preference summary per new downtime behavior." into lmp-mr1-dev

parents ded5a85a 49300d19

res/values/strings.xml

+8 −2
Original line number Diff line number Diff line
@@ -5894,8 +5894,14 @@ 
    <!-- [CHAR LIMIT=20] Zen mode settings: End time option -->

    <string name="zen_mode_end_time">End time</string>



    <!-- [CHAR LIMIT=20] Zen mode settings: End time option: Summary text value format -->

    <string name="zen_mode_end_time_summary_format"><xliff:g id="formatted_time">%s</xliff:g> next day</string>

    <!-- [CHAR LIMIT=60] Zen mode settings: End time option: Summary text value format when downtime mode = priority and end time = next day -->

    <string name="zen_mode_end_time_priority_next_day_summary_format"><xliff:g id="formatted_time">%s</xliff:g> next day</string>



    <!-- [CHAR LIMIT=60] Zen mode settings: End time option: Summary text value format when downtime mode = none and end time = same day -->

    <string name="zen_mode_end_time_none_same_day_summary_format"><xliff:g id="formatted_time">%s</xliff:g> or any alarm before</string>



    <!-- [CHAR LIMIT=60] Zen mode settings: End time option: Summary text value format when downtime mode = none and end time = next day -->

    <string name="zen_mode_end_time_none_next_day_summary_format"><xliff:g id="formatted_time">%s</xliff:g> next day or any alarm before</string>



    <!-- [CHAR LIMIT=20] Notifications settings: Apps section header -->

    <string name="notification_settings_apps_title">App notifications</string>

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

+9 −1
Original line number Diff line number Diff line
@@ -379,7 +379,15 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index 
        final int startMin = 60 * mConfig.sleepStartHour + mConfig.sleepStartMinute;

        final int endMin = 60 * mConfig.sleepEndHour + mConfig.sleepEndMinute;

        final boolean nextDay = startMin >= endMin;

        mEnd.setSummaryFormat(nextDay ? R.string.zen_mode_end_time_summary_format : 0);

        final int summaryFormat;

        if (mConfig.sleepNone) {

            summaryFormat = nextDay ? R.string.zen_mode_end_time_none_next_day_summary_format

                    : R.string.zen_mode_end_time_none_same_day_summary_format;

        } else {

            summaryFormat = nextDay ? R.string.zen_mode_end_time_priority_next_day_summary_format

                    : 0;

        }

        mEnd.setSummaryFormat(summaryFormat);

    }



    private void updateControls() {