aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/xml/preferences.xml
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2015-01-03 23:19:05 +0100
committerlookshe <github@lookshe.org>2015-01-03 23:19:05 +0100
commit95e2a539517c27b3235acd582f17968c8e301e81 (patch)
tree213bbeed798751e949376d85f4d7d0bd30c5fbfa /src/main/res/xml/preferences.xml
parent48717dd7d37c066ab626fc626a2ced626ef21d42 (diff)
parent4f4eff2353f4e359b5582c8e808a4e88631c3e74 (diff)
Merge branch 'master' of ssh://git.fucktheforce.de/conversations
Conflicts: src/main/java/eu/siacs/conversations/Config.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/UIHelper.java
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>