PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow > 1 line title for DND duration preference" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-27 20:21:50 +00:00
committed by Android (Google) Code Review
parent 50a5a0c462 f939976367
commit 5c3f71859e
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -7999,7 +7999,7 @@
<!-- Do not disturb settings, main screen, field, schedules [CHAR LIMIT=100]--> <!-- Do not disturb settings, main screen, field, schedules [CHAR LIMIT=100]-->
<string name="zen_category_schedule">Schedules</string> <string name="zen_category_schedule">Schedules</string>
<!-- Do not disturb settings, main screen, field, duration setting where user can specify how <!-- Do not disturb settings, main screen, field, duration setting where user can specify how
long dnd will last when toggling dnd on from qs or settings) [CHAR LIMIT=100] --> long dnd will last when toggling dnd on from qs) [CHAR LIMIT=100] -->
<string name="zen_category_duration">Duration for Quick Settings</string> <string name="zen_category_duration">Duration for Quick Settings</string>
<!-- Do not disturb settings, sound and vibrations screen footer [CHAR LIMIT=NONE]--> <!-- Do not disturb settings, sound and vibrations screen footer [CHAR LIMIT=NONE]-->

4
src/com/android/settings/notification/zen/ZenDurationDialogPreference.java
View File

@@ -30,17 +30,19 @@ public class ZenDurationDialogPreference extends CustomDialogPreferenceCompat {
public ZenDurationDialogPreference(Context context, AttributeSet attrs, int defStyleAttr, public ZenDurationDialogPreference(Context context, AttributeSet attrs, int defStyleAttr,
int defStyleRes) { int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes); super(context, attrs, defStyleAttr, defStyleRes);
setSingleLineTitle(false);
} }
public ZenDurationDialogPreference(Context context, AttributeSet attrs, int defStyleAttr) { public ZenDurationDialogPreference(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr); super(context, attrs, defStyleAttr);
setSingleLineTitle(false);
} }
public ZenDurationDialogPreference(Context context, AttributeSet attrs) { public ZenDurationDialogPreference(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
setSingleLineTitle(false);
} }
@Override @Override
protected void onPrepareDialogBuilder(AlertDialog.Builder builder, protected void onPrepareDialogBuilder(AlertDialog.Builder builder,
DialogInterface.OnClickListener listener) { DialogInterface.OnClickListener listener) {