diff options
| author | lookshe <github@lookshe.org> | 2016-04-17 16:54:19 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-04-17 16:54:19 +0200 |
| commit | 4b11fa4c69834d8e03b18032e12b0ce788da2f70 (patch) | |
| tree | 05dac279672a3a207699dc78d44e6cede0f07fb5 /src/main/res/xml/preferences.xml | |
| parent | 2fdd4e6518e16949ce483b15471714b10e9cb92e (diff) | |
| parent | bfe01c432244e04daf6804d5cfc3b838ea247c4b (diff) | |
Merge tag '1.11.7' into trz/merge_1.11.7
Conflicts:
README.md
build.gradle
gradle/wrapper/gradle-wrapper.properties
src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
src/main/java/eu/siacs/conversations/persistance/FileBackend.java
src/main/java/eu/siacs/conversations/services/AvatarService.java
src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java
src/main/java/eu/siacs/conversations/services/NotificationService.java
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
src/main/res/values-cs/strings.xml
src/main/res/values-de/strings.xml
src/main/res/values-es/strings.xml
src/main/res/values-fr/strings.xml
src/main/res/values-it/strings.xml
src/main/res/values-pt-rBR/strings.xml
src/main/res/values-zh-rCN/strings.xml
src/main/res/values/strings.xml
src/main/res/xml/preferences.xml
Diffstat (limited to 'src/main/res/xml/preferences.xml')
| -rw-r--r-- | src/main/res/xml/preferences.xml | 40 |
1 files changed, 29 insertions, 11 deletions
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index f0de762b..90ac3c0b 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,13 @@ 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"/> + <CheckBoxPreference + android:defaultValue="false" + android:key="allow_message_correction" + android:title="@string/pref_allow_message_correction" + android:summary="@string/pref_allow_message_correction_summary"/> </PreferenceCategory> <PreferenceCategory android:key="connection_options" @@ -226,7 +244,7 @@ android:title="@string/pref_treat_vibrate_as_silent" android:summary="@string/pref_treat_vibrate_as_silent_summary"/> </PreferenceCategory> - <PreferenceCategory android:key="other_expert_settings" android:title="@string/pref_expert_options_other"> + <PreferenceCategory android:title="@string/pref_expert_options_other"> <CheckBoxPreference android:key="autojoin" android:defaultValue="true" |