hollorol/Clockplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create timer auto silence preference. Change default values of alarm auto silence and snooze duration preferences. Remove world clock preferences.

Browse Source
This commit is contained in:
Phillip Hsu 2016-09-19 18:37:05 -07:00
parent f16d3386a8
commit d2d1fd22fe
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/philliphsu/clock2/timers/TimerRingtoneService.java
View File

@ -100,7 +100,8 @@ public class TimerRingtoneService extends RingtoneService<Timer> {
@Override @Override
protected int minutesToAutoSilence() { protected int minutesToAutoSilence() {
// TODO: Use same value as for Alarms, or create new preference. String value = PreferenceManager.getDefaultSharedPreferences(this).getString(
return 1; getString(R.string.key_timer_silence_after), "15");
return Integer.parseInt(value);
} }
} }

3
app/src/main/res/values/prefs_timers.xml
View File

@ -7,4 +7,7 @@
<string name="key_timer_vibrate">key_timer_vibrate</string> <string name="key_timer_vibrate">key_timer_vibrate</string>
<string name="title_timer_vibrate">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> </resources>

16
app/src/main/res/xml/preferences.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"> 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 <ListPreference
android:key="@string/key_show_time_offsets_from" android:key="@string/key_show_time_offsets_from"
android:title="@string/title_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:entryValues="@array/array_show_time_offsets_from"
android:defaultValue="@string/local_time" android:defaultValue="@string/local_time"
android:summary="%s"/> android:summary="%s"/>
</PreferenceCategory> </PreferenceCategory>-->
<PreferenceCategory android:title="@string/title_category_alarms"> <PreferenceCategory android:title="@string/title_category_alarms">
<ListPreference <ListPreference
android:key="@string/key_time_picker_style" android:key="@string/key_time_picker_style"
@ -26,7 +26,7 @@
android:dialogTitle="@string/title_silence_after" android:dialogTitle="@string/title_silence_after"
android:entries="@array/entries_duration" android:entries="@array/entries_duration"
android:entryValues="@array/values_duration" android:entryValues="@array/values_duration"
android:defaultValue="1" android:defaultValue="15"
android:summary="%s"/> android:summary="%s"/>
<ListPreference <ListPreference
android:key="@string/key_snooze_duration" android:key="@string/key_snooze_duration"
@ -34,7 +34,7 @@
android:dialogTitle="@string/title_snooze_duration" android:dialogTitle="@string/title_snooze_duration"
android:entries="@array/entries_duration" android:entries="@array/entries_duration"
android:entryValues="@array/values_duration" android:entryValues="@array/values_duration"
android:defaultValue="1" android:defaultValue="10"
android:summary="%s"/> android:summary="%s"/>
<Preference <Preference
android:key="@string/key_alarm_volume" android:key="@string/key_alarm_volume"
@ -62,6 +62,14 @@
android:title="@string/title_timer_ringtone" android:title="@string/title_timer_ringtone"
android:ringtoneType="alarm" android:ringtoneType="alarm"
android:defaultValue="content://settings/system/alarm_alert"/> 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 <SwitchPreference
android:key="@string/key_timer_vibrate" android:key="@string/key_timer_vibrate"
android:title="@string/title_timer_vibrate" android:title="@string/title_timer_vibrate"