Move map theme to look and feel

app/src/main/res/values-es/strings.xml

@@ -699,7 +699,6 @@
     <string name="widget_show_title">Mostrar título</string>
     <string name="location_based_reminders">Recordatorios basados en la ubicación</string>
     <string name="map_theme_use_app_theme">Utilizar el tema de la aplicación</string>
-    <string name="maps">Mapas</string>
     <string name="reverse_geocoder">Geocodificador inverso</string>
     <string name="tasks_org_account_required">Se requiere una cuenta de Tasks.org</string>
     <string name="map_theme">Tema del mapa</string>

app/src/main/res/values-fr/strings.xml

@@ -696,6 +696,5 @@
     <string name="map_theme">Thème de la carte</string>
     <string name="location_based_reminders">Rappels basés sur la localisation</string>
     <string name="map_theme_use_app_theme">Utiliser le thème de l’application</string>
-    <string name="maps">Cartes</string>
     <string name="tasks_org_account_required">Compte Tasks.org requis</string>
 </resources>

app/src/main/res/values-hu/strings.xml

@@ -698,7 +698,6 @@
     <string name="location_based_reminders">Hely alapú emlékeztetők</string>
     <string name="reverse_geocoder">Fordított geokódoló</string>
     <string name="map_theme_use_app_theme">Alkalmazás témájának használata</string>
-    <string name="maps">Térképek</string>
     <string name="tasks_org_account_required">Tasks.org fiók szükséges</string>
     <string name="map_theme">Térkép téma</string>
 </resources>

app/src/main/res/values-nl/strings.xml

@@ -696,6 +696,5 @@
     <string name="location_based_reminders">Locatiegebaseerde herinneringen</string>
     <string name="map_theme">Kaartthema</string>
     <string name="map_theme_use_app_theme">Gebruik app-thema</string>
-    <string name="maps">Kaarten</string>
     <string name="tasks_org_account_required">Vereist een Tasks.org account</string>
 </resources>

app/src/main/res/values-uk/strings.xml

@@ -719,7 +719,6 @@
     <string name="widget_show_title">Показати заголовок</string>
     <string name="location_based_reminders">Нагадування на основі розташування</string>
     <string name="map_theme_use_app_theme">Використовувати тему застосунку</string>
-    <string name="maps">Карти</string>
     <string name="reverse_geocoder">Зворотний геокодер</string>
     <string name="tasks_org_account_required">Потрібен обліковий запис Tasks.org</string>
     <string name="map_theme">Тема карти</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -689,7 +689,6 @@
     <string name="widget_show_title">显示标题</string>
     <string name="location_based_reminders">基于位置的提醒</string>
     <string name="map_theme_use_app_theme">使用应用主题</string>
-    <string name="maps">地图</string>
     <string name="reverse_geocoder">反向地理编码器</string>
     <string name="tasks_org_account_required">需要 Tasks.org 账户</string>
     <string name="map_theme">地图主题</string>

app/src/main/res/values/strings.xml

@@ -700,7 +700,6 @@ File %1$s contained %2$s.\n\n
   <string name="tasks_org_account_required">Tasks.org account required</string>
   <string name="account_not_included">Not included with \'Name your price\' subscriptions</string>
   <string name="reverse_geocoder">Reverse geocoder</string>
-  <string name="maps">Maps</string>
   <string name="map_theme_use_app_theme">Use app theme</string>
   <string name="location_based_reminders">Location-based reminders</string>
 </resources>

app/src/main/res/xml/preferences_location.xml

@@ -12,20 +12,6 @@
 
   </PreferenceCategory>
 
-  <PreferenceCategory
-    android:key="@string/maps"
-    android:title="@string/maps">
-
-    <ListPreference
-      android:defaultValue="0"
-      android:key="@string/p_map_theme"
-      android:title="@string/map_theme"
-      android:entries="@array/map_theme_names"
-      android:entryValues="@array/map_theme_values"
-      android:summary="%s" />
-
-  </PreferenceCategory>
-
   <PreferenceCategory
     android:key="@string/places"
     android:title="@string/places">

app/src/main/res/xml/preferences_look_and_feel.xml

@@ -26,6 +26,14 @@
     android:summaryOn="@string/desaturate_colors_summary_on"
     android:summaryOff="@string/desaturate_colors_summary_off" />
 
+  <ListPreference
+    android:defaultValue="0"
+    android:key="@string/p_map_theme"
+    android:title="@string/map_theme"
+    android:entries="@array/map_theme_names"
+    android:entryValues="@array/map_theme_values"
+    android:summary="%s" />
+
   <PreferenceCategory
     android:title="@string/on_launch">