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

Commit cf9b3d2e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add subtitle for Do not disturb" into qt-dev

parents 0ce66b93 ce6137e2

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -7432,6 +7432,9 @@ 
    <!-- Sound: Title for the Do not Disturb option and associated settings page. [CHAR LIMIT=50]-->

    <string name="zen_mode_settings_title">Do Not Disturb</string>









    <!-- Subtitle for the Do not Disturb slice. [CHAR LIMIT=50]-->









    <string name="zen_mode_slice_subtitle">Limit interruptions</string>

















    <!-- Do not disturb: Title for the Do not Disturb dialog to turn on Do not disturb. [CHAR LIMIT=50]-->









    <string name="zen_mode_settings_turn_on_dialog_title">Turn on Do Not Disturb</string>

































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



+2
−0






























Original line number
Diff line number
Diff line







@@ -73,6 +73,7 @@ public class ZenModeSliceBuilder {







    public static Slice getSlice(Context context) {









        final boolean isZenModeEnabled = isZenModeEnabled(context);









        final CharSequence title = context.getText(R.string.zen_mode_settings_title);









        final CharSequence subtitle = context.getText(R.string.zen_mode_slice_subtitle);









        @ColorInt final int color = Utils.getColorAccentDefaultColor(context);









        final PendingIntent toggleAction = getBroadcastIntent(context);









        final PendingIntent primaryAction = getPrimaryAction(context);








@@ -87,6 +88,7 @@ public class ZenModeSliceBuilder {







                .setAccentColor(color)









                .addRow(new RowBuilder()









                        .setTitle(title)









                        .setSubtitle(subtitle)









                        .addEndItem(toggleSliceAction)









                        .setPrimaryAction(primarySliceAction))









                .build();