Allow configuring the delay for snoozing calendar reminders.

This allows both configuring the default snooze delay as well as ask for
the delay whenever snoozing a reminder.

Change-Id: Ib875c231535ff4f53dc7c97dd15a6a4b29f48fba

11 files changed, 190 insertions, 5 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5673a3b5..cebf5fe7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -168,6 +168,9 @@
              android:theme="@android:style/Theme.Holo.Dialog" android:excludeFromRecents="true"
              android:label="@string/quick_response_dialog_title" />
 
+        <activity android:name=".alerts.SnoozeDelayActivity" android:launchMode="singleInstance"
+             android:theme="@android:style/Theme.Holo.Dialog" android:excludeFromRecents="true" />
+
         <receiver android:name=".alerts.AlertReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.EVENT_REMINDER" />
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 9cea23c6..10228e9f 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -194,6 +194,12 @@
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Standard-Erinnerungszeit"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Standard-Erinnerungszeit"</string>
     <string name="preferences_default_reminder_default" msgid="2903884416749959435">"10"</string>
+    <string name="preferences_alerts_custom_snooze_delay_title">Erinnerungs-Wiederholungszeit</string>
+    <string name="preferences_alerts_custom_snooze_delay_summary_on">Jedesmal nach Verzögerung fragen, wenn später erinnert werden soll</string>
+    <string name="preferences_alerts_custom_snooze_delay_summary_off">Immer nach Standardzeit erinnern</string>
+    <string name="snooze_delay_dialog_title">Erinnern in\u2026</string>
+    <string name="preferences_default_snooze_delay_title">Standard-Wiederholungszeit</string>
+    <string name="preferences_default_snooze_delay_dialog">Erinnerung wiederholen nach\u2026</string>
     <string name="preferences_use_home_tz_title" msgid="5597546849968598210">"Heimatzeitzone beibehalten"</string>
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Zeigt unterwegs Kalender-/Terminzeiten in Heimatzeitzone"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Heimatzeitzone"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index b14854a3..1fba624e 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -122,6 +122,20 @@
         <item>"10080"</item>
     </string-array>
 
+    <string-array name="preferences_default_snooze_delay_values" translatable="false">
+        <item>"5"</item>
+        <item>"10"</item>
+        <item>"15"</item>
+        <item>"20"</item>
+        <item>"25"</item>
+        <item>"30"</item>
+        <item>"45"</item>
+        <item>"60"</item>
+        <item>"120"</item>
+        <item>"180"</item>
+        <item>"720"</item>
+    </string-array>
+
     <string-array name="preferences_week_start_day_labels">
         <item>Locale default</item>
         <item>Saturday</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index caec61b5..aa3ced67 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -542,6 +542,19 @@
     <string name="preferences_default_reminder_dialog">Default reminder time</string>
     <!-- Default value for the number of reminder minutes -->
     <string name="preferences_default_reminder_default">10</string>
+    <!-- Check box label for using custom snooze delays -->
+    <string name="preferences_alerts_custom_snooze_delay_title">Ask for reminder snooze delay</string>
+    <!-- Summaries for using custom snooze delays -->
+    <string name="preferences_alerts_custom_snooze_delay_summary_on">Ask for snooze delay whenever snoozing reminders</string>
+    <string name="preferences_alerts_custom_snooze_delay_summary_off">Always use default snooze delay</string>
+    <!-- Title of custom snooze delay dialog -->
+    <string name="snooze_delay_dialog_title">Set snooze delay</string>
+    <!-- List item label for setting the default snooze delay -->
+    <string name="preferences_default_snooze_delay_title">Default snooze delay time</string>
+    <!-- Title of dialog for setting the default snooze delay -->
+    <string name="preferences_default_snooze_delay_dialog">Default snooze delay</string>
+    <!-- Default value for the default snooze delay (in minutes) -->
+    <string name="preferences_default_snooze_delay_default" translatable="false">5</string>
     <!-- Settings check box label to keep Calendar in a fixed 'home' time zone [CHAR LIMIT = 18] -->
     <string name="preferences_use_home_tz_title">Use home time zone</string>
     <!-- Settings description of what setting Calendar to use a fixed 'home' time
diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
index 5f64b362..8bffd0e0 100644
--- a/res/xml/general_preferences.xml
+++ b/res/xml/general_preferences.xml
@@ -73,6 +73,20 @@
             android:defaultValue="false"
             android:title="@string/preferences_alerts_popup_title" />
 
