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

Commit 8da8f552 authored by Mady Mellor's avatar Mady Mellor Committed by android-build-merger
Browse files

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

am: 03a24388

Change-Id: Iab86219c92978c4c37eaafd95800392d5b28bcf5
parents 754f6e22 03a24388

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -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>

packages/SystemUI/src/com/android/systemui/statusbar/NotificationSnooze.java

+6 −4
Original line number Diff line number Diff line
@@ -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;

    }