aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/xml/preferences.xml
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-12-15 17:16:49 +0100
committeriNPUTmice <daniel@gultsch.de>2014-12-15 17:16:49 +0100
commit25d8546ae89da97e975e72e9eb2f0608fb38aad5 (patch)
tree2dffd319c33c95a4ee33bb884f1a1a5407c0173e /src/main/res/xml/preferences.xml
parent2bd4621245dfcf1a64f68e1c3d1ae82e44cbe4b9 (diff)
parenta6d4b0aec5ab5d8df887e7e0aefaaeef7c42a8b9 (diff)
Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into SamWhited-quiet-hours
Diffstat (limited to 'src/main/res/xml/preferences.xml')
-rw-r--r--src/main/res/xml/preferences.xml25
1 files changed, 23 insertions, 2 deletions
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>