From 7afbd6d957f70606ea6700c09b7d73bea672f770 Mon Sep 17 00:00:00 2001
From: Philipp Schaefer <trashzopf@gmail.com>
Date: Thu, 19 Dec 2013 16:47:01 +0100
Subject: [PATCH] moved user location to sub preference screen

---
 mobile/res/values/strings.xml                 |  1 +
 mobile/res/xml/preferences.xml                | 27 +++++++++++--------
 .../iitc_mobile/fragments/MainSettings.java   |  3 ++-
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/mobile/res/values/strings.xml b/mobile/res/values/strings.xml
index 6ac72d23..b71c0b51 100644
--- a/mobile/res/values/strings.xml
+++ b/mobile/res/values/strings.xml
@@ -83,6 +83,7 @@
     <string name="pref_tweaks_cat">Tweaks</string>
     <string name="pref_plugins">IITC Plugins</string>
     <string name="pref_plugins_title">Available plugins</string>
+    <string name="pref_user_loc_screen">User location</string>
     <string name="pref_user_loc">Display user location</string>
     <string name="pref_user_loc_sum">Show users position on map</string>
     <string name="pref_user_loc_sensor">Use sensor orientation</string>
diff --git a/mobile/res/xml/preferences.xml b/mobile/res/xml/preferences.xml
index a92dcc8e..df042414 100644
--- a/mobile/res/xml/preferences.xml
+++ b/mobile/res/xml/preferences.xml
@@ -14,17 +14,22 @@
     <PreferenceCategory
         android:key="pref_ui_cat"
         android:title="@string/pref_ui_cat">
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="pref_user_loc"
-            android:summary="@string/pref_user_loc_sum"
-            android:title="@string/pref_user_loc"/>
-        <CheckBoxPreference
-            android:defaultValue="true"
-            android:key="pref_user_loc_sensor"
-            android:dependency="pref_user_loc"
-            android:summary="@string/pref_user_loc_sensor_sum"
-            android:title="@string/pref_user_loc_sensor"/>
+        <PreferenceScreen
+            android:key="pref_user_loc_screen"
+            android:persistent="false"
+            android:title="@string/pref_user_loc_screen">
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="pref_user_loc"
+                android:summary="@string/pref_user_loc_sum"
+                android:title="@string/pref_user_loc"/>
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="pref_user_loc_sensor"
+                android:dependency="pref_user_loc"
+                android:summary="@string/pref_user_loc_sensor_sum"
+                android:title="@string/pref_user_loc_sensor"/>
+        </PreferenceScreen>
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="pref_user_zoom"
diff --git a/mobile/src/com/cradle/iitc_mobile/fragments/MainSettings.java b/mobile/src/com/cradle/iitc_mobile/fragments/MainSettings.java
index cbcee155..77ccac2b 100644
--- a/mobile/src/com/cradle/iitc_mobile/fragments/MainSettings.java
+++ b/mobile/src/com/cradle/iitc_mobile/fragments/MainSettings.java
@@ -63,7 +63,8 @@ public class MainSettings extends PreferenceFragment {
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         if (preference.getTitle().toString().equals(getString(R.string.pref_advanced_options))
-                || preference.getTitle().toString().equals(getString(R.string.pref_about_title))) {
+                || preference.getTitle().toString().equals(getString(R.string.pref_about_title))
+                || preference.getTitle().toString().equals(getString(R.string.pref_user_loc_screen))) {
             initializeActionBar((PreferenceScreen) preference);
         }
         return super.onPreferenceTreeClick(preferenceScreen, preference);