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

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

Merge "Settings: New string for zen messages summary." into mnc-dev

parents 78161c73 fcfcb5dd

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -6173,6 +6173,9 @@ 
    <!-- [CHAR LIMIT=20] Zen mode settings: Messages option -->

    <string name="zen_mode_messages">Messages</string>



    <!-- [CHAR LIMIT=50] Zen mode settings: Selected messages summary -->

    <string name="zen_mode_selected_messages">Selected messages</string>



    <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From anyone -->

    <string name="zen_mode_from_anyone">From anyone</string>

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

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public class ZenModeSettings extends ZenModeSettingsBase implements Indexable { 
        s = appendLowercase(s, mConfig.allowReminders, R.string.zen_mode_reminders);

        s = appendLowercase(s, mConfig.allowEvents, R.string.zen_mode_events);

        s = appendLowercase(s, callers, R.string.zen_mode_selected_callers);

        s = appendLowercase(s, mConfig.allowMessages, R.string.zen_mode_messages);

        s = appendLowercase(s, mConfig.allowMessages, R.string.zen_mode_selected_messages);

        mPrioritySettings.setSummary(s);

    }