+        <CheckBoxPreference
+            android:key="preferences_custom_snooze_delay"
+            android:defaultValue="false"
+            android:title="@string/preferences_alerts_custom_snooze_delay_title"
+            android:summaryOn="@string/preferences_alerts_custom_snooze_delay_summary_on"
+            android:summaryOff="@string/preferences_alerts_custom_snooze_delay_summary_off" />
+
+        <ListPreference
+            android:key="preferences_default_snooze_delay"
+            android:defaultValue="@string/preferences_default_snooze_delay_default"
+            android:entryValues="@array/preferences_default_snooze_delay_values"
+            android:title="@string/preferences_default_snooze_delay_title"
+            android:dialogTitle="@string/preferences_default_snooze_delay_dialog" />
+
         <ListPreference
             android:key="preferences_default_reminder"
             android:defaultValue="@string/preferences_default_reminder_default"
diff --git a/src/com/android/calendar/GeneralPreferences.java b/src/com/android/calendar/GeneralPreferences.java
index 54fc0e78..15a6213d 100644
--- a/src/com/android/calendar/GeneralPreferences.java
+++ b/src/com/android/calendar/GeneralPreferences.java
@@ -47,6 +47,7 @@ import android.text.format.Time;
 import android.widget.Toast;
 
 import com.android.calendar.alerts.AlertReceiver;
+import com.android.calendar.event.EventViewUtils;
 import com.android.timezonepicker.TimeZoneInfo;
 import com.android.timezonepicker.TimeZonePickerDialog;
 import com.android.timezonepicker.TimeZonePickerDialog.OnTimeZoneSetListener;
@@ -83,6 +84,10 @@ public class GeneralPreferences extends PreferenceFragment implements
     public static final String NO_REMINDER_STRING = "-1";
     public static final int REMINDER_DEFAULT_TIME = 10; // in minutes
 
+    public static final String KEY_USE_CUSTOM_SNOOZE_DELAY = "preferences_custom_snooze_delay";
+    public static final String KEY_DEFAULT_SNOOZE_DELAY = "preferences_default_snooze_delay";
+    public static final int SNOOZE_DELAY_DEFAULT_TIME = 5; // in minutes
+
     public static final String KEY_DEFAULT_CELL_HEIGHT = "preferences_default_cell_height";
     public static final String KEY_VERSION = "preferences_version";
 
@@ -182,6 +187,13 @@ public class GeneralPreferences extends PreferenceFragment implements
         mWeekStart = (ListPreference) preferenceScreen.findPreference(KEY_WEEK_START_DAY);
         mDefaultReminder = (ListPreference) preferenceScreen.findPreference(KEY_DEFAULT_REMINDER);
         mHomeTZ = preferenceScreen.findPreference(KEY_HOME_TZ);
+
+        mDefaultStart = (ListPreference) preferenceScreen.findPreference(KEY_DEFAULT_START);
+        mDefaultStart.setOnPreferenceChangeListener(this);
+
+        mSnoozeDelay = (ListPreference) preferenceScreen.findPreference(KEY_DEFAULT_SNOOZE_DELAY);
+        buildSnoozeDelayEntries();
+
         mWeekStart.setSummary(mWeekStart.getEntry());
         mDefaultReminder.setSummary(mDefaultReminder.getEntry());
 
@@ -263,6 +275,7 @@ public class GeneralPreferences extends PreferenceFragment implements
         mHomeTZ.setOnPreferenceChangeListener(listener);
         mWeekStart.setOnPreferenceChangeListener(listener);
         mDefaultReminder.setOnPreferenceChangeListener(listener);
+        mSnoozeDelay.setOnPreferenceChangeListener(listener);
         mRingtone.setOnPreferenceChangeListener(listener);
         mHideDeclined.setOnPreferenceChangeListener(listener);
         mVibrate.setOnPreferenceChangeListener(listener);
@@ -324,6 +337,9 @@ public class GeneralPreferences extends PreferenceFragment implements
         } else if (preference == mDefaultReminder) {
             mDefaultReminder.setValue((String) newValue);
             mDefaultReminder.setSummary(mDefaultReminder.getEntry());
+        } else if (preference == mSnoozeDelay) {
+            mSnoozeDelay.setValue((String) newValue);
+            mSnoozeDelay.setSummary(mSnoozeDelay.getEntry());
         } else if (preference == mRingtone) {
             if (newValue instanceof String) {
                 Utils.setRingTonePreference(activity, (String) newValue);
@@ -400,6 +416,18 @@ public class GeneralPreferences extends PreferenceFragment implements
         }
     }
 
+    private void buildSnoozeDelayEntries() {
+        final CharSequence[] values = mSnoozeDelay.getEntryValues();
+        final int count = values.length;
+        final CharSequence[] entries = new CharSequence[count];
+
+        for (int i = 0; i < count; i++) {
+            int value = Integer.parseInt(values[i].toString());
+            entries[i] = EventViewUtils.constructReminderLabel(getActivity(), value, false);
+        }
+
+        mSnoozeDelay.setEntries(entries);
+    }
 
     @Override
     public boolean onPreferenceTreeClick(
diff --git a/src/com/android/calendar/Utils.java b/src/com/android/calendar/Utils.java
index 41961852..837141a1 100644
--- a/src/com/android/calendar/Utils.java
+++ b/src/com/android/calendar/Utils.java
@@ -700,6 +700,21 @@ public class Utils {
         return prefs.getInt(GeneralPreferences.KEY_DAYS_PER_WEEK, 7);
     }
 
+    public static boolean useCustomSnoozeDelay(Context context) {
+        final SharedPreferences prefs = GeneralPreferences.getSharedPreferences(context);
+        return prefs.getBoolean(GeneralPreferences.KEY_USE_CUSTOM_SNOOZE_DELAY, false);
+    }
+
+    public static long getDefaultSnoozeDelayMs(Context context) {
+        final SharedPreferences prefs = GeneralPreferences.getSharedPreferences(context);
+        final String value = prefs.getString(GeneralPreferences.KEY_DEFAULT_SNOOZE_DELAY, null);
+        final long intValue = value != null
+                ? Long.valueOf(value)
+                : GeneralPreferences.SNOOZE_DELAY_DEFAULT_TIME;
+
+        return intValue * 60L * 1000L; // min -> ms
+    }
+
     /**
      * Determine whether the column position is Saturday or not.
      *
diff --git a/src/com/android/calendar/alerts/AlertReceiver.java b/src/com/android/calendar/alerts/AlertReceiver.java
index 83dcc9fc..8c2d4a78 100644
--- a/src/com/android/calendar/alerts/AlertReceiver.java
+++ b/src/com/android/calendar/alerts/AlertReceiver.java
@@ -235,7 +235,6 @@ public class AlertReceiver extends BroadcastReceiver {
     private static PendingIntent createSnoozeIntent(Context context, long eventId,
             long startMillis, long endMillis, int notificationId) {
         Intent intent = new Intent();
-        intent.setClass(context, SnoozeAlarmsService.class);
         intent.putExtra(AlertUtils.EVENT_ID_KEY, eventId);
         intent.putExtra(AlertUtils.EVENT_START_KEY, startMillis);
         intent.putExtra(AlertUtils.EVENT_END_KEY, endMillis);
@@ -245,7 +244,14 @@ public class AlertReceiver extends BroadcastReceiver {
         ContentUris.appendId(builder, eventId);
         ContentUris.appendId(builder, startMillis);
         intent.setData(builder.build());
-        return PendingIntent.getService(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+
+        if (Utils.useCustomSnoozeDelay(context)) {
+            intent.setClass(context, SnoozeDelayActivity.class);
+            return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+        } else {
+            intent.setClass(context, SnoozeAlarmsService.class);
+            return PendingIntent.getService(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+        }
     }
 
     private static PendingIntent createAlertActivityIntent(Context context) {
@@ -305,6 +311,10 @@ public class AlertReceiver extends BroadcastReceiver {
             mapIntent = createMapBroadcastIntent(context, urlSpans, eventId);
             callIntent = createCallBroadcastIntent(context, urlSpans, eventId);
 
+            // Create snooze intent.
+            snoozeIntent = createSnoozeIntent(context, eventId, startMillis, endMillis,
+                    notificationId);
+
             // Create email intent for emailing attendees.
             emailIntent = createBroadcastMailIntent(context, eventId, title);
 
diff --git a/src/com/android/calendar/alerts/AlertUtils.java b/src/com/android/calendar/alerts/AlertUtils.java
index fec7b111..8d7de12e 100644
--- a/src/com/android/calendar/alerts/AlertUtils.java
+++ b/src/com/android/calendar/alerts/AlertUtils.java
@@ -44,8 +44,6 @@ public class AlertUtils {
     private static final String TAG = "AlertUtils";
     static final boolean DEBUG = true;
 
-    public static final long SNOOZE_DELAY = 5 * 60 * 1000L;
-
     // We use one notification id for the expired events notification.  All
     // other notifications (the 'active' future/concurrent ones) use a unique ID.
     public static final int EXPIRED_GROUP_NOTIFICATION_ID = 0;
@@ -56,6 +54,7 @@ public class AlertUtils {
     public static final String NOTIFICATION_ID_KEY = "notificationid";
     public static final String EVENT_IDS_KEY = "eventids";
     public static final String EVENT_STARTS_KEY = "starts";
+    public static final String SNOOZE_DELAY_KEY = "snoozedelay";
 
     // A flag for using local storage to save alert state instead of the alerts DB table.
     // This allows the unbundled app to run alongside other calendar apps without eating
diff --git a/src/com/android/calendar/alerts/SnoozeAlarmsService.java b/src/com/android/calendar/alerts/SnoozeAlarmsService.java
index 6ef983d5..9490c719 100644
--- a/src/com/android/calendar/alerts/SnoozeAlarmsService.java
+++ b/src/com/android/calendar/alerts/SnoozeAlarmsService.java
@@ -26,6 +26,8 @@ import android.net.Uri;
 import android.os.IBinder;
 import android.provider.CalendarContract.CalendarAlerts;
 
+import com.android.calendar.Utils;
+
 /**
  * Service for asynchronously marking a fired alarm as dismissed and scheduling
  * a new alarm in the future.
@@ -51,6 +53,8 @@ public class SnoozeAlarmsService extends IntentService {
         long eventId = intent.getLongExtra(AlertUtils.EVENT_ID_KEY, -1);
         long eventStart = intent.getLongExtra(AlertUtils.EVENT_START_KEY, -1);
         long eventEnd = intent.getLongExtra(AlertUtils.EVENT_END_KEY, -1);
+        long snoozeDelay = intent.getLongExtra(AlertUtils.SNOOZE_DELAY_KEY,
+                Utils.getDefaultSnoozeDelayMs(this));
 
         // The ID reserved for the expired notification digest should never be passed in
         // here, so use that as a default.
@@ -76,7 +80,7 @@ public class SnoozeAlarmsService extends IntentService {
             resolver.update(uri, dismissValues, selection, null);
 
             // Add a new alarm
-            long alarmTime = System.currentTimeMillis() + AlertUtils.SNOOZE_DELAY;
+            long alarmTime = System.currentTimeMillis() + snoozeDelay;
             ContentValues values = AlertUtils.makeContentValues(eventId, eventStart, eventEnd,
                     alarmTime, 0);
             resolver.insert(uri, values);
diff --git a/src/com/android/calendar/alerts/SnoozeDelayActivity.java b/src/com/android/calendar/alerts/SnoozeDelayActivity.java
new file mode 100644
index 00000000..4f00df70
--- /dev/null
+++ b/src/com/android/calendar/alerts/SnoozeDelayActivity.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2013 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.calendar.alerts;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.app.TimePickerDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.widget.TimePicker;
+
+import com.android.calendar.R;
+import com.android.calendar.Utils;
+
+public class SnoozeDelayActivity extends Activity implements
+        TimePickerDialog.OnTimeSetListener, DialogInterface.OnCancelListener {
+    private static final int DIALOG_DELAY = 1;
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        showDialog(DIALOG_DELAY);
+    }
+
+    @Override
+    protected Dialog onCreateDialog(int id) {
+        if (id == DIALOG_DELAY) {
+            TimePickerDialog d = new TimePickerDialog(this, this, 0, 0, true);
+            d.setTitle(R.string.snooze_delay_dialog_title);
+            d.setCancelable(true);
+            d.setOnCancelListener(this);
+            return d;
+        }
+
+        return super.onCreateDialog(id);
+    }
+
+    @Override
+    protected void onPrepareDialog(int id, Dialog d) {
+        if (id == DIALOG_DELAY) {
+            TimePickerDialog tpd = (TimePickerDialog) d;
+            int delayMinutes = (int) (Utils.getDefaultSnoozeDelayMs(this) / (60L * 1000L));
+            int hours = delayMinutes / 60;
+            int minutes = delayMinutes % 60;
+
+            tpd.updateTime(hours, minutes);
+        }
+        super.onPrepareDialog(id, d);
+    }
+
+    @Override
+    public void onCancel(DialogInterface d) {
+        finish();
+    }
+
+    @Override
+    public void onTimeSet(TimePicker view, int hour, int minute) {
+        long delay = (hour * 60 + minute) * 60L * 1000L;
+        Intent intent = getIntent();
+        intent.setClass(this, SnoozeAlarmsService.class);
+        intent.putExtra(AlertUtils.SNOOZE_DELAY_KEY, delay);
+        startService(intent);
+        finish();
+    }
+}