aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/xml/preferences.xml
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-04-18 19:58:40 +0200
committersteckbrief <steckbrief@chefmail.de>2016-04-18 19:58:40 +0200
commitee0264d98c9a348ea29d12796bed25f9ba1494fb (patch)
treecc559348547e504d37a6efa7826ea0120070babe /src/main/res/xml/preferences.xml
parentd94eb9309b4ab3ee1dfd3cee637b47a52223e15b (diff)
parent7df96caedbbb96a28d4f7e07fa2d159c8ca1373f (diff)
Merge branch 'master' into introduce_cplus_database_version
Conflicts: gradle/wrapper/gradle-wrapper.properties src/main/res/values/strings.xml
Diffstat (limited to 'src/main/res/xml/preferences.xml')
-rw-r--r--src/main/res/xml/preferences.xml33
1 files changed, 23 insertions, 10 deletions
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 17c56bf7..44b66ab7 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -79,8 +79,15 @@
android:key="resize_picture"
android:summary="@string/pref_resize_picture_summary"
android:title="@string/pref_resize_picture"/>
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="return_to_previous"
+ android:title="@string/pref_return_to_previous"
+ android:summary="@string/pref_return_to_previous_summary"/>
</PreferenceCategory>
- <PreferenceCategory android:title="@string/pref_notification_settings" >
+ <PreferenceCategory
+ android:key="notifications"
+ android:title="@string/pref_notification_settings">
<PreferenceScreen
android:summary="@string/pref_notification_settings"
android:title="@string/pref_notifications" >
@@ -117,15 +124,20 @@
android:dependency="show_notification"
android:key="vibrate_on_notification"
android:summary="@string/pref_vibrate_summary"
- android:title="@string/pref_vibrate" />
-
- <RingtonePreference
- android:defaultValue="content://settings/system/notification_sound"
+ android:title="@string/pref_vibrate"/>
+ <CheckBoxPreference
+ android:defaultValue="true"
android:dependency="show_notification"
- android:key="notification_ringtone"
- android:ringtoneType="notification"
- android:summary="@string/pref_sound_summary"
- android:title="@string/pref_sound" />
+ android:key="led"
+ android:title="@string/pref_led"
+ android:summary="@string/pref_led_summary"/>
+ <RingtonePreference
+ android:defaultValue="content://settings/system/notification_sound"
+ android:dependency="show_notification"
+ android:key="notification_ringtone"
+ android:ringtoneType="notification"
+ android:summary="@string/pref_sound_summary"
+ android:title="@string/pref_sound"/>
<yuku.ambilwarna.widget.AmbilWarnaPreference
android:defaultValue="0xffffffff"
@@ -185,7 +197,8 @@
android:title="@string/pref_dont_trust_system_cas_title"/>
<Preference
android:key="remove_trusted_certificates"
- android:summary="@string/pref_remove_trusted_certificates_summary"/>
+ android:summary="@string/pref_remove_trusted_certificates_summary"
+ android:title="@string/pref_remove_trusted_certificates_title"/>
</PreferenceCategory>
<PreferenceCategory
android:key="connection_options"