From 17a820028e3bc1e082d24b4f24b92625a43b562f Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Sat, 16 Dec 2017 23:42:50 +0100
Subject: [PATCH] move weather to another screen

---
 app/src/main/res/values/strings.xml  | 5 ++++-
 app/src/main/res/xml/preferences.xml | 8 +++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 96b5712f0..dbb455233 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -110,7 +110,8 @@
     <string name="pref_call_privacy_mode_number">Hide number but display name</string>
     <string name="pref_call_privacy_mode_complete">Hide name and number</string>
 
-    <string name="pref_title_weather_location">Weather location</string>
+    <string name="pref_title_weather">Weather</string>
+    <string name="pref_title_weather_location">Weather location (CM/LOS)</string>
 
     <string name="pref_blacklist">Blacklist Apps</string>
     <string name="pref_blacklist_calendars">Blacklist Calendars</string>
@@ -497,6 +498,7 @@
     <string name="_pebble_watch_open_on_phone">Open on phone</string>
     <string name="_pebble_watch_mute">Mute</string>
     <string name="_pebble_watch_reply">Reply</string>
+
     <string name="kind_firmware">Firmware</string>
     <string name="kind_invalid">Invalid data</string>
     <string name="kind_font">Font</string>
@@ -505,6 +507,7 @@
     <string name="kind_gps_cep">GPS Error Correction</string>
     <string name="kind_resources">Resources</string>
     <string name="kind_watchface">Watchface</string>
+
     <string name="devicetype_unknown">Unknown Device</string>
     <string name="devicetype_test">Test Device</string>
     <string name="devicetype_pebble">Pebble</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 55f111cb3..bd1001eed 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -41,9 +41,11 @@
             android:key="measurement_system"
             android:summary="%s"
             android:title="@string/pref_title_unit_system" />
-        <EditTextPreference
-            android:key="weather_city"
-            android:title="@string/pref_title_weather_location" />
+        <PreferenceScreen android:title="@string/pref_title_weather">
+            <EditTextPreference
+                android:key="weather_city"
+                android:title="@string/pref_title_weather_location" />
+        </PreferenceScreen>
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="minimize_priority"