From 1901abd05fc051b776e2bbb10295f936408a0843 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 22 Apr 2016 21:25:06 +0200
Subject: expert setting to manually change presence

---
 src/main/res/xml/preferences.xml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/main/res/xml/preferences.xml')

diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index d1ba6b7f..63dc71db 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -191,16 +191,24 @@
                     android:title="@string/pref_display_enter_key"/>
             </PreferenceCategory>
             <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"
-- 
cgit v1.2.3


From 7113e21a433b04d82a161ea36625d3512a86f18a Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 12 May 2016 18:47:41 +0200
Subject: use 'phone' or 'tablet' as default resource

---
 src/main/res/xml/preferences.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/res/xml/preferences.xml')

diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 63dc71db..80980417 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -9,7 +9,7 @@
             android:title="@string/pref_grant_presence_updates"/>
 
         <ListPreference
-            android:defaultValue="Mobile"
+            android:defaultValue="@string/default_resource"
             android:entries="@array/resources"
             android:entryValues="@array/resources"
             android:key="resource"
-- 
cgit v1.2.3