diff options
| author | lookshe <github@lookshe.org> | 2015-04-11 14:15:07 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2015-04-11 14:15:07 +0200 |
| commit | df63c14617bc8d665bfeac62cde0b29e6aa98873 (patch) | |
| tree | b825c0c87bcd9833ecfad85ecc5c0901ea4d77eb /src/main/res/xml/preferences.xml | |
| parent | 87e56b534ad41199380c97e16ad25acbd077878c (diff) | |
| parent | e17b75511e7c9d8206939b742972021c5c9d6b86 (diff) | |
Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz/master
Diffstat (limited to 'src/main/res/xml/preferences.xml')
| -rw-r--r-- | src/main/res/xml/preferences.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 2c666baa..adc15c6f 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -28,6 +28,12 @@ android:key="confirm_messages" android:summary="@string/pref_confirm_messages_summary" android:title="@string/pref_confirm_messages" /> + + <CheckBoxPreference + android:defaultValue="false" + android:key="chat_states" + android:summary="@string/pref_chat_states_summary" + android:title="@string/pref_chat_states" /> <CheckBoxPreference android:defaultValue="true" android:key="parse_emoticons" @@ -145,6 +151,11 @@ android:key="keep_foreground_service" android:title="@string/pref_keep_foreground_service" android:summary="@string/pref_keep_foreground_service_summary" /> + <EditTextPreference + android:defaultValue="0xffffffff" + android:key="led_notification_color" + android:title="@string/pref_led_notification_color" + android:summary="@string/pref_led_notification_color_summary"/> </PreferenceCategory> </PreferenceScreen> |