diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index c656b175395cc..994a56601c320 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -1508,6 +1508,8 @@ 30 minutes 1 hour + + 2 hours UNDO diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationSnooze.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationSnooze.java index 8830c5dc1247a..8af1628cba76a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationSnooze.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationSnooze.java @@ -57,7 +57,7 @@ public class NotificationSnooze extends LinearLayout private ViewGroup mSnoozeOptionContainer; private List 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 snoozeList) { @@ -119,7 +119,9 @@ public class NotificationSnooze extends LinearLayout ArrayList 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; }