diff options
| author | Christian S <christian@pix-art.de> | 2016-04-30 21:10:24 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-04-30 21:10:24 +0200 |
| commit | ab37336d1edc446f17d7a7aaeb653efb170283d9 (patch) | |
| tree | 609ca7afbc7bd0c4af0344af310fa0bd352bd4ae /src/main/res/xml | |
| parent | fe60bd582aee184b49d1af14357cb88ad2637c3e (diff) | |
| parent | 936006173ce11111f10c0bddd66d28c439ca584e (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master' into development
Diffstat (limited to 'src/main/res/xml')
| -rw-r--r-- | src/main/res/xml/preferences.xml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 5ce392765..b468363e5 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -214,14 +214,22 @@ <PreferenceCategory android:title="@string/pref_presence_settings"> <CheckBoxPreference android:defaultValue="false" + android:key="manually_change_presence" + android:title="@string/pref_manually_change_presence" + android:summary="@string/pref_manually_change_presence_summary" + android:disableDependentsState="true"/> + <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"/> + android:title="@string/pref_away_when_screen_off" + android:dependency="manually_change_presence"/> <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"/> + android:title="@string/pref_xa_on_silent_mode" + android:dependency="manually_change_presence"/> <CheckBoxPreference android:dependency="xa_on_silent_mode" android:defaultValue="false" |