diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-12-15 17:16:49 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-12-15 17:16:49 +0100 |
| commit | 25d8546ae89da97e975e72e9eb2f0608fb38aad5 (patch) | |
| tree | 2dffd319c33c95a4ee33bb884f1a1a5407c0173e /src/main/res | |
| parent | 2bd4621245dfcf1a64f68e1c3d1ae82e44cbe4b9 (diff) | |
| parent | a6d4b0aec5ab5d8df887e7e0aefaaeef7c42a8b9 (diff) | |
Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into SamWhited-quiet-hours
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/values/strings.xml | 6 | ||||
| -rw-r--r-- | src/main/res/xml/preferences.xml | 25 |
2 files changed, 29 insertions, 2 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 6b639452..02be6348 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -41,6 +41,7 @@ <string name="invite_contact">Invite Contact</string> <string name="contacts">Contacts</string> <string name="cancel">Cancel</string> + <string name="set">Set</string> <string name="add">Add</string> <string name="edit">Edit</string> <string name="delete">Delete</string> @@ -282,6 +283,11 @@ \n\nhttps://developer.android.com/tools/support-library\n(Apache License, Version 2.0) \n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0) </string> + <string name="title_pref_quiet_hours">Quiet Hours</string> + <string name="title_pref_quiet_hours_start_time">Start time</string> + <string name="title_pref_quiet_hours_end_time">End time</string> + <string name="title_pref_enable_quiet_hours">Enable quiet hours</string> + <string name="pref_quiet_hours_summary">Notifications will be silenced during quiet hours</string> <string name="pref_use_larger_font">Increase font size</string> <string name="pref_use_larger_font_summary">Use larger font sizes across the entire app</string> <string name="pref_use_send_button_to_indicate_status">Send button indicates status</string> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index f927d915..9974f14d 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -35,7 +35,29 @@ android:key="show_notification" android:summary="@string/pref_notifications_summary" android:title="@string/pref_notifications" /> - <CheckBoxPreference + <PreferenceScreen + android:dependency="show_notification" + android:summary="@string/pref_quiet_hours_summary" + android:title="@string/title_pref_quiet_hours"> + <CheckBoxPreference + android:defaultValue="false" + android:key="enable_quiet_hours" + android:summary="@string/pref_quiet_hours_summary" + android:title="@string/title_pref_enable_quiet_hours" /> + <eu.siacs.conversations.ui.TimePreference + android:dependency="enable_quiet_hours" + android:key="quiet_hours_start" + android:negativeButtonText="@string/cancel" + android:positiveButtonText="@string/set" + android:title="@string/title_pref_quiet_hours_start_time" /> + <eu.siacs.conversations.ui.TimePreference + android:dependency="enable_quiet_hours" + android:key="quiet_hours_end" + android:negativeButtonText="@string/cancel" + android:positiveButtonText="@string/set" + android:title="@string/title_pref_quiet_hours_end_time" /> + </PreferenceScreen> + <CheckBoxPreference android:defaultValue="true" android:dependency="show_notification" android:key="vibrate_on_notification" @@ -123,5 +145,4 @@ <eu.siacs.conversations.ui.AboutPreference android:summary="@string/pref_about_conversations_summary" android:title="@string/title_activity_about" /> - </PreferenceScreen> |