diff options
author | Christian S <christian@pix-art.de> | 2015-10-10 11:32:51 +0200 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2015-10-10 11:32:51 +0200 |
commit | 84d5bb9a2c57091653bdd5c365338b77b13add56 (patch) | |
tree | d1eb0aa49c590223343b6929b2e1232e4a47e384 /src/main/res | |
parent | 879d5ce16a05804526f0c72f8f25d4bfac097721 (diff) | |
parent | ef605e4cbd162d48e40d13d91b188b9838de308d (diff) |
copy commits
Diffstat (limited to 'src/main/res')
-rw-r--r-- | src/main/res/values/strings.xml | 8 | ||||
-rw-r--r-- | src/main/res/xml/preferences.xml | 12 |
2 files changed, 18 insertions, 2 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 4f7e4a1f4..c779d633f 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name" translatable="false">Conversations</string> @@ -531,5 +531,9 @@ <string name="no_update_available">No update available</string> <string name="download_started">Download started</string> <string name="server_info_broken">Broken</string> - + <string name="pref_presence_settings">Presence settings</string> + <string name="pref_away_when_screen_off">Away when screen is off</string> + <string name="pref_away_when_screen_off_summary">Marks your resource as away when the screen is turned off</string> + <string name="pref_xa_on_silent_mode">Not available in silent mode</string> + <string name="pref_xa_on_silent_mode_summary">Marks your resource as not available when phone is in silent mode</string> </resources> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 91abaf4e5..5c7b885b6 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -159,6 +159,18 @@ android:summary="@string/pref_display_enter_key_summary" android:title="@string/pref_display_enter_key"/> </PreferenceCategory> + <PreferenceCategory android:title="@string/pref_presence_settings"> + <CheckBoxPreference + android:defaultValue="false" + android:key="away_when_screen_off" + android:summary="@string/pref_away_when_screen_off_summary" + android:title="@string/pref_away_when_screen_off"/> + <CheckBoxPreference + android:defaultValue="false" + android:key="xa_on_silent_mode" + android:summary="@string/pref_xa_on_silent_mode_summary" + android:title="@string/pref_xa_on_silent_mode"/> + </PreferenceCategory> <PreferenceCategory android:title="@string/pref_expert_options_other"> <CheckBoxPreference android:defaultValue="true" |