Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add 2 hours as an option for snoozing, update default to 1 hour" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-26 14:37:17 +00:00
committed by Android (Google) Code Review
parent 8d902a9e28 651fbdec08
commit 03a243889c
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/values/strings.xml
View File

@@ -1508,6 +1508,8 @@
<string name="snooze_option_30_min">30 minutes</string>
<!-- Notification: Menu row: Snooze options: 1 hour option. [CHAR LIMIT=50]-->
<string name="snooze_option_1_hour">1 hour</string>
<!-- Notification: Menu row: Snooze options: 1 hour option. [CHAR LIMIT=50]-->
<string name="snooze_option_2_hour">2 hours</string>
<!-- Notification: Menu row: Snooze undo button label. [CHAR LIMIT=50]-->
<string name="snooze_undo">UNDO</string>

10
packages/SystemUI/src/com/android/systemui/statusbar/NotificationSnooze.java
View File

@@ -57,7 +57,7 @@ public class NotificationSnooze extends LinearLayout
private ViewGroup mSnoozeOptionContainer;
private List<SnoozeOption> mSnoozeOptions;
private int mCollapsedHeight;
private SnoozeOption mDefaultOption;
private SnoozeOption mSelectedOption;
private boolean mSnoozing;
private boolean mExpanded;
@@ -86,7 +86,7 @@ public class NotificationSnooze extends LinearLayout
createOptionViews();
// Default to first option in list
setSelected(mSnoozeOptions.get(0));
setSelected(mDefaultOption);
}
public void setSnoozeOptions(final List<SnoozeCriterion> snoozeList) {
@@ -119,7 +119,9 @@ public class NotificationSnooze extends LinearLayout
ArrayList<SnoozeOption> options = new ArrayList<>();
options.add(createOption(R.string.snooze_option_15_min, 15));
options.add(createOption(R.string.snooze_option_30_min, 30));
options.add(createOption(R.string.snooze_option_1_hour, 60));
mDefaultOption = createOption(R.string.snooze_option_1_hour, 60);
options.add(mDefaultOption);
options.add(createOption(R.string.snooze_option_2_hour, 60 * 2));
return options;
}
@@ -232,7 +234,7 @@ public class NotificationSnooze extends LinearLayout
@Override
public View getContentView() {
// Reset the view before use
setSelected(mSnoozeOptions.get(0));
setSelected(mDefaultOption);
return this;
}