From d2d1fd22fe38b9ce21a559612a6251e084677c8b Mon Sep 17 00:00:00 2001
From: Phillip Hsu <philliphsu@outlook.com>
Date: Mon, 19 Sep 2016 18:37:05 -0700
Subject: [PATCH] Create timer auto silence preference. Change default values
 of alarm auto silence and snooze duration preferences. Remove world clock
 preferences.

---
 .../clock2/timers/TimerRingtoneService.java      |  5 +++--
 app/src/main/res/values/prefs_timers.xml         |  3 +++
 app/src/main/res/xml/preferences.xml             | 16 ++++++++++++----
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/philliphsu/clock2/timers/TimerRingtoneService.java b/app/src/main/java/com/philliphsu/clock2/timers/TimerRingtoneService.java
index ef469e7..0bade17 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/TimerRingtoneService.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/TimerRingtoneService.java
@@ -100,7 +100,8 @@ public class TimerRingtoneService extends RingtoneService<Timer> {
 
     @Override
     protected int minutesToAutoSilence() {
-        // TODO: Use same value as for Alarms, or create new preference.
-        return 1;
+        String value = PreferenceManager.getDefaultSharedPreferences(this).getString(
+                getString(R.string.key_timer_silence_after), "15");
+        return Integer.parseInt(value);
     }
 }
diff --git a/app/src/main/res/values/prefs_timers.xml b/app/src/main/res/values/prefs_timers.xml
index d233a97..d2f6f2a 100644
--- a/app/src/main/res/values/prefs_timers.xml
+++ b/app/src/main/res/values/prefs_timers.xml
@@ -7,4 +7,7 @@
 
     <string name="key_timer_vibrate">key_timer_vibrate</string>
     <string name="title_timer_vibrate">Vibrate</string>
+
+    <string name="key_timer_silence_after">key_timer_silence_after</string>
+    <string name="title_timer_silence_after">@string/title_silence_after</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 2b8cd48..812f581 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   xmlns:app="http://schemas.android.com/apk/res-auto">
-    <PreferenceCategory android:title="@string/title_category_world_clock">
+    <!--<PreferenceCategory android:title="@string/title_category_world_clock">
         <ListPreference
             android:key="@string/key_show_time_offsets_from"
             android:title="@string/title_show_time_offsets_from"
@@ -10,7 +10,7 @@
             android:entryValues="@array/array_show_time_offsets_from"
             android:defaultValue="@string/local_time"
             android:summary="%s"/>
-    </PreferenceCategory>
+    </PreferenceCategory>-->
     <PreferenceCategory android:title="@string/title_category_alarms">
         <ListPreference
             android:key="@string/key_time_picker_style"
@@ -26,7 +26,7 @@
             android:dialogTitle="@string/title_silence_after"
             android:entries="@array/entries_duration"
             android:entryValues="@array/values_duration"
-            android:defaultValue="1"
+            android:defaultValue="15"
             android:summary="%s"/>
         <ListPreference
             android:key="@string/key_snooze_duration"
@@ -34,7 +34,7 @@
             android:dialogTitle="@string/title_snooze_duration"
             android:entries="@array/entries_duration"
             android:entryValues="@array/values_duration"
-            android:defaultValue="1"
+            android:defaultValue="10"
             android:summary="%s"/>
         <Preference
             android:key="@string/key_alarm_volume"
@@ -62,6 +62,14 @@
             android:title="@string/title_timer_ringtone"
             android:ringtoneType="alarm"
             android:defaultValue="content://settings/system/alarm_alert"/>
+        <ListPreference
+            android:key="@string/key_timer_silence_after"
+            android:title="@string/title_timer_silence_after"
+            android:dialogTitle="@string/title_timer_silence_after"
+            android:entries="@array/entries_duration"
+            android:entryValues="@array/values_duration"
+            android:defaultValue="15"
+            android:summary="%s"/>
         <SwitchPreference
             android:key="@string/key_timer_vibrate"
             android:title="@string/title_timer_vibrate"