From 53deb85e5698f4e7696351565727929a7f94e533 Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Sat, 24 Feb 2024 15:19:36 +0530
Subject: [PATCH] Remove weather related leftovers

---
 AndroidManifest.xml                           |  11 -
 res/drawable-hdpi/nav_divider.png             | Bin 320 -> 0 bytes
 res/drawable-mdpi/nav_divider.png             | Bin 311 -> 0 bytes
 res/drawable-xhdpi/nav_divider.png            | Bin 332 -> 0 bytes
 res/drawable/ic_gear.xml                      |  26 -
 res/drawable/ic_settings_weather.xml          |  30 --
 res/layout/empty_weather_state.xml            |  54 --
 .../weather_service_provider_info_row.xml     |  80 ---
 res/values-af/strings.xml                     |  14 -
 res/values-ar/strings.xml                     |  14 -
 res/values-ast-rES/strings.xml                |  14 -
 res/values-az/strings.xml                     |  14 -
 res/values-be/strings.xml                     |   7 -
 res/values-bg/strings.xml                     |  14 -
 res/values-ca/strings.xml                     |  14 -
 res/values-cs/strings.xml                     |  14 -
 res/values-cy/strings.xml                     |  14 -
 res/values-da/strings.xml                     |  14 -
 res/values-de/strings.xml                     |  14 -
 res/values-el/strings.xml                     |  14 -
 res/values-en-rAU/strings.xml                 |  14 -
 res/values-en-rCA/strings.xml                 |  14 -
 res/values-en-rGB/strings.xml                 |  14 -
 res/values-en-rIN/strings.xml                 |  14 -
 res/values-es-rUS/strings.xml                 |  14 -
 res/values-es/strings.xml                     |  14 -
 res/values-et/strings.xml                     |  14 -
 res/values-eu/strings.xml                     |  14 -
 res/values-fi/strings.xml                     |  14 -
 res/values-fr/strings.xml                     |  14 -
 res/values-fy-rNL/strings.xml                 |  14 -
 res/values-gd/strings.xml                     |  14 -
 res/values-gl/strings.xml                     |  14 -
 res/values-hr/strings.xml                     |  14 -
 res/values-hu/strings.xml                     |  14 -
 res/values-in/strings.xml                     |  14 -
 res/values-it/strings.xml                     |  14 -
 res/values-iw/strings.xml                     |  14 -
 res/values-ja/strings.xml                     |  14 -
 res/values-kn/strings.xml                     |  14 -
 res/values-ko/strings.xml                     |  14 -
 res/values-mk/strings.xml                     |  14 -
 res/values-nb/strings.xml                     |  14 -
 res/values-nl/strings.xml                     |  14 -
 res/values-pl/strings.xml                     |  14 -
 res/values-pt-rBR/strings.xml                 |  14 -
 res/values-pt-rPT/strings.xml                 |  14 -
 res/values-ro/strings.xml                     |  14 -
 res/values-ru/strings.xml                     |  14 -
 res/values-sc-rIT/strings.xml                 |   1 -
 res/values-sk/strings.xml                     |  14 -
 res/values-sl/strings.xml                     |  14 -
 res/values-sq/strings.xml                     |  14 -
 res/values-sr/strings.xml                     |  14 -
 res/values-sv/strings.xml                     |   9 -
 res/values-th/strings.xml                     |  14 -
 res/values-tr/strings.xml                     |  14 -
 res/values-uk/strings.xml                     |  14 -
 res/values-vi/strings.xml                     |  14 -
 res/values-zh-rCN/strings.xml                 |  14 -
 res/values-zh-rTW/strings.xml                 |  14 -
 res/values/arrays.xml                         |  11 -
 res/values/colors.xml                         |   2 -
 res/values/config.xml                         |   3 -
 res/values/strings.xml                        |  17 -
 res/xml/parts_catalog.xml                     |   5 -
 res/xml/weather_settings.xml                  |  40 --
 .../weather/WeatherServiceSettings.java       | 482 ------------------
 68 files changed, 1478 deletions(-)
 delete mode 100644 res/drawable-hdpi/nav_divider.png
 delete mode 100644 res/drawable-mdpi/nav_divider.png
 delete mode 100644 res/drawable-xhdpi/nav_divider.png
 delete mode 100644 res/drawable/ic_gear.xml
 delete mode 100644 res/drawable/ic_settings_weather.xml
 delete mode 100644 res/layout/empty_weather_state.xml
 delete mode 100644 res/layout/weather_service_provider_info_row.xml
 delete mode 100644 res/xml/weather_settings.xml
 delete mode 100644 src/org/lineageos/lineageparts/weather/WeatherServiceSettings.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 69125200..f2292de2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -300,17 +300,6 @@
                 android:resource="@string/summary_empty" />
         </activity-alias>
 
-        <!-- Weather settings -->
-        <activity-alias
-            android:name=".weather.WeatherServiceSettings"
-            android:label="@string/weather_settings_title"
-            android:targetActivity="PartsActivity">
-            <intent-filter android:priority="1">
-                <action android:name="lineageos.intent.action.MANAGE_WEATHER_PROVIDER_SERVICES" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity-alias>
-
         <activity android:name=".profiles.NFCProfile">
             <intent-filter>
                 <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
diff --git a/res/drawable-hdpi/nav_divider.png b/res/drawable-hdpi/nav_divider.png
deleted file mode 100644
index b1f035c93d93eb3d9767fa9e266ab62a46ff8b9b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 320
zcmeAS@N?(olHy`uVBq!ia0y~yVBlb2U@+idVPIfr)Bk*cfq{W3$=lt9;eUJonf(k5
z44efXk;M!Q+(IDCc<FB4ACO>Kfnz#MFN4}~&gl#c3@V;3jv*T7lT!kc6A}`B{O@aQ
z4D4uZY;5dg<n7@C!2=8oX^Kp3xA*gXW?*0tEpd$~aV|<tEXmBzQwYh-O=YmuH!{>W
zGzg!NbeDmFK^3GRC9x#cDjB3ImBGls&_LI~QrE~N#L&RX(9FufOxM8N%D~|6w|%xK
z8glbfGSez?Ygn_It&xF&K?Y<)aDG}zd16s2gJVj5QmTSmW>IQ+eo=O@f^)EG;nv4y
Q3=9kmp00i_>zopr046qCIRF3v

diff --git a/res/drawable-mdpi/nav_divider.png b/res/drawable-mdpi/nav_divider.png
deleted file mode 100644
index f7ed6dff8ecf1393296142e701ec454f7a44286a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 311
zcmeAS@N?(olHy`uVBq!ia0y~yU|?lnU{K&-VPIe=V6S@3z`($i<n8Xl@V~wP%zg$2
z2F?PH$YKTtZXpn6ymYtj4@j`Az%d=Bm*K)}4haSZ25C<h#}J9j$teNJ2|xb#1$Hzx
zb~5t0&AgJt#2^;UlxAzGx{!f^LA1m*qQto<HL)Z!KTjbfGdGpNQs2l>-_Rg@LegCZ
z1_o7-f|SIPRI6l=s#FFe149E{14~^alMq7#D?>9Y12bI%b1MUbyWjTNqG-s?PsvQH
z#I0e?YPLoO1_l|B4Z-<oCFO}lsSJ)O`AMk?Zka`?<@rU~#R|^BriEJ{n=vpjFnGH9
KxvX<aXaWGL%~Y)b

diff --git a/res/drawable-xhdpi/nav_divider.png b/res/drawable-xhdpi/nav_divider.png
deleted file mode 100644
index 00e3852d5b61d77de5f7f230106e10971fa59974..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 332
zcmeAS@N?(olHy`uVBq!ia0y~yVBlt8U~u4IVPIfLvvOr(U|?WM@^*J&_}|`tW<LW1
z180FpWHAE+w-5+3Ub<WN2P9Zl;Fu26%g~?0be@5M!NAkSF~s6@a!NpQLPA2yzx^K<
ze}BJr&A&hOl9K<74GatuSQj6H!Dd$p2J<KE%b1-4=QA)ch?clUlsFfqCYEI8=P86_
z=B6@O>KhsA8ybX9NV?0wz@Q3Jkdj!EYLyI9mC9gbU}&goV61Cs7Gh{-WngAyYM^Ui
zZe?JgxvE7MMMG|WN@iLmZVeINZ6-1>Fvx&x2+mI{DNig)WpGT%PfAsA%PdMQ&o9a@
ZR&WkBE!_IpjDdlH!PC{xWt~$(69A4GVV(d0

diff --git a/res/drawable/ic_gear.xml b/res/drawable/ic_gear.xml
deleted file mode 100644
index 9562ea15..00000000
--- a/res/drawable/ic_gear.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="?android:attr/colorAccent"
-        android:pathData="M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.03 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.03 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z" />
-</vector>
diff --git a/res/drawable/ic_settings_weather.xml b/res/drawable/ic_settings_weather.xml
deleted file mode 100644
index 1a5a8a92..00000000
--- a/res/drawable/ic_settings_weather.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2016 The CyanogenMod Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="?android:attr/colorAccent"
-        android:pathData="M5.3,6.7L3.5,4.9L5,3.5l1.8,1.8L5.3,6.7z M13,1h-2v3h2V1z M1,13h3v-2H1V13z
-M20.5,4.9L19,3.5l-1.8,1.8l1.4,1.4L20.5,4.9z
-M17.3,9.1c-1-1.9-3-3.2-5.3-3.2c-3.3,0-6,2.7-6,6c0,0.9,0.2,1.7,0.5,2.5C5.6,15.3,5,16.6,5,18c0,2.8,2.2,5,5,5h6c3.9,0,7-3.1,7-7
-C23,12.6,20.5,9.7,17.3,9.1z
-M16,11c2.8,0,5,2.2,5,5s-2.2,5-5,5h-6c-1.7,0-3-1.3-3-3s1.3-3,3-3h1.1C11.6,12.7,13.6,11,16,11" />
-</vector>
\ No newline at end of file
diff --git a/res/layout/empty_weather_state.xml b/res/layout/empty_weather_state.xml
deleted file mode 100644
index ce9e7490..00000000
--- a/res/layout/empty_weather_state.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2016 The CyanogenMod Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:id="@+id/empty_weather_state"
-             android:layout_width="fill_parent"
-             android:layout_height="fill_parent"
-             android:visibility="gone">
-    <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:orientation="vertical">
-        <ImageView
-                android:id="@+id/icon"
-                android:layout_width="192dp"
-                android:layout_height="192dp"
-                android:layout_marginBottom="12dip"
-                android:src="@drawable/ic_settings_weather"
-                android:tint="@color/weather_settings_icon_tint"
-                android:contentDescription="@null" />
-        <TextView
-                android:id="@+id/message"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textSize="18dp"
-                android:textColor="?android:attr/textColorSecondary" />
-
-        <Button android:id="@+id/add_weather_provider"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="center"
-                style="?android:attr/buttonBarButtonStyle"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:text="@string/weather_settings_add_weather_provider"
-                android:textAllCaps="true"
-                android:textColor="@*android:color/material_deep_teal_500" />
-    </LinearLayout>
-</FrameLayout>
diff --git a/res/layout/weather_service_provider_info_row.xml b/res/layout/weather_service_provider_info_row.xml
deleted file mode 100644
index ad63d3c1..00000000
--- a/res/layout/weather_service_provider_info_row.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2016 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:background="?android:attr/selectableItemBackground" >
-
-    <!-- Weather Provider Service icon -->
-
-    <ImageView
-        android:id="@android:id/icon"
-        android:layout_width="@android:dimen/app_icon_size"
-        android:layout_height="@android:dimen/app_icon_size"
-        android:layout_gravity="center_vertical"
-        android:layout_marginEnd="6dp"
-        android:contentDescription="@null"
-        android:scaleType="fitCenter" />
-
-    <!-- Weather Provider Service caption -->
-
-    <TextView
-        android:id="@android:id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:layout_gravity="center_vertical"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textAlignment="viewStart" />
-
-    <!-- Weather Provider Service radio button -->
-
-    <RadioButton
-        android:id="@+id/radio"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:duplicateParentState="true"
-        android:clickable="false"
-        android:focusable="false" />
-
-    <!-- Divider -->
-
-    <ImageView
-        android:id="@+id/divider"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:contentDescription="@null"
-        android:src="@drawable/nav_divider" />
-
-    <ImageView
-        android:id="@+id/settings"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:background="?android:attr/selectableItemBackgroundBorderless"
-        android:contentDescription="@string/weather_settings_button"
-        android:padding="8dip"
-        android:clickable="true"
-        android:focusable="true"
-        android:src="@drawable/ic_gear" />
-
-</LinearLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 0da143f9..a6991d7d 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -370,20 +370,6 @@
     <string name="display_rotation_90_title">90 grade</string>
     <string name="display_rotation_180_title">180 grade</string>
     <string name="display_rotation_270_title">270 grade</string>
-    <string name="weather_settings_title">Weer</string>
-    <string name="weather_settings_no_services_prompt">Geen weer verskaffer dienste geïnstalleer nie</string>
-    <string name="weather_settings_no_services_summary">Installeer \'n weer verskaffer om weer inligting te ontvang</string>
-    <string name="weather_settings_button">Verskaffer instellings</string>
-    <string name="weather_settings_activity_not_found">Kon nie die instellings-kieslys van die verskaffer begin nie</string>
-    <string name="weather_settings_add_weather_provider">Voeg weer verskaffer by</string>
-    <string name="weather_settings_general_settings_title">Algemeen</string>
-    <string name="weather_settings_providers_title">Verskaffers</string>
-    <string name="weather_settings_temp_units_title">Temperatuur eenheid</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">weer</string>
-    <string name="status_bar_show_weather_title">Wys weer</string>
-    <string name="status_bar_show_weather_summary">Wys die huidige temperatuur op die statusbalk</string>
     <string name="charging_sounds_settings_title">Laai klanke</string>
     <string name="charging_sounds_summary">Speel \'n klank met die koppeling of ontkoppeling van \'n kragbron</string>
     <string name="power_notifications_vibrate_title">Vibreer</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 59520207..9903baec 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -427,20 +427,6 @@
     <string name="display_rotation_90_title">90 درجة</string>
     <string name="display_rotation_180_title">180 درجة</string>
     <string name="display_rotation_270_title">270 درجة</string>
-    <string name="weather_settings_title">الطقس</string>
-    <string name="weather_settings_no_services_prompt">لم يتم تثبيت خدمات مزوّد الطقس</string>
-    <string name="weather_settings_no_services_summary">قم بتثبيت موفر طقس لتلقي تحديثات الطقس</string>
-    <string name="weather_settings_button">إعدادات مزوّد الخدمة</string>
-    <string name="weather_settings_activity_not_found">تعذر بدء قائمة الإعدادات لهذا الموفر</string>
-    <string name="weather_settings_add_weather_provider">إضافة موفر الطقس</string>
-    <string name="weather_settings_general_settings_title">إعدادات عامة</string>
-    <string name="weather_settings_providers_title">المزودات</string>
-    <string name="weather_settings_temp_units_title">وحدة درجة الحرارة</string>
-    <string name="weather_settings_temp_celsius">مئوية</string>
-    <string name="weather_settings_temp_fahrenheit">فهرنهايت</string>
-    <string name="weather_settings_keyword">الطقس</string>
-    <string name="status_bar_show_weather_title">إظهار حالة الطقس</string>
-    <string name="status_bar_show_weather_summary">عرض درجة الحرارة الحالية على شريط الحالة</string>
     <string name="long_screen_settings_title">تطبيقات الشاشة الكاملة</string>
     <string name="long_screen_settings_summary">اجبِر التطبيقات القديمة على إستخدام نسبة العرض إلى الارتفاع على كامل الشاشة</string>
     <string name="long_screen_settings_no_apps">لا تطبيقات</string>
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index 43516e88..59015428 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -242,20 +242,6 @@
     <string name="wired_charging_sounds_title">Carga per cable</string>
     <string name="wireless_charging_sounds_title">Carga ensin filos</string>
     <string name="touchscreen_gesture_single_tap_title">Un toque</string>
-    <string name="weather_settings_title">Meteoroloxía</string>
-    <string name="weather_settings_no_services_prompt">Nun hai fornidores meteorolóxicos instalaos</string>
-    <string name="weather_settings_no_services_summary">Instala un fornidor metereolóxicu pa recibir anovamientos del clima</string>
-    <string name="weather_settings_button">Axustes del fornidor</string>
-    <string name="weather_settings_activity_not_found">Nun pue llanzase\'l menú d\'axustes d\'esti fornidor</string>
-    <string name="weather_settings_add_weather_provider">Amestar fornidor meteorolóxicu</string>
-    <string name="weather_settings_general_settings_title">Xeneral</string>
-    <string name="weather_settings_providers_title">Fornidores</string>
-    <string name="weather_settings_temp_units_title">Unidá de temperatura</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">meteoroloxía</string>
-    <string name="status_bar_show_weather_title">Amosar metereoloxía</string>
-    <string name="status_bar_show_weather_summary">Amuesa la temperatura actual na barra d\'estáu</string>
     <string name="touchscreen_gesture_action_do_nothing">Nun facer nada</string>
     <string name="touchscreen_gesture_action_ambient_display">Amosar la visualización d\'ambiente</string>
     <string name="trust_category_features">Estáu</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 4745da5a..b40d9126 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -457,20 +457,6 @@
     <string name="display_rotation_90_title">90 dərəcə</string>
     <string name="display_rotation_180_title">180 dərəcə</string>
     <string name="display_rotation_270_title">270 dərəcə</string>
-    <string name="weather_settings_title">Hava</string>
-    <string name="weather_settings_no_services_prompt">Quraşdırılmış hava xidməti təchizatçısı yoxdur</string>
-    <string name="weather_settings_no_services_summary">Hava məlumatı yeniləmələrini almaq üçün bir hava təchizatçısı quraşdırın</string>
-    <string name="weather_settings_button">Təchizatçı tənzimləmələri</string>
-    <string name="weather_settings_activity_not_found">Bu təchizatçının tənzimləmələr menyusu açıla bilmədi</string>
-    <string name="weather_settings_add_weather_provider">Hava təchizatçısı əlavə et</string>
-    <string name="weather_settings_general_settings_title">Ümumi</string>
-    <string name="weather_settings_providers_title">Təchizatçılar</string>
-    <string name="weather_settings_temp_units_title">Hərarət vahidi</string>
-    <string name="weather_settings_temp_celsius">Selsi</string>
-    <string name="weather_settings_temp_fahrenheit">Farenheyt</string>
-    <string name="weather_settings_keyword">hava</string>
-    <string name="status_bar_show_weather_title">Havanı göstər</string>
-    <string name="status_bar_show_weather_summary">Hazırki hərarəti vəziyyət sətrində göstər</string>
     <string name="long_screen_settings_title">Tam ekran tətbiqləri</string>
     <string name="long_screen_settings_summary">Köhnəlmiş tətbiqləri tam ekran rejimini istifadə etməyə məcbur edər</string>
     <string name="long_screen_settings_no_apps">Tətbiq yoxdur</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 456b9ad6..a0c9a3d5 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -362,12 +362,5 @@
     <string name="trust_onboarding_done">Зразумела</string>
     <string name="trust_restrict_usb_title">Абмежаваць USB</string>
     <string name="sms_security_check_limit_title">Абмежаванне паведамленняў SMS</string>
-    <string name="weather_settings_general_settings_title">Агульнае</string>
-    <string name="weather_settings_temp_units_title">Адзінкі тэмпературы</string>
-    <string name="weather_settings_temp_celsius">Цэльсій</string>
-    <string name="weather_settings_temp_fahrenheit">Фарэнгейт</string>
-    <string name="weather_settings_keyword">надвор\'е</string>
-    <string name="status_bar_show_weather_title">Паказваць надвор\'е</string>
-    <string name="status_bar_show_weather_summary">Паказваць надвор\'е ў радку стану</string>
     <string name="sms_security_check_limit_always_confirm">Заўсёды пацвярджаць</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 1731dbe0..54ba229a 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -433,20 +433,6 @@
     <string name="display_rotation_90_title">90 градуса</string>
     <string name="display_rotation_180_title">180 градуса</string>
     <string name="display_rotation_270_title">270 градуса</string>
-    <string name="weather_settings_title">Прогноза на времето</string>
-    <string name="weather_settings_no_services_prompt">Няма инсталиран доставчик на време</string>
-    <string name="weather_settings_no_services_summary">Инсталирайте на доставчик на време за да получавате актуализации за времето</string>
-    <string name="weather_settings_button">Настройки на доставчика</string>
-    <string name="weather_settings_activity_not_found">Неуспешно стартиране на меню \"Настройки\" на този доставчик</string>
-    <string name="weather_settings_add_weather_provider">Добавяне на доставчик</string>
-    <string name="weather_settings_general_settings_title">Общи</string>
-    <string name="weather_settings_providers_title">Доставчици</string>
-    <string name="weather_settings_temp_units_title">Температурни единици</string>
-    <string name="weather_settings_temp_celsius">Целзий</string>
-    <string name="weather_settings_temp_fahrenheit">Фаренхайт</string>
-    <string name="weather_settings_keyword">времето</string>
-    <string name="status_bar_show_weather_title">Покажи на времето</string>
-    <string name="status_bar_show_weather_summary">Покази текущата температура в лентата на състоянието</string>
     <string name="long_screen_settings_title">Приложения на цял екран</string>
     <string name="long_screen_settings_summary">Активираъ приложенията да използват пропорциите за цял екран</string>
     <string name="long_screen_settings_no_apps">Няма приложения</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 9aeaac3b..743bc552 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -455,20 +455,6 @@
     <string name="display_rotation_90_title">90 graus</string>
     <string name="display_rotation_180_title">180 graus</string>
     <string name="display_rotation_270_title">270 graus</string>
-    <string name="weather_settings_title">El temps</string>
-    <string name="weather_settings_no_services_prompt">No hi ha cap servei de proveïdor de temps instal·lat</string>
-    <string name="weather_settings_no_services_summary">Instal·la un proveïdor meteorològic per rebre actualitzacions del temps</string>
-    <string name="weather_settings_button">Configuració del proveïdor</string>
-    <string name="weather_settings_activity_not_found">No s\'ha pogut iniciar el menú de configuració d\'aquest proveïdor</string>
-    <string name="weather_settings_add_weather_provider">Afegeix proveïdor meteorològic</string>
-    <string name="weather_settings_general_settings_title">General</string>
-    <string name="weather_settings_providers_title">Proveïdors</string>
-    <string name="weather_settings_temp_units_title">Unitat de temperatura</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">el temps</string>
-    <string name="status_bar_show_weather_title">Mostrar el temps</string>
-    <string name="status_bar_show_weather_summary">Mostra la temperatura actual a la barra d\'estat</string>
     <string name="long_screen_settings_title">Aplicacions a pantalla completa</string>
     <string name="long_screen_settings_summary">Força les aplicacions heretades per utilitzar la relació d\'aspecte de pantalla completa</string>
     <string name="long_screen_settings_no_apps">Cap aplicació</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index f8e2991e..2fa87e83 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -455,20 +455,6 @@
     <string name="display_rotation_90_title">90°</string>
     <string name="display_rotation_180_title">180°</string>
     <string name="display_rotation_270_title">270°</string>
-    <string name="weather_settings_title">Počasí</string>
-    <string name="weather_settings_no_services_prompt">Nejsou nainstalovány žádné služby poskytovatele počasí</string>
-    <string name="weather_settings_no_services_summary">Pro získávání informací o počasí nainstalujte poskytovatele počasí</string>
-    <string name="weather_settings_button">Nastavení poskytovatele</string>
-    <string name="weather_settings_activity_not_found">Nelze spustit nastavení tohoto poskytovatele</string>
-    <string name="weather_settings_add_weather_provider">Přidat poskytovatele počasí</string>
-    <string name="weather_settings_general_settings_title">Hlavní</string>
-    <string name="weather_settings_providers_title">Poskytovatelé</string>
-    <string name="weather_settings_temp_units_title">Jednotky teploty</string>
-    <string name="weather_settings_temp_celsius">Celsia</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheita</string>
-    <string name="weather_settings_keyword">počasí</string>
-    <string name="status_bar_show_weather_title">Zobrazit počasí</string>
-    <string name="status_bar_show_weather_summary">Zobrazení aktuální teploty na stavovém řádku</string>
     <string name="long_screen_settings_title">Aplikace na celou obrazovku</string>
     <string name="long_screen_settings_summary">Přimět starší aplikace na použití poměrů na celou obrazovku</string>
     <string name="long_screen_settings_no_apps">Žádné aplikace</string>
diff --git a/res/values-cy/strings.xml b/res/values-cy/strings.xml
index 719478a8..0dcf73c1 100644
--- a/res/values-cy/strings.xml
+++ b/res/values-cy/strings.xml
@@ -448,20 +448,6 @@
     <string name="display_rotation_90_title">90 gradd</string>
     <string name="display_rotation_180_title">180 gradd</string>
     <string name="display_rotation_270_title">270 gradd</string>
-    <string name="weather_settings_title">Tywydd</string>
-    <string name="weather_settings_no_services_prompt">Does dim darparydd gwasanaethau tywydd wedi\'i osod</string>
-    <string name="weather_settings_no_services_summary">Gosoda ddarparydd tywydd er mwyn cael diweddariadau tywydd</string>
-    <string name="weather_settings_button">Gosodiadau\'r darparydd</string>
-    <string name="weather_settings_activity_not_found">Methwyd â lansio dewislen gosodiadau\'r darparydd hwn</string>
-    <string name="weather_settings_add_weather_provider">Ychwanegu darparydd tywydd</string>
-    <string name="weather_settings_general_settings_title">Cyffredinol</string>
-    <string name="weather_settings_providers_title">Darparyddion</string>
-    <string name="weather_settings_temp_units_title">Uned tymheredd</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">tywydd</string>
-    <string name="status_bar_show_weather_title">Dangos y tywydd</string>
-    <string name="status_bar_show_weather_summary">Dangos y tymheredd cyfredol ar y bar statws</string>
     <string name="long_screen_settings_title">Apiau sgrin lawn</string>
     <string name="long_screen_settings_summary">Gorfodi apiau cymyd i ddefnyddio cymhareb agwedd sgrin lawn</string>
     <string name="long_screen_settings_no_apps">Dim apiau</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index d4d42551..d63be77b 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -441,20 +441,6 @@
     <string name="display_rotation_90_title">90 grader</string>
     <string name="display_rotation_180_title">180 grader</string>
     <string name="display_rotation_270_title">270 grader</string>
-    <string name="weather_settings_title">Vejr</string>
-    <string name="weather_settings_no_services_prompt">Ingen vejrudbydertjenester er installeret</string>
-    <string name="weather_settings_no_services_summary">Installér en vejrudbyder for at modtage vejropdateringer</string>
-    <string name="weather_settings_button">Udbyderindstillinger</string>
-    <string name="weather_settings_activity_not_found">Kunne ikke åbne indstillingsmenuen for denne udbyder</string>
-    <string name="weather_settings_add_weather_provider">Tilføj vejrudbyder</string>
-    <string name="weather_settings_general_settings_title">Generelt</string>
-    <string name="weather_settings_providers_title">Udbydere</string>
-    <string name="weather_settings_temp_units_title">Temperaturenhed</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">vejr</string>
-    <string name="status_bar_show_weather_title">Vis vejr</string>
-    <string name="status_bar_show_weather_summary">Vis den aktuelle temperatur på statusbjælken</string>
     <string name="long_screen_settings_title">Fuldskærms-apps</string>
     <string name="charging_sounds_settings_title">Opladningslyde</string>
     <string name="charging_sounds_enable_title">Aktivér opladningslyde</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 3c368b63..a572f2d1 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -455,20 +455,6 @@
     <string name="display_rotation_90_title">90 Grad</string>
     <string name="display_rotation_180_title">180 Grad</string>
     <string name="display_rotation_270_title">270 Grad</string>
-    <string name="weather_settings_title">Wetter</string>
-    <string name="weather_settings_no_services_prompt">Keine Wetterdaten-Anbieter installiert</string>
-    <string name="weather_settings_no_services_summary">Installiere einen Wetterdatenanbieter, um Wetter-Aktualisierungen zu erhalten</string>
-    <string name="weather_settings_button">Anbieter-Einstellungen</string>
-    <string name="weather_settings_activity_not_found">Das Einstellungsmenü dieses Anbieters konnte nicht gestartet werden</string>
-    <string name="weather_settings_add_weather_provider">Wetterdatenanbieter hinzufügen</string>
-    <string name="weather_settings_general_settings_title">Allgemein</string>
-    <string name="weather_settings_providers_title">Anbieter</string>
-    <string name="weather_settings_temp_units_title">Temperatureinheit</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">Wetter</string>
-    <string name="status_bar_show_weather_title">Wetter anzeigen</string>
-    <string name="status_bar_show_weather_summary">Die aktuelle Temperatur in der Statusleiste anzeigen</string>
     <string name="long_screen_settings_title">Vollbild-Apps</string>
     <string name="long_screen_settings_summary">Ältere Anwendungen zu Vollbild zwingen</string>
     <string name="long_screen_settings_no_apps">Keine Apps</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index ba663e1f..db52634d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -459,20 +459,6 @@
     <string name="display_rotation_90_title">90 μοίρες</string>
     <string name="display_rotation_180_title">180 μοίρες</string>
     <string name="display_rotation_270_title">270 μοίρες</string>
-    <string name="weather_settings_title">Καιρός</string>
-    <string name="weather_settings_no_services_prompt">Δεν υπάρχουν εγκατεστημένοι πάροχοι καιρού</string>
-    <string name="weather_settings_no_services_summary">Εγκαταστήσετε έναν πάροχο καιρού για να λαμβάνετε ενημερώσεις καιρικών συνθηκών</string>
-    <string name="weather_settings_button">Ρυθμίσεις παρόχου</string>
-    <string name="weather_settings_activity_not_found">Δεν είναι δυνατό το άνοιγμα του μενού ρυθμίσεων αυτού του παρόχου</string>
-    <string name="weather_settings_add_weather_provider">Προσθήκη παρόχου καιρού</string>
-    <string name="weather_settings_general_settings_title">Γενικές</string>
-    <string name="weather_settings_providers_title">Πάροχοι</string>
-    <string name="weather_settings_temp_units_title">Μονάδα θερμοκρασίας</string>
-    <string name="weather_settings_temp_celsius">Κελσίου</string>
-    <string name="weather_settings_temp_fahrenheit">Φαρενάιτ</string>
-    <string name="weather_settings_keyword">καιρός</string>
-    <string name="status_bar_show_weather_title">Εμφάνιση καιρού</string>
-    <string name="status_bar_show_weather_summary">Εμφάνιση της τρέχουσας θερμοκρασίας στη γραμμή κατάστασης</string>
     <string name="long_screen_settings_title">Εφαρμογές πλήρους οθόνης</string>
     <string name="long_screen_settings_summary">Αναγκάστε τις εφαρμογές παλαιού τύπου να χρησιμοποιούν αναλογία διαστάσεων πλήρους οθόνης</string>
     <string name="long_screen_settings_no_apps">Δεν υπάρχουν εφαρμογές</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index d2be065f..69fcaa3e 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -457,20 +457,6 @@
     <string name="display_rotation_90_title">90 degrees</string>
     <string name="display_rotation_180_title">180 degrees</string>
     <string name="display_rotation_270_title">270 degrees</string>
-    <string name="weather_settings_title">Weather</string>
-    <string name="weather_settings_no_services_prompt">No weather provider services installed</string>
-    <string name="weather_settings_no_services_summary">Install a weather provider to receive weather updates</string>
-    <string name="weather_settings_button">Provider settings</string>
-    <string name="weather_settings_activity_not_found">Unable to launch the settings menu of this provider</string>
-    <string name="weather_settings_add_weather_provider">Add weather provider</string>
-    <string name="weather_settings_general_settings_title">General</string>
-    <string name="weather_settings_providers_title">Providers</string>
-    <string name="weather_settings_temp_units_title">Temperature unit</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">weather</string>
-    <string name="status_bar_show_weather_title">Show weather</string>
-    <string name="status_bar_show_weather_summary">Display the current temperature on the status bar</string>
     <string name="long_screen_settings_title">Full screen apps</string>
     <string name="long_screen_settings_summary">Force legacy apps to use full screen aspect ratio</string>
     <string name="long_screen_settings_no_apps">No apps</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 6bbb3103..2f330afe 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -457,20 +457,6 @@
     <string name="display_rotation_90_title">90 degrees</string>
     <string name="display_rotation_180_title">180 degrees</string>
     <string name="display_rotation_270_title">270 degrees</string>
-    <string name="weather_settings_title">Weather</string>
-    <string name="weather_settings_no_services_prompt">No weather provider services installed</string>
-    <string name="weather_settings_no_services_summary">Install a weather provider to receive weather updates</string>
-    <string name="weather_settings_button">Provider settings</string>
-    <string name="weather_settings_activity_not_found">Unable to launch the settings menu of this provider</string>
-    <string name="weather_settings_add_weather_provider">Add weather provider</string>
-    <string name="weather_settings_general_settings_title">General</string>
-    <string name="weather_settings_providers_title">Providers</string>
-    <string name="weather_settings_temp_units_title">Temperature unit</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">weather</string>
-    <string name="status_bar_show_weather_title">Show weather</string>
-    <string name="status_bar_show_weather_summary">Display the current temperature on the status bar</string>
     <string name="long_screen_settings_title">Full screen apps</string>
     <string name="long_screen_settings_summary">Force legacy apps to use full screen aspect ratio</string>
     <string name="long_screen_settings_no_apps">No apps</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index b3ecbf27..5e225888 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -457,20 +457,6 @@
     <string name="display_rotation_90_title">90 degrees</string>
     <string name="display_rotation_180_title">180 degrees</string>
     <string name="display_rotation_270_title">270 degrees</string>
-    <string name="weather_settings_title">Weather</string>
-    <string name="weather_settings_no_services_prompt">No weather provider services installed</string>
-    <string name="weather_settings_no_services_summary">Install a weather provider to receive weather updates</string>
-    <string name="weather_settings_button">Provider settings</string>
-    <string name="weather_settings_activity_not_found">Unable to launch the settings menu of this provider</string>
-    <string name="weather_settings_add_weather_provider">Add weather provider</string>
-    <string name="weather_settings_general_settings_title">General</string>
-    <string name="weather_settings_providers_title">Providers</string>
-    <string name="weather_settings_temp_units_title">Temperature unit</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">weather</string>
-    <string name="status_bar_show_weather_title">Show weather</string>
-    <string name="status_bar_show_weather_summary">Display the current temperature on the status bar</string>
     <string name="long_screen_settings_title">Full screen apps</string>
     <string name="long_screen_settings_summary">Force legacy apps to use full screen aspect ratio</string>
     <string name="long_screen_settings_no_apps">No apps</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 818a8b80..bb3dfc51 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -457,20 +457,6 @@
     <string name="display_rotation_90_title">90 degrees</string>
     <string name="display_rotation_180_title">180 degrees</string>
     <string name="display_rotation_270_title">270 degrees</string>
-    <string name="weather_settings_title">Weather</string>
-    <string name="weather_settings_no_services_prompt">No weather provider services installed</string>
-    <string name="weather_settings_no_services_summary">Install a weather provider to receive weather updates</string>
-    <string name="weather_settings_button">Provider settings</string>
-    <string name="weather_settings_activity_not_found">Unable to launch the settings menu of this provider</string>
-    <string name="weather_settings_add_weather_provider">Add weather provider</string>
-    <string name="weather_settings_general_settings_title">General</string>
-    <string name="weather_settings_providers_title">Providers</string>
-    <string name="weather_settings_temp_units_title">Temperature unit</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">weather</string>
-    <string name="status_bar_show_weather_title">Show weather</string>
-    <string name="status_bar_show_weather_summary">Display the current temperature on the status bar</string>
     <string name="long_screen_settings_title">Full screen apps</string>
     <string name="long_screen_settings_summary">Force legacy apps to use full screen aspect ratio</string>
     <string name="long_screen_settings_no_apps">No apps</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index f3df7141..1195acf3 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -412,20 +412,6 @@
     <string name="display_rotation_90_title">90 grados</string>
     <string name="display_rotation_180_title">180 grados</string>
     <string name="display_rotation_270_title">270 grados</string>
-    <string name="weather_settings_title">Clima</string>
-    <string name="weather_settings_no_services_prompt">Sin servicios de proveedores climáticos instalados</string>
-    <string name="weather_settings_no_services_summary">Instalar un proveedor climáticos para recibir información meteorológica</string>
-    <string name="weather_settings_button">Ajustes del proveedor</string>
-    <string name="weather_settings_activity_not_found">No se puede iniciar el menú de ajustes de este proveedor</string>
-    <string name="weather_settings_add_weather_provider">Añadir proveedor climático</string>
-    <string name="weather_settings_general_settings_title">General</string>
-    <string name="weather_settings_providers_title">Proveedores</string>
-    <string name="weather_settings_temp_units_title">Unidad de temperatura</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">clima</string>
-    <string name="status_bar_show_weather_title">Mostrar clima</string>
-    <string name="status_bar_show_weather_summary">Mostrar la temperatura actual en la barra de estado</string>
     <string name="long_screen_settings_title">Aplicaciones a pantalla completa</string>
     <string name="long_screen_settings_summary">Forzar a las aplicaciones antiguas, a utilizar la relación de aspecto a pantalla completa</string>
     <string name="long_screen_settings_no_apps">Sin aplicaciones</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index d9e5de74..9410617c 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -408,20 +408,6 @@
     <string name="display_rotation_180_title">180 grados</string>
     <string name="display_rotation_270_title">270 grados</string>
     <string name="long_screen_settings_no_apps">Sin aplicaciones</string>
-    <string name="weather_settings_title">Clima</string>
-    <string name="weather_settings_no_services_prompt">Sin servicios de proveedores de clima instalados</string>
-    <string name="weather_settings_no_services_summary">Instalar un proveedor de servicios climáticos para recibir información metorológica</string>
-    <string name="weather_settings_button">Ajustes del proveedor</string>
-    <string name="weather_settings_activity_not_found">No se puede iniciar el menú de ajustes de este proveedor</string>
-    <string name="weather_settings_add_weather_provider">Añadir proveedor del clima</string>
-    <string name="weather_settings_general_settings_title">General</string>
-    <string name="weather_settings_providers_title">Proveedores</string>
-    <string name="weather_settings_temp_units_title">Unidad de temperatura</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">clima</string>
-    <string name="status_bar_show_weather_title">Mostrar clima</string>
-    <string name="status_bar_show_weather_summary">Mostrar la temperatura actual en la barra de estado</string>
     <string name="charging_sounds_settings_title">Sonidos de carga del dispositivo</string>
     <string name="charging_sounds_summary">Reproducir un sonido al conectar o desconectar el cargador</string>
     <string name="power_notifications_vibrate_title">Vibración</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 4467bfb9..6e6aa5e1 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -430,20 +430,6 @@ andmete eelvaade.</string>
     <string name="display_rotation_90_title">90 kraadi</string>
     <string name="display_rotation_180_title">180 kraadi</string>
     <string name="display_rotation_270_title">270 kraadi</string>
-    <string name="weather_settings_title">Ilm</string>
-    <string name="weather_settings_no_services_prompt">Ilmapakkuja teenused pole installitud</string>
-    <string name="weather_settings_no_services_summary">Installi ilmapakkuja, et saada ilmateateid</string>
-    <string name="weather_settings_button">Pakkuja seaded</string>
-    <string name="weather_settings_activity_not_found">Selle pakkuja seadete menüü avamine ei õnnestunud</string>
-    <string name="weather_settings_add_weather_provider">Lisa ilmapakkuja</string>
-    <string name="weather_settings_general_settings_title">Üldine</string>
-    <string name="weather_settings_providers_title">Pakkujad</string>
-    <string name="weather_settings_temp_units_title">Temperatuuriühik</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">ilm</string>
-    <string name="status_bar_show_weather_title">Näita ilmateadet</string>
-    <string name="status_bar_show_weather_summary">Kuva olekuribal hetketemperatuuri</string>
     <string name="long_screen_settings_title">Täisekraanis rakendused</string>
     <string name="long_screen_settings_summary">Luba pärandrakendustel kasutada täielikku ekraani kuvasuhet</string>
     <string name="long_screen_settings_no_apps">Rakendusi pole</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index d6796088..aa8e3d2a 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -404,20 +404,6 @@ Informazio hau gailuaren abio bakoitzean bidaltzen da.\n\nBidalitako informazioa
     <string name="display_rotation_90_title">90 gradu</string>
     <string name="display_rotation_180_title">180 gradu</string>
     <string name="display_rotation_270_title">270 gradu</string>
-    <string name="weather_settings_title">Eguraldia</string>
-    <string name="weather_settings_no_services_prompt">Ez da eguraldi hornitzailerik instalatu</string>
-    <string name="weather_settings_no_services_summary">Instalatu eguraldi hornitzaile bat eguraldiaren informazio eguneratua jasotzeko</string>
-    <string name="weather_settings_button">Hornitzailearen ezarpenak</string>
-    <string name="weather_settings_activity_not_found">Ezin izan da hornitzaile honen ezarpen menua abiatu</string>
-    <string name="weather_settings_add_weather_provider">Gehitu eguraldi hornitzailea</string>
-    <string name="weather_settings_general_settings_title">Orokorra</string>
-    <string name="weather_settings_providers_title">Hornitzaileak</string>
-    <string name="weather_settings_temp_units_title">Tenperatura unitatea</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">eguraldia</string>
-    <string name="status_bar_show_weather_title">Erakutsi eguraldia</string>
-    <string name="status_bar_show_weather_summary">Bistaratu uneko tenperatura egoera-barran</string>
     <string name="long_screen_settings_title">Pantaila osoko aplikazioak</string>
     <string name="long_screen_settings_summary">Behartu aplikazio zaharrei pantaila osoko aspektu erlazioa errabiltzera</string>
     <string name="charging_sounds_settings_title">Kargatze-soinuak</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index f3b8cd0c..50025714 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -428,20 +428,6 @@
     <string name="display_rotation_90_title">90 astetta</string>
     <string name="display_rotation_180_title">180 astetta</string>
     <string name="display_rotation_270_title">270 astetta</string>
-    <string name="weather_settings_title">Sää</string>
-    <string name="weather_settings_no_services_prompt">Säätarjoajapalveluita ei asennettu</string>
-    <string name="weather_settings_no_services_summary">Asenna sääpalveluntarjoaja vastaanottaaksesi sääpäivityksiä</string>
-    <string name="weather_settings_button">Tarjoajan asetukset</string>
-    <string name="weather_settings_activity_not_found">Tämän palveluntarjoajan asetusvalikon avaaminen ei onnistu</string>
-    <string name="weather_settings_add_weather_provider">Lisää sääpalveluntarjoaja</string>
-    <string name="weather_settings_general_settings_title">Yleinen</string>
-    <string name="weather_settings_providers_title">Palveluntarjoajat</string>
-    <string name="weather_settings_temp_units_title">Lämpötilan yksikkö</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">sää weather</string>
-    <string name="status_bar_show_weather_title">Näytä sää</string>
-    <string name="status_bar_show_weather_summary">Näytä nykyinen lämpötila tilarivillä</string>
     <string name="long_screen_settings_title">Koko näytön sovellukset</string>
     <string name="long_screen_settings_summary">Pakota vanhat sovellukset käyttämään koko näytön suhdetta</string>
     <string name="long_screen_settings_no_apps">Ei sovelluksia</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 2d73ba59..c0ff3991 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -455,20 +455,6 @@
     <string name="display_rotation_90_title">90 degrés</string>
     <string name="display_rotation_180_title">180 degrés</string>
     <string name="display_rotation_270_title">270 degrés</string>
-    <string name="weather_settings_title">Météo</string>
-    <string name="weather_settings_no_services_prompt">Aucun fournisseur de services météorologiques installé</string>
-    <string name="weather_settings_no_services_summary">Installer un fournisseur de services météorologiques pour recevoir des bulletins météo</string>
-    <string name="weather_settings_button">Paramètres du fournisseur</string>
-    <string name="weather_settings_activity_not_found">Impossible d\'ouvrir le menu de configuration de ce fournisseur</string>
-    <string name="weather_settings_add_weather_provider">Ajouter un fournisseur de météo</string>
-    <string name="weather_settings_general_settings_title">Général</string>
-    <string name="weather_settings_providers_title">Fournisseurs</string>
-    <string name="weather_settings_temp_units_title">Unité de température</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">météo</string>
-    <string name="status_bar_show_weather_title">Afficher la météo</string>
-    <string name="status_bar_show_weather_summary">Afficher la température actuelle dans la barre d\'état</string>
     <string name="long_screen_settings_title">Applications en plein écran</string>
     <string name="long_screen_settings_summary">Forcer l\'affichage des anciennes applications en plein écran</string>
     <string name="long_screen_settings_no_apps">Aucune application</string>
diff --git a/res/values-fy-rNL/strings.xml b/res/values-fy-rNL/strings.xml
index acd43240..5944289a 100644
--- a/res/values-fy-rNL/strings.xml
+++ b/res/values-fy-rNL/strings.xml
@@ -406,20 +406,6 @@
     <string name="display_rotation_90_title">90 graden</string>
     <string name="display_rotation_180_title">180 graden</string>
     <string name="display_rotation_270_title">270 graden</string>
-    <string name="weather_settings_title">It waar</string>
-    <string name="weather_settings_no_services_prompt">Gjin waartsjinsten ynstallearre</string>
-    <string name="weather_settings_no_services_summary">Ynstallearje in waaroanbieder om waarfernijingen te ûntfangen</string>
-    <string name="weather_settings_button">Ynstellingen oanbieder</string>
-    <string name="weather_settings_activity_not_found">Kin ynstellingenmenu fan dizze oanbieder net iepenje</string>
-    <string name="weather_settings_add_weather_provider">Waaroanbieder tafoegje</string>
-    <string name="weather_settings_general_settings_title">Algemien</string>
-    <string name="weather_settings_providers_title">Oanbieders</string>
-    <string name="weather_settings_temp_units_title">Temperatuerienheid</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">it waar</string>
-    <string name="status_bar_show_weather_title">It waar toane</string>
-    <string name="status_bar_show_weather_summary">Aktuele temperatuer op de steatbalke toane</string>
     <string name="long_screen_settings_title">Folslein skerm apps</string>
     <string name="long_screen_settings_summary">Alde apps forsearje op folslein skerm</string>
     <string name="long_screen_settings_no_apps">Gjin apps</string>
diff --git a/res/values-gd/strings.xml b/res/values-gd/strings.xml
index a6fee03f..2d9b0191 100644
--- a/res/values-gd/strings.xml
+++ b/res/values-gd/strings.xml
@@ -435,20 +435,6 @@
     <string name="display_rotation_90_title">90 ceum</string>
     <string name="display_rotation_180_title">180 ceum</string>
     <string name="display_rotation_270_title">270 ceum</string>
-    <string name="weather_settings_title">An aimsir</string>
-    <string name="weather_settings_no_services_prompt">Cha deach seirbheis solaraiche aimsire a stàladh</string>
-    <string name="weather_settings_no_services_summary">Stàlaich solaraiche aimsire airson naidheachd na h-aimsire fhaighinn</string>
-    <string name="weather_settings_button">Roghainnean an t-solaraiche</string>
-    <string name="weather_settings_activity_not_found">Cha deach leinn clàr-taice nan roghainnean a chur gu dol airson an t-solaraiche seo</string>
-    <string name="weather_settings_add_weather_provider">Cuir solaraiche aimsire ris</string>
-    <string name="weather_settings_general_settings_title">Coitcheann</string>
-    <string name="weather_settings_providers_title">Solaraichean</string>
-    <string name="weather_settings_temp_units_title">Aonad na teothachd</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">aimsir</string>
-    <string name="status_bar_show_weather_title">Seall an aimsir</string>
-    <string name="status_bar_show_weather_summary">Seall an teothachd làithreach air bàr na staid</string>
     <string name="long_screen_settings_title">Aplacaidean làn-sgrìn</string>
     <string name="long_screen_settings_summary">Spàrr air aplacaidean dìleabach gun cleachd iad co-mheas deilbh na làn-sgrìn</string>
     <string name="long_screen_settings_no_apps">Chan eil aplacaid ann</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index d612fdda..36451ac0 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -434,20 +434,6 @@
     <string name="display_rotation_90_title">90 graos</string>
     <string name="display_rotation_180_title">180 graos</string>
     <string name="display_rotation_270_title">270 graos</string>
-    <string name="weather_settings_title">Tempo</string>
-    <string name="weather_settings_no_services_prompt">Non instalouse ningun probeedor do tempo</string>
-    <string name="weather_settings_no_services_summary">Instalar un proveedor do clima para recibir actualizacións do tempo</string>
-    <string name="weather_settings_button">Axustes do fornecedor</string>
-    <string name="weather_settings_activity_not_found">Non se puido iniciar o menú de configuración deste provedor</string>
-    <string name="weather_settings_add_weather_provider">Engadir fornecedor de clima</string>
-    <string name="weather_settings_general_settings_title">Xeral</string>
-    <string name="weather_settings_providers_title">Fornecedores</string>
-    <string name="weather_settings_temp_units_title">Unidade de temperatura</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">clima</string>
-    <string name="status_bar_show_weather_title">Amosar o tempo</string>
-    <string name="status_bar_show_weather_summary">Mostrar a temperatura actual na barra de estado</string>
     <string name="long_screen_settings_title">Aplicacións a pantalla completa</string>
     <string name="long_screen_settings_summary">Forzar as aplicacións herdadas a empregar as proporcións da pantalla completa</string>
     <string name="long_screen_settings_no_apps">Ningunha aplicación</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 143ec7ee..f48321ee 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -412,20 +412,6 @@
     <string name="display_rotation_90_title">90 stupnjeva</string>
     <string name="display_rotation_180_title">180 stupnjeva</string>
     <string name="display_rotation_270_title">270 stupnjeva</string>
-    <string name="weather_settings_title">Vrijeme</string>
-    <string name="weather_settings_no_services_prompt">Nema instaliranih usluga davatelja vremenske prognoze</string>
-    <string name="weather_settings_no_services_summary">Instalirajte davatelja vremenske prognoze za primanje ažuriranja vremenske prognoze</string>
-    <string name="weather_settings_button">Postavke davatelja</string>
-    <string name="weather_settings_activity_not_found">Nije moguće otvoriti izbornik postavki ovog davatelja usluga</string>
-    <string name="weather_settings_add_weather_provider">Dodaj pružatelja vremenske prognoze</string>
-    <string name="weather_settings_general_settings_title">Općenito</string>
-    <string name="weather_settings_providers_title">Pružatelji</string>
-    <string name="weather_settings_temp_units_title">Jedinica temperature</string>
-    <string name="weather_settings_temp_celsius">Celzij</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">vrijeme</string>
-    <string name="status_bar_show_weather_title">Pokaži prognozu</string>
-    <string name="status_bar_show_weather_summary">Prikaži trenutnu temperaturu na traci statusa</string>
     <string name="charging_sounds_settings_title">Zvukovi punjenja</string>
     <string name="charging_sounds_summary">Reproducirat će zvuk pri spajanju ili odspajanju s izvora napajanja</string>
     <string name="power_notifications_vibrate_title">Vibracija</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 39e84d6d..ae79631b 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -441,20 +441,6 @@
     <string name="display_rotation_90_title">90 fok</string>
     <string name="display_rotation_180_title">180 fok</string>
     <string name="display_rotation_270_title">270 fok</string>
-    <string name="weather_settings_title">Időjárás</string>
-    <string name="weather_settings_no_services_prompt">Nincs telepítve Időjárás szolgáltató</string>
-    <string name="weather_settings_no_services_summary">Telepítsen egy időjárás-szolgáltatót az időjárási frissítésekért</string>
-    <string name="weather_settings_button">Szolgáltató beállítások</string>
-    <string name="weather_settings_activity_not_found">Ezen szolgáltató beállítások menüje nem indítható</string>
-    <string name="weather_settings_add_weather_provider">Időjárás szolgáltató felvétele</string>
-    <string name="weather_settings_general_settings_title">Általános</string>
-    <string name="weather_settings_providers_title">Szolgáltatók</string>
-    <string name="weather_settings_temp_units_title">Hőmérsékleti egység</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">időjárás</string>
-    <string name="status_bar_show_weather_title">Időjárás megjelenítése</string>
-    <string name="status_bar_show_weather_summary">Aktuális hőmérséklet megjelenítése az állapotsoron</string>
     <string name="long_screen_settings_title">Teljesképernyős alkalmazások</string>
     <string name="long_screen_settings_summary">Régi alkalmazások kényszerítése, hogy a teljes képernyőt használják</string>
     <string name="long_screen_settings_no_apps">Nincsenek alkalmazások</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index a77f7e43..47a99c1a 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -434,20 +434,6 @@
     <string name="display_rotation_90_title">90 derajat</string>
     <string name="display_rotation_180_title">180 derajat</string>
     <string name="display_rotation_270_title">270 derajat</string>
-    <string name="weather_settings_title">Cuaca</string>
-    <string name="weather_settings_no_services_prompt">Tidak ada layanan penyedia cuaca terpasang</string>
-    <string name="weather_settings_no_services_summary">Pasang penyedia cuaca untuk menerima pembaruan cuaca</string>
-    <string name="weather_settings_button">Pengaturan penyedia</string>
-    <string name="weather_settings_activity_not_found">Tidak dapat membuka menu pengaturan untuk penyedia ini</string>
-    <string name="weather_settings_add_weather_provider">Tambah penyedia cuaca</string>
-    <string name="weather_settings_general_settings_title">Umum</string>
-    <string name="weather_settings_providers_title">Penyedia</string>
-    <string name="weather_settings_temp_units_title">Satuan temperatur</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">cuaca</string>
-    <string name="status_bar_show_weather_title">Tampilkan cuaca</string>
-    <string name="status_bar_show_weather_summary">Tampilkan suhu sekarang pada status bar</string>
     <string name="long_screen_settings_title">Aplikasi layar penuh</string>
     <string name="long_screen_settings_summary">Paksa aplikasi lawas untuk menggunakan rasio aspek layar penuh</string>
     <string name="long_screen_settings_no_apps">Tidak ada aplikasi</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index c7d1bac9..05a03993 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -455,20 +455,6 @@
     <string name="display_rotation_90_title">90 gradi</string>
     <string name="display_rotation_180_title">180 gradi</string>
     <string name="display_rotation_270_title">270 gradi</string>
-    <string name="weather_settings_title">Meteo</string>
-    <string name="weather_settings_no_services_prompt">Nessun provider meteo installato</string>
-    <string name="weather_settings_no_services_summary">Installa un provider meteo per ricevere aggiornamenti sul meteo</string>
-    <string name="weather_settings_button">Impostazioni provider</string>
-    <string name="weather_settings_activity_not_found">Impossibile aprire il menu d\'impostazioni di questo provider</string>
-    <string name="weather_settings_add_weather_provider">Aggiungi provider meteo</string>
-    <string name="weather_settings_general_settings_title">Generali</string>
-    <string name="weather_settings_providers_title">Provider</string>
-    <string name="weather_settings_temp_units_title">Unità temperatura</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">meteo</string>
-    <string name="status_bar_show_weather_title">Mostra meteo</string>
-    <string name="status_bar_show_weather_summary">Mostra la temperatura corrente nella barra di stato</string>
     <string name="long_screen_settings_title">App a schermo intero</string>
     <string name="long_screen_settings_summary">Forza le app ad utilizzare lo schermo intero</string>
     <string name="long_screen_settings_no_apps">Nessuna app</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 519a3666..422d20a4 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -400,20 +400,6 @@
     <string name="display_rotation_90_title">90 מעלות</string>
     <string name="display_rotation_180_title">180 מעלות</string>
     <string name="display_rotation_270_title">270 מעלות</string>
-    <string name="weather_settings_title">תחזית</string>
-    <string name="weather_settings_no_services_prompt">לא מותקנים שירותי ספקי תחזית</string>
-    <string name="weather_settings_no_services_summary">התקן ספק תחזית בכדי לקבל עדכוני מזג האוויר</string>
-    <string name="weather_settings_button">הגדרות ספק</string>
-    <string name="weather_settings_activity_not_found">לא ניתן להפעיל את תפריט ההגדרות של ספק זה</string>
-    <string name="weather_settings_add_weather_provider">הוסף ספק מזג אוויר</string>
-    <string name="weather_settings_general_settings_title">כללי</string>
-    <string name="weather_settings_providers_title">ספקים</string>
-    <string name="weather_settings_temp_units_title">יחידת טמפרטורה</string>
-    <string name="weather_settings_temp_celsius">צלזיוס</string>
-    <string name="weather_settings_temp_fahrenheit">פרנהייט</string>
-    <string name="weather_settings_keyword">תחזית</string>
-    <string name="status_bar_show_weather_title">הראה תחזית</string>
-    <string name="status_bar_show_weather_summary">הצג את הטמפרטורה הנוכחית בשורת המצב</string>
     <string name="long_screen_settings_title">יישומים במסך מלא</string>
     <string name="long_screen_settings_summary">אכוף יישומים ישנים להמתח במסך מלא</string>
     <string name="charging_sounds_settings_title">צלילי טעינה</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 3b442c4e..7ac51d70 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -455,20 +455,6 @@
     <string name="display_rotation_90_title">90度</string>
     <string name="display_rotation_180_title">180度</string>
     <string name="display_rotation_270_title">270度</string>
-    <string name="weather_settings_title">天気</string>
-    <string name="weather_settings_no_services_prompt">天気プロバイダサービスがインストールされていません</string>
-    <string name="weather_settings_no_services_summary">天気の更新を受け取るには天気プロバイダをインストールしてください</string>
-    <string name="weather_settings_button">プロバイダの設定</string>
-    <string name="weather_settings_activity_not_found">このプロバイダの設定メニューを起動できませんでした</string>
-    <string name="weather_settings_add_weather_provider">天気プロバイダを追加</string>
-    <string name="weather_settings_general_settings_title">全般</string>
-    <string name="weather_settings_providers_title">プロバイダ</string>
-    <string name="weather_settings_temp_units_title">温度の単位</string>
-    <string name="weather_settings_temp_celsius">摂氏</string>
-    <string name="weather_settings_temp_fahrenheit">華氏</string>
-    <string name="weather_settings_keyword">天気</string>
-    <string name="status_bar_show_weather_title">気温を表示</string>
-    <string name="status_bar_show_weather_summary">ステータスバーに現在の気温を表示する</string>
     <string name="long_screen_settings_title">全画面表示のアプリ</string>
     <string name="long_screen_settings_summary">従来のアプリに全画面表示のアスペクト比を使用させる</string>
     <string name="long_screen_settings_no_apps">なし</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index f96c3e22..73d6e76e 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -397,20 +397,6 @@
     <string name="display_rotation_90_title">೯೦ ಡಿಗ್ರಿಗಳು</string>
     <string name="display_rotation_180_title">೧೮೦ ಡಿಗ್ರಿಗಳು</string>
     <string name="display_rotation_270_title">೨೭೦ ಡಿಗ್ರಿಗಳು</string>
-    <string name="weather_settings_title">ಹವಾಮಾನ</string>
-    <string name="weather_settings_no_services_prompt">ಹವಾಮಾನ ಪರಿಚಾರಕ ಸೇವೆಗಳನ್ನು ಸ್ಥಾಪಿಸಲಾಗಿಲ್ಲ</string>
-    <string name="weather_settings_no_services_summary">ಹವಾಮಾನ ವರದಿಗಳನ್ನು ಪಡೆಯಲು ಹವಾಮಾನ ಪರಿಚಾರಕವನ್ನು ಸ್ಥಾಪಿಸು</string>
-    <string name="weather_settings_button">ಪೂರೈಕೆದಾರ ಅಳವಡಿಕೆಗಳು</string>
-    <string name="weather_settings_activity_not_found">ಈ ಪರಿಚಾರಕದ ಅಳವಡಿಕೆ ಪಟ್ಟಿಯನ್ನು ತೆರೆಯಲಾಗುತ್ತಿಲ್ಲ</string>
-    <string name="weather_settings_add_weather_provider">ಹವಾಮಾನ ಪರಿಚಾರಕವನ್ನು ಸೇರಿಸು</string>
-    <string name="weather_settings_general_settings_title">ಸಾಮಾನ್ಯ</string>
-    <string name="weather_settings_providers_title">ಪೂರೈಕೆದಾರರು</string>
-    <string name="weather_settings_temp_units_title">ತಾಪಮಾನದ ಘಟಕ</string>
-    <string name="weather_settings_temp_celsius">ಸೆಲ್ಸಿಯಸ್</string>
-    <string name="weather_settings_temp_fahrenheit">ಫ್ಯಾರನ್ಹೀಟ್</string>
-    <string name="weather_settings_keyword">ಹವಾಮಾನ</string>
-    <string name="status_bar_show_weather_title">ಹವಾಮಾನ ತೋರಿಸು</string>
-    <string name="status_bar_show_weather_summary">ಪ್ರಸ್ತುತ ತಾಪಮಾನವನ್ನು ಸ್ಥಿತಿ ಪಟ್ಟಿ ಮೇಲೆ ಪ್ರದರ್ಶಿಸು</string>
     <string name="long_screen_settings_title">ಪೂರ್ಣ ಪರದೆಯ ಆಪ್ಗಳು</string>
     <string name="long_screen_settings_summary">ಪೂರ್ವಾರ್ಜಿತ ಆಪ್ಗಳಿಗೆ ಪೂರ್ಣ ಪರದೆ ಅನುಪಾತವನ್ನು ಬಳಸಲು ಒತ್ತಾಯಿಸು</string>
     <string name="charging_sounds_settings_title">ತುಂಬುಕ ಶಬ್ಧಗಳು</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 47d2a42e..cee43b2b 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -455,20 +455,6 @@
     <string name="display_rotation_90_title">90도</string>
     <string name="display_rotation_180_title">180도</string>
     <string name="display_rotation_270_title">270도</string>
-    <string name="weather_settings_title">날씨</string>
-    <string name="weather_settings_no_services_prompt">날씨 공급자 서비스 설치되지 않음</string>
-    <string name="weather_settings_no_services_summary">날씨 정보를 받으려면 날씨 공급자를 설치하세요</string>
-    <string name="weather_settings_button">날씨 공급자 설정</string>
-    <string name="weather_settings_activity_not_found">이 날씨 공급자의 설정 메뉴를 열 수 없습니다</string>
-    <string name="weather_settings_add_weather_provider">날씨 공급자 추가</string>
-    <string name="weather_settings_general_settings_title">일반</string>
-    <string name="weather_settings_providers_title">공급자</string>
-    <string name="weather_settings_temp_units_title">온도 단위</string>
-    <string name="weather_settings_temp_celsius">섭씨</string>
-    <string name="weather_settings_temp_fahrenheit">화씨</string>
-    <string name="weather_settings_keyword">날씨</string>
-    <string name="status_bar_show_weather_title">날씨 표시</string>
-    <string name="status_bar_show_weather_summary">상태 표시줄에 현재 온도 표시</string>
     <string name="long_screen_settings_title">전체 화면 앱</string>
     <string name="long_screen_settings_summary">레거시 앱에서 전체 화면 가로 세로 비율 강제 사용</string>
     <string name="long_screen_settings_no_apps">앱 없음</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 67d00458..3fc016a6 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -370,20 +370,6 @@
     <string name="display_rotation_90_title">90 степени</string>
     <string name="display_rotation_180_title">180 степени</string>
     <string name="display_rotation_270_title">270 степени</string>
-    <string name="weather_settings_title">Време</string>
-    <string name="weather_settings_no_services_prompt">Не се инсталирани услуги за временски прогнози</string>
-    <string name="weather_settings_no_services_summary">Инсталирајте временски провајдер за да добивате ажурирања на временските прогнози</string>
-    <string name="weather_settings_button">Поставувања на провајдерот</string>
-    <string name="weather_settings_activity_not_found">Не може да се подигне менито за поставувања на овој провајдер</string>
-    <string name="weather_settings_add_weather_provider">Додај временски провајдер</string>
-    <string name="weather_settings_general_settings_title">Општо</string>
-    <string name="weather_settings_providers_title">Провајдери</string>
-    <string name="weather_settings_temp_units_title">Единица за температура</string>
-    <string name="weather_settings_temp_celsius">Целзиус</string>
-    <string name="weather_settings_temp_fahrenheit">Фаренхајт</string>
-    <string name="weather_settings_keyword">време</string>
-    <string name="status_bar_show_weather_title">Покажи го времето</string>
-    <string name="status_bar_show_weather_summary">Прикажете ја моменталната температура на статусната лента</string>
     <string name="charging_sounds_settings_title">Звуци за полнење</string>
     <string name="charging_sounds_summary">Репродуцирај звук при поврзување или исклучување на извор на енергија</string>
     <string name="power_notifications_vibrate_title">Вибрација</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 08f477a7..2a8c86f9 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -370,20 +370,6 @@
     <string name="display_rotation_90_title">90 grader</string>
     <string name="display_rotation_180_title">180 grader</string>
     <string name="display_rotation_270_title">270 grader</string>
-    <string name="weather_settings_title">Vær</string>
-    <string name="weather_settings_no_services_prompt">Ingen værleverandør tjeneste installert</string>
-    <string name="weather_settings_no_services_summary">Installer en værleverandør for å motta væroppdateringer</string>
-    <string name="weather_settings_button">Leverandørinnstillinger</string>
-    <string name="weather_settings_activity_not_found">Kan ikke starte innstillingsmenyen for denne leverandøren</string>
-    <string name="weather_settings_add_weather_provider">Legg til værleverandør</string>
-    <string name="weather_settings_general_settings_title">Generelt</string>
-    <string name="weather_settings_providers_title">Leverandører</string>
-    <string name="weather_settings_temp_units_title">Temperaturenhet</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">vær</string>
-    <string name="status_bar_show_weather_title">Vis været</string>
-    <string name="status_bar_show_weather_summary">Vise gjeldende temperatur på statuslinjen</string>
     <string name="charging_sounds_settings_title">Lade-lyder</string>
     <string name="charging_sounds_summary">Spill av en lyd når du kobler til eller fra en strømkilde</string>
     <string name="power_notifications_vibrate_title">Vibrer</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 666a882f..80a80373 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -458,20 +458,6 @@
     <string name="long_screen_settings_title">Volledig scherm apps</string>
     <string name="long_screen_settings_summary">Oude apps forceren op volledig scherm</string>
     <string name="long_screen_settings_no_apps">Geen apps</string>
-    <string name="weather_settings_title">Weer</string>
-    <string name="weather_settings_no_services_prompt">Geen weeraanbiederservices geïnstalleerd</string>
-    <string name="weather_settings_no_services_summary">Installeer een weeraanbieder om weer-updates te ontvangen</string>
-    <string name="weather_settings_button">Instellingen aanbieder</string>
-    <string name="weather_settings_activity_not_found">Kan instellingenmenu van deze aanbieder niet openen</string>
-    <string name="weather_settings_add_weather_provider">Weeraanbieder toevoegen</string>
-    <string name="weather_settings_general_settings_title">Algemeen</string>
-    <string name="weather_settings_providers_title">Aanbieders</string>
-    <string name="weather_settings_temp_units_title">Eenheid temperatuur</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">weer</string>
-    <string name="status_bar_show_weather_title">Weer weergeven</string>
-    <string name="status_bar_show_weather_summary">Huidige temperatuur op de statusbalk weergeven</string>
     <string name="charging_sounds_settings_title">Opladergeluid</string>
     <string name="charging_sounds_enable_title">Oplaadgeluid inschakelen</string>
     <string name="charging_sounds_summary">Geluid afspelen bij het aansluiten of loskoppelen van een lader</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index eda27a9f..9f2935f5 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -457,20 +457,6 @@
     <string name="display_rotation_90_title">90 stopni</string>
     <string name="display_rotation_180_title">180 stopni</string>
     <string name="display_rotation_270_title">270 stopni</string>
-    <string name="weather_settings_title">Pogoda</string>
-    <string name="weather_settings_no_services_prompt">Nie zainstalowano usług dostawcy pogody</string>
-    <string name="weather_settings_no_services_summary">Zainstaluj dostawcę usługi pogody, aby otrzymywać informacje pogodowe</string>
-    <string name="weather_settings_button">Ustawienia dostawcy</string>
-    <string name="weather_settings_activity_not_found">Nie można uruchomić menu ustawień tego dostawcy</string>
-    <string name="weather_settings_add_weather_provider">Dodaj dostawcę pogody</string>
-    <string name="weather_settings_general_settings_title">Ogólne</string>
-    <string name="weather_settings_providers_title">Dostawcy</string>
-    <string name="weather_settings_temp_units_title">Jednostka temperatury</string>
-    <string name="weather_settings_temp_celsius">Stopnie Celsjusza</string>
-    <string name="weather_settings_temp_fahrenheit">Stopnie Fahrenheita</string>
-    <string name="weather_settings_keyword">pogoda</string>
-    <string name="status_bar_show_weather_title">Pokaż pogodę</string>
-    <string name="status_bar_show_weather_summary">Wyświetlanie aktualnej temperatury na pasku stanu</string>
     <string name="long_screen_settings_title">Aplikacje pełnoekranowe</string>
     <string name="long_screen_settings_summary">Wymuś na starszych aplikacjach korzystanie z pełnych proporcji ekranu</string>
     <string name="long_screen_settings_no_apps">Brak aplikacji</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 8ae57ebf..2c3757fc 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -419,20 +419,6 @@
     <string name="display_rotation_90_title">90 graus</string>
     <string name="display_rotation_180_title">180 graus</string>
     <string name="display_rotation_270_title">270 graus</string>
-    <string name="weather_settings_title">Previsão do tempo</string>
-    <string name="weather_settings_no_services_prompt">Não há provedor de previsão do tempo instalado</string>
-    <string name="weather_settings_no_services_summary">Instale um provedor de previsão do tempo para receber atualizações meteorológicas</string>
-    <string name="weather_settings_button">Configurações do provedor</string>
-    <string name="weather_settings_activity_not_found">Não foi possível iniciar o menu de configurações deste provedor</string>
-    <string name="weather_settings_add_weather_provider">Adicionar provedor de previsão do tempo</string>
-    <string name="weather_settings_general_settings_title">Geral</string>
-    <string name="weather_settings_providers_title">Provedores</string>
-    <string name="weather_settings_temp_units_title">Unidade de temperatura</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">previsão do tempo</string>
-    <string name="status_bar_show_weather_title">Mostrar previsão do tempo</string>
-    <string name="status_bar_show_weather_summary">Exibir a temperatura atual na barra de status</string>
     <string name="long_screen_settings_title">Aplicativos em tela cheia</string>
     <string name="long_screen_settings_summary">Forçar os aplicativos preexistentes a utilizarem a proporção em tela cheia</string>
     <string name="long_screen_settings_no_apps">Nenhum aplicativo</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index afad95e6..fe3ddc30 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -441,20 +441,6 @@
     <string name="display_rotation_90_title">90 graus</string>
     <string name="display_rotation_180_title">180 graus</string>
     <string name="display_rotation_270_title">270 graus</string>
-    <string name="weather_settings_title">Meteorologia</string>
-    <string name="weather_settings_no_services_prompt">Não há serviços de fornecedor de meteorologia instalados</string>
-    <string name="weather_settings_no_services_summary">Instale um fornecedor de meteorologia para receber atualizações meteorológicas</string>
-    <string name="weather_settings_button">Definições do fornecedor</string>
-    <string name="weather_settings_activity_not_found">Não é possível iniciar o menu de definições deste fornecedor</string>
-    <string name="weather_settings_add_weather_provider">Adicionar fornecedor de meteorologia</string>
-    <string name="weather_settings_general_settings_title">Gerais</string>
-    <string name="weather_settings_providers_title">Fornecedores</string>
-    <string name="weather_settings_temp_units_title">Unidade de temperatura</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">meteorologia</string>
-    <string name="status_bar_show_weather_title">Mostrar meteorologia</string>
-    <string name="status_bar_show_weather_summary">Mostrar a temperatura atual na barra de estado</string>
     <string name="long_screen_settings_title">Aplicações em ecrã inteiro</string>
     <string name="long_screen_settings_summary">Forçar aplicações legadas a usarem a proporção de apresentação do ecrã inteiro</string>
     <string name="long_screen_settings_no_apps">Sem aplicações</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 41c1bff1..fd257fda 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -457,20 +457,6 @@
     <string name="display_rotation_90_title">90 de grade</string>
     <string name="display_rotation_180_title">180 de grade</string>
     <string name="display_rotation_270_title">270 de grade</string>
-    <string name="weather_settings_title">Vremea</string>
-    <string name="weather_settings_no_services_prompt">Niciun serviciu furnizor de vreme instalat</string>
-    <string name="weather_settings_no_services_summary">Instalaţi un furnizor de vreme pentru a primi actualizări despre vreme</string>
-    <string name="weather_settings_button">Setări furnizor</string>
-    <string name="weather_settings_activity_not_found">Imposibil de a lansa meniul de setări pentru acest furnizor</string>
-    <string name="weather_settings_add_weather_provider">Adăugați un furnizor de vreme</string>
-    <string name="weather_settings_general_settings_title">General</string>
-    <string name="weather_settings_providers_title">Furnizori</string>
-    <string name="weather_settings_temp_units_title">Unitate de temperatură</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">vreme</string>
-    <string name="status_bar_show_weather_title">Arată vremea</string>
-    <string name="status_bar_show_weather_summary">Afișează temperatura actuală pe bara de stare</string>
     <string name="long_screen_settings_title">Aplicații ecran complet</string>
     <string name="long_screen_settings_summary">Forțează aplicațiile vechi să utilizeze ecranul complet</string>
     <string name="long_screen_settings_no_apps">Nicio aplicație</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 44c439c0..660276a1 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -455,20 +455,6 @@
     <string name="display_rotation_90_title">90 градусов</string>
     <string name="display_rotation_180_title">180 градусов</string>
     <string name="display_rotation_270_title">270 градусов</string>
-    <string name="weather_settings_title">Погода</string>
-    <string name="weather_settings_no_services_prompt">Нет установленных служб поставщиков погоды</string>
-    <string name="weather_settings_no_services_summary">Установите службу поставщика погоды, чтобы получать обновления погоды</string>
-    <string name="weather_settings_button">Настройки поставщика</string>
-    <string name="weather_settings_activity_not_found">Не удается запустить меню настройки этого поставщика</string>
-    <string name="weather_settings_add_weather_provider">Добавить поставщика погоды</string>
-    <string name="weather_settings_general_settings_title">Общие</string>
-    <string name="weather_settings_providers_title">Поставщики</string>
-    <string name="weather_settings_temp_units_title">Единицы измерения температуры</string>
-    <string name="weather_settings_temp_celsius">Градус Цельсия</string>
-    <string name="weather_settings_temp_fahrenheit">Градус Фаренгейта</string>
-    <string name="weather_settings_keyword">погода</string>
-    <string name="status_bar_show_weather_title">Показать погоду</string>
-    <string name="status_bar_show_weather_summary">Отображение текущей погоды в строке состояния</string>
     <string name="long_screen_settings_title">Полноэкранные приложения</string>
     <string name="long_screen_settings_summary">Принудительное использование полноэкранного режима устаревшими приложениями</string>
     <string name="long_screen_settings_no_apps">Нет приложений</string>
diff --git a/res/values-sc-rIT/strings.xml b/res/values-sc-rIT/strings.xml
index a8fb8e63..30317e71 100644
--- a/res/values-sc-rIT/strings.xml
+++ b/res/values-sc-rIT/strings.xml
@@ -103,6 +103,5 @@
     <string name="display_rotation_90_title">90 grados</string>
     <string name="display_rotation_180_title">180 grados</string>
     <string name="display_rotation_270_title">270 grados</string>
-    <string name="weather_settings_general_settings_title">Generales</string>
     <string name="power_notifications_vibrate_title">Vibratzione</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 1f4d84c0..f58d5392 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -428,20 +428,6 @@
     <string name="display_rotation_90_title">90 stupňov</string>
     <string name="display_rotation_180_title">180 stupňov</string>
     <string name="display_rotation_270_title">270 stupňov</string>
-    <string name="weather_settings_title">Počasie</string>
-    <string name="weather_settings_no_services_prompt">Žiadne nainštalované služby poskytovateľa počasia</string>
-    <string name="weather_settings_no_services_summary">Nainštalovať poskytovateľa počasia pre príjem predpovede počasia</string>
-    <string name="weather_settings_button">Nastavenia poskytovateľa</string>
-    <string name="weather_settings_activity_not_found">Nepodarilo sa spustiť ponuku nastavení toto poskytovateľa</string>
-    <string name="weather_settings_add_weather_provider">Pridať poskytovateľa počasia</string>
-    <string name="weather_settings_general_settings_title">Všeobecné</string>
-    <string name="weather_settings_providers_title">Poskytovatelia</string>
-    <string name="weather_settings_temp_units_title">Jednotky teploty</string>
-    <string name="weather_settings_temp_celsius">Celzia</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheita</string>
-    <string name="weather_settings_keyword">počasie</string>
-    <string name="status_bar_show_weather_title">Zobraziť počasie</string>
-    <string name="status_bar_show_weather_summary">Zobrazovať aktuálnu teplotu v stavovom riadku</string>
     <string name="long_screen_settings_title">Aplikácie na celú obrazovku</string>
     <string name="long_screen_settings_summary">Prinútiť staršie aplikácie na použitie pomerov na celú obrazovku</string>
     <string name="long_screen_settings_no_apps">Žiadne aplikácie</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index d3632c25..51eeebf8 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -457,20 +457,6 @@
     <string name="display_rotation_90_title">90 stopinj</string>
     <string name="display_rotation_180_title">180 stopinj</string>
     <string name="display_rotation_270_title">270 stopinj</string>
-    <string name="weather_settings_title">Vreme</string>
-    <string name="weather_settings_no_services_prompt">Ni nameščene storitve ponudnika vremena</string>
-    <string name="weather_settings_no_services_summary">Namestite ponudnika vremena, da boste prejemali vremenske posodobitve</string>
-    <string name="weather_settings_button">Nastavitve ponudnika</string>
-    <string name="weather_settings_activity_not_found">Menija nastavitev za tega ponudnika ni mogoče zagnati</string>
-    <string name="weather_settings_add_weather_provider">Dodaj ponudnika vremena</string>
-    <string name="weather_settings_general_settings_title">Splošno</string>
-    <string name="weather_settings_providers_title">Ponudniki</string>
-    <string name="weather_settings_temp_units_title">Enote za temperaturo</string>
-    <string name="weather_settings_temp_celsius">Celzij</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">vreme</string>
-    <string name="status_bar_show_weather_title">Prikaži vreme</string>
-    <string name="status_bar_show_weather_summary">Prikaži trenutno temperaturo v vrstici stanja</string>
     <string name="long_screen_settings_title">Celozaslonske aplikacije</string>
     <string name="long_screen_settings_summary">Vsili zapuščinskim aplikacijam uporabo celozaslonskega razmerja slike</string>
     <string name="long_screen_settings_no_apps">Ni aplikacij</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 576dbc8e..4bff6e91 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -455,20 +455,6 @@
     <string name="display_rotation_90_title">90 gradë</string>
     <string name="display_rotation_180_title">180 gradë</string>
     <string name="display_rotation_270_title">270 gradë</string>
-    <string name="weather_settings_title">Moti</string>
-    <string name="weather_settings_no_services_prompt">Nuk është instaluar asnjë ofrues i shërbimit meteorologjik</string>
-    <string name="weather_settings_no_services_summary">Instalo një ofrues të shërbimit meteorologjik për të marrë përditësime të motit</string>
-    <string name="weather_settings_button">Parametrat e ofruesit</string>
-    <string name="weather_settings_activity_not_found">Menuja e parametrave të këtij ofruesi nuk mund të hapet</string>
-    <string name="weather_settings_add_weather_provider">Shto një ofrues të motit</string>
-    <string name="weather_settings_general_settings_title">Të përgjithshme</string>
-    <string name="weather_settings_providers_title">Ofruesit</string>
-    <string name="weather_settings_temp_units_title">Njësia e temperaturës</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">moti</string>
-    <string name="status_bar_show_weather_title">Shfaq motin</string>
-    <string name="status_bar_show_weather_summary">Trego temperaturën aktuale në shiritin e statusit</string>
     <string name="long_screen_settings_title">Aplikacionet që shfaqen me ekran të plotë</string>
     <string name="long_screen_settings_summary">Detyro aplikacionet e vjetra të përdoren me ekran të plotë</string>
     <string name="long_screen_settings_no_apps">Nuk ka aplikacione</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index a0cc98c6..da0365cd 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -401,20 +401,6 @@
     <string name="display_rotation_90_title">90 степени</string>
     <string name="display_rotation_180_title">180 степени</string>
     <string name="display_rotation_270_title">270 степени</string>
-    <string name="weather_settings_title">Време</string>
-    <string name="weather_settings_no_services_prompt">Нема инсталираног добављача временске прогнозе.</string>
-    <string name="weather_settings_no_services_summary">Инсталирајте добављача временске прогнозе да бисте преузимали податке о времену.</string>
-    <string name="weather_settings_button">Подешавања добављача</string>
-    <string name="weather_settings_activity_not_found">Не могу да покренем мени са подешавањима овог добављача.</string>
-    <string name="weather_settings_add_weather_provider">Додај добављача временске прогнозе</string>
-    <string name="weather_settings_general_settings_title">Опште</string>
-    <string name="weather_settings_providers_title">Добављачи</string>
-    <string name="weather_settings_temp_units_title">Јединица за температуру</string>
-    <string name="weather_settings_temp_celsius">Целзијус</string>
-    <string name="weather_settings_temp_fahrenheit">Фаренхајт</string>
-    <string name="weather_settings_keyword">време</string>
-    <string name="status_bar_show_weather_title">Време</string>
-    <string name="status_bar_show_weather_summary">Приказује тренутну температуру у статусној траци.</string>
     <string name="long_screen_settings_title">Апликације преко целог екрана</string>
     <string name="long_screen_settings_summary">Приморај застареле апликације да користе цео екран</string>
     <string name="charging_sounds_settings_title">Звук при пуњењу</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 9260e6ca..0809917a 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -362,15 +362,6 @@
     <string name="display_rotation_90_title">90 grader</string>
     <string name="display_rotation_180_title">180 grader</string>
     <string name="display_rotation_270_title">270 grader</string>
-    <string name="weather_settings_title">Väder</string>
-    <string name="weather_settings_button">Leverantörsinställningar</string>
-    <string name="weather_settings_general_settings_title">Allmänt</string>
-    <string name="weather_settings_providers_title">Leverantörer</string>
-    <string name="weather_settings_temp_units_title">Temperaturenhet</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">väder</string>
-    <string name="status_bar_show_weather_title">Visa väder</string>
     <string name="charging_sounds_settings_title">Laddningsljud</string>
     <string name="power_notifications_vibrate_title">Vibrera</string>
     <string name="charging_sounds_ringtone_silent">Tyst</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index fa427616..a1eccfee 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -415,20 +415,6 @@
     <string name="display_rotation_90_title">90 องศา</string>
     <string name="display_rotation_180_title">180 องศา</string>
     <string name="display_rotation_270_title">270 องศา</string>
-    <string name="weather_settings_title">สภาพอากาศ</string>
-    <string name="weather_settings_no_services_prompt">ไม่มีผู้ให้บริการข้อมูลสภาพอากาศติดตั้งอยู่</string>
-    <string name="weather_settings_no_services_summary">ติดตั้งผู้ให้บริการสภาพอากาศรับการปรับปรุงสภาพอากาศ</string>
-    <string name="weather_settings_button">ตั้งค่าผู้ให้บริการ</string>
-    <string name="weather_settings_activity_not_found">ไม่สามารถเปิดการตั้งค่าของผู้ให้บริการนี้ได้</string>
-    <string name="weather_settings_add_weather_provider">เพิ่มผู้ให้บริการรายงานสภาพอากาศ</string>
-    <string name="weather_settings_general_settings_title">ทั่วไป</string>
-    <string name="weather_settings_providers_title">ผู้ให้บริการ</string>
-    <string name="weather_settings_temp_units_title">หน่วยอุณหภูมิ</string>
-    <string name="weather_settings_temp_celsius">เซลเซียส</string>
-    <string name="weather_settings_temp_fahrenheit">ฟาเรนไฮต์</string>
-    <string name="weather_settings_keyword">สภาพอากาศ</string>
-    <string name="status_bar_show_weather_title">แสดงสภาพอากาศ</string>
-    <string name="status_bar_show_weather_summary">แสดงอุณหภูมิปัจจุบันบนแถบสถานะ</string>
     <string name="long_screen_settings_title">แอปพลิเคชันเต็มหน้าจอ</string>
     <string name="long_screen_settings_summary">บังคับให้แอปเก่าใช้อัตราส่วนจอแบบเต็ม</string>
     <string name="long_screen_settings_no_apps">ไม่มีแอป</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index aeb91a87..1a0cec79 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -457,20 +457,6 @@
     <string name="display_rotation_90_title">90 derece</string>
     <string name="display_rotation_180_title">180 derece</string>
     <string name="display_rotation_270_title">270 derece</string>
-    <string name="weather_settings_title">Hava durumu</string>
-    <string name="weather_settings_no_services_prompt">Yüklü hava durumu hizmet sağlayıcısı yok</string>
-    <string name="weather_settings_no_services_summary">Hava durumu güncelleştirmelerini almak için bir hava sağlayıcı yükleyin</string>
-    <string name="weather_settings_button">Sağlayıcı ayarları</string>
-    <string name="weather_settings_activity_not_found">Bu sağlayıcının ayarlar menüsü açılamadı</string>
-    <string name="weather_settings_add_weather_provider">Hava durumu sağlayıcısı ekle</string>
-    <string name="weather_settings_general_settings_title">Genel</string>
-    <string name="weather_settings_providers_title">Sağlayıcılar</string>
-    <string name="weather_settings_temp_units_title">Sıcaklık birimi</string>
-    <string name="weather_settings_temp_celsius">Santigrat</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenhayt</string>
-    <string name="weather_settings_keyword">hava durumu</string>
-    <string name="status_bar_show_weather_title">Hava durumunu göster</string>
-    <string name="status_bar_show_weather_summary">Mevcut sıcaklığı durum çubuğunda göster</string>
     <string name="long_screen_settings_title">Tam ekran uygulamaları</string>
     <string name="long_screen_settings_summary">Eski uygulamaların tam ekranın en boy oranını kullanmasına zorlanır</string>
     <string name="long_screen_settings_no_apps">Uygulama yok</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index e4cf89a9..0748b889 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -402,20 +402,6 @@
     <string name="display_rotation_90_title">90 градусів</string>
     <string name="display_rotation_180_title">180 градусів</string>
     <string name="display_rotation_270_title">270 градусів</string>
-    <string name="weather_settings_title">Погода</string>
-    <string name="weather_settings_no_services_prompt">Не встановлено жодного постачальника погоди</string>
-    <string name="weather_settings_no_services_summary">Встановіть службу постачальника погоди для отримання оновлень</string>
-    <string name="weather_settings_button">Налаштування постачальника</string>
-    <string name="weather_settings_activity_not_found">Не вдалося запустити меню налаштувань цього постачальника</string>
-    <string name="weather_settings_add_weather_provider">Додати постачальника погоди</string>
-    <string name="weather_settings_general_settings_title">Загальні</string>
-    <string name="weather_settings_providers_title">Постачальники</string>
-    <string name="weather_settings_temp_units_title">Одиниця виміру температури</string>
-    <string name="weather_settings_temp_celsius">Цельсій</string>
-    <string name="weather_settings_temp_fahrenheit">Фаренгейт</string>
-    <string name="weather_settings_keyword">погода</string>
-    <string name="status_bar_show_weather_title">Показувати погоду</string>
-    <string name="status_bar_show_weather_summary">Відображати поточну температуру в рядку стану</string>
     <string name="charging_sounds_settings_title">Звуки зарядки</string>
     <string name="charging_sounds_enable_title">Увімкнути звуки заряджання</string>
     <string name="charging_sounds_summary">Грати звук при підключенні чи від\'єднанні від зарядного пристрою</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 88a01ea6..f0a39a43 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -455,20 +455,6 @@
     <string name="display_rotation_90_title">90 độ</string>
     <string name="display_rotation_180_title">180 độ</string>
     <string name="display_rotation_270_title">270 độ</string>
-    <string name="weather_settings_title">Thời tiết</string>
-    <string name="weather_settings_no_services_prompt">Không có dịch vụ nhà cung cấp thời tiết nào được cài đặt</string>
-    <string name="weather_settings_no_services_summary">Cài đặt nhà cung cấp thời tiết để nhận thông tin thời tiết cập nhật</string>
-    <string name="weather_settings_button">Cài đặt nhà cung cấp</string>
-    <string name="weather_settings_activity_not_found">Không thể khởi động trình đơn cài đặt của nhà cung cấp này</string>
-    <string name="weather_settings_add_weather_provider">Thêm nhà cung cấp thời tiết</string>
-    <string name="weather_settings_general_settings_title">Chung</string>
-    <string name="weather_settings_providers_title">Nhà cung cấp</string>
-    <string name="weather_settings_temp_units_title">Đơn vị nhiệt độ</string>
-    <string name="weather_settings_temp_celsius">Độ C</string>
-    <string name="weather_settings_temp_fahrenheit">Độ F</string>
-    <string name="weather_settings_keyword">thời tiết</string>
-    <string name="status_bar_show_weather_title">Hiển thị thời tiết</string>
-    <string name="status_bar_show_weather_summary">Hiển thị nhiệt độ hiện tại trên thanh trạng thái</string>
     <string name="long_screen_settings_title">Ứng dụng toàn màn hình</string>
     <string name="long_screen_settings_summary">Buộc ứng dụng cũ sử dụng tỷ lệ cỡ ảnh toàn màn hình</string>
     <string name="long_screen_settings_no_apps">Không có ứng dụng</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 898a622e..dc20bfde 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -455,20 +455,6 @@
     <string name="display_rotation_90_title">90 度</string>
     <string name="display_rotation_180_title">180 度</string>
     <string name="display_rotation_270_title">270 度</string>
-    <string name="weather_settings_title">天气</string>
-    <string name="weather_settings_no_services_prompt">没有安装天气提供商服务</string>
-    <string name="weather_settings_no_services_summary">安装天气提供商以接收天气更新</string>
-    <string name="weather_settings_button">提供商设置</string>
-    <string name="weather_settings_activity_not_found">无法为此提供商启动设置菜单</string>
-    <string name="weather_settings_add_weather_provider">添加天气提供商</string>
-    <string name="weather_settings_general_settings_title">常规</string>
-    <string name="weather_settings_providers_title">提供商</string>
-    <string name="weather_settings_temp_units_title">温度单位</string>
-    <string name="weather_settings_temp_celsius">摄氏</string>
-    <string name="weather_settings_temp_fahrenheit">华氏</string>
-    <string name="weather_settings_keyword">天气</string>
-    <string name="status_bar_show_weather_title">显示天气</string>
-    <string name="status_bar_show_weather_summary">在状态栏上显示当前气温</string>
     <string name="long_screen_settings_title">全屏应用</string>
     <string name="long_screen_settings_summary">强制旧式应用程序使用全屏长宽比</string>
     <string name="long_screen_settings_no_apps">无应用</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index e22efea2..d8586f35 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -453,20 +453,6 @@
     <string name="display_rotation_90_title">90 度</string>
     <string name="display_rotation_180_title">180 度</string>
     <string name="display_rotation_270_title">270 度</string>
-    <string name="weather_settings_title">天氣</string>
-    <string name="weather_settings_no_services_prompt">沒有安裝任何天氣服務</string>
-    <string name="weather_settings_no_services_summary">安裝天氣服務即可接收天氣更新</string>
-    <string name="weather_settings_button">服務選項</string>
-    <string name="weather_settings_activity_not_found">無法為此天氣服務啟動設定選單</string>
-    <string name="weather_settings_add_weather_provider">新增天氣服務</string>
-    <string name="weather_settings_general_settings_title">一般</string>
-    <string name="weather_settings_providers_title">天氣服務</string>
-    <string name="weather_settings_temp_units_title">溫度單位</string>
-    <string name="weather_settings_temp_celsius">攝氏</string>
-    <string name="weather_settings_temp_fahrenheit">華氏</string>
-    <string name="weather_settings_keyword">天氣</string>
-    <string name="status_bar_show_weather_title">顯示天氣資訊</string>
-    <string name="status_bar_show_weather_summary">在狀態列上顯示目前溫度</string>
     <string name="long_screen_settings_title">全螢幕應用程式</string>
     <string name="long_screen_settings_summary">強制舊型應用程式使用全螢幕的比例</string>
     <string name="long_screen_settings_no_apps">沒有應用程式</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index b762c6be..49cbe303 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -316,17 +316,6 @@
         <item>0</item>
     </string-array>
 
-    <!-- Weather temperature -->
-    <string-array name="weather_temp_unit_entries" translatable="false">
-        <item>@string/weather_settings_temp_celsius</item>
-        <item>@string/weather_settings_temp_fahrenheit</item>
-    </string-array>
-
-    <string-array name="weather_temp_unit_values" translatable="false">
-        <item>1</item>
-        <item>2</item>
-    </string-array>
-
     <!-- Gestures - touchscreen gesture actions -->
     <string-array name="touchscreen_gesture_action_entries">
         <item>@string/touchscreen_gesture_action_do_nothing</item>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 66e5a0a5..28335c3d 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -19,8 +19,6 @@
     <!-- Contributors -->
     <color name="contributors_cloud_selected_color">#ff5252</color>
 
-    <color name="weather_settings_icon_tint">#B4B9BA</color>
-
     <!-- Trust -->
     <color name="trust_status_good">#36B37E</color>
     <color name="trust_status_poor">#FFAB00</color>
diff --git a/res/values/config.xml b/res/values/config.xml
index eed044a3..c4532c59 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -17,9 +17,6 @@
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <!-- When true, weather options will be displayed in settings dashboard -->
-    <bool name="config_showWeatherMenu">true</bool>
-
     <!-- Default action ids for a device's touchscreen gestures
          The array should be sorted in the same order as the
          touchscreen gestures advertised by the device's LineageHW impl. -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d3549967..b89cd2b4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -562,23 +562,6 @@
     <string name="display_rotation_180_title">180 degrees</string>
     <string name="display_rotation_270_title">270 degrees</string>
 
-    <!-- Weather -->
-    <string name="weather_settings_title">Weather</string>
-    <string name="weather_settings_no_services_prompt">No weather provider services installed</string>
-    <string name="weather_settings_no_services_summary">Install a weather provider to receive weather updates</string>
-    <string name="weather_settings_button">Provider settings</string>
-    <string name="weather_settings_activity_not_found">Unable to launch the settings menu of this provider</string>
-    <string name="weather_settings_add_weather_provider">Add weather provider</string>
-    <string name="weather_settings_provider_url" translatable="false">https://download.lineageos.org/extras</string>
-    <string name="weather_settings_general_settings_title">General</string>
-    <string name="weather_settings_providers_title">Providers</string>
-    <string name="weather_settings_temp_units_title">Temperature unit</string>
-    <string name="weather_settings_temp_celsius">Celsius</string>
-    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
-    <string name="weather_settings_keyword">weather</string>
-    <string name="status_bar_show_weather_title">Show weather</string>
-    <string name="status_bar_show_weather_summary">Display the current temperature on the status bar</string>
-
     <!-- Applications: Long screen -->
     <string name="long_screen_settings_title">Full screen apps</string>
     <string name="long_screen_settings_summary">Force legacy apps to use full screen aspect ratio</string>
diff --git a/res/xml/parts_catalog.xml b/res/xml/parts_catalog.xml
index 26995c96..d7a0d1aa 100644
--- a/res/xml/parts_catalog.xml
+++ b/res/xml/parts_catalog.xml
@@ -80,11 +80,6 @@
           android:fragment="org.lineageos.lineageparts.input.PowerMenuActions"
           lineage:xmlRes="@xml/power_menu_settings" />
 
-    <part android:key="weather_settings"
-          android:title="@string/weather_settings_title"
-          android:fragment="org.lineageos.lineageparts.weather.WeatherServiceSettings"
-          lineage:xmlRes="@xml/weather_settings" />
-
     <part android:key="long_screen_settings"
           android:title="@string/long_screen_settings_title"
           android:summary="@string/long_screen_settings_summary"
diff --git a/res/xml/weather_settings.xml b/res/xml/weather_settings.xml
deleted file mode 100644
index 3a9f3b49..00000000
--- a/res/xml/weather_settings.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2016 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:key="weather_settings"
-        android:title="@string/weather_settings_general_settings_title">
-
-    <PreferenceCategory
-            android:key="weather_general_settings"
-            android:title="@string/weather_settings_general_settings_title"
-            android:order="0">
-        <ListPreference
-                android:key="weather_temperature_unit"
-                android:entries="@array/weather_temp_unit_entries"
-                android:entryValues="@array/weather_temp_unit_values"
-                android:title="@string/weather_settings_temp_units_title"
-                android:summary="%s"
-                android:persistent="false" />
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="weather_service_providers"
-        android:title="@string/weather_settings_providers_title"
-        android:order="1">
-
-    </PreferenceCategory>
-</PreferenceScreen>
diff --git a/src/org/lineageos/lineageparts/weather/WeatherServiceSettings.java b/src/org/lineageos/lineageparts/weather/WeatherServiceSettings.java
deleted file mode 100644
index 07f40dd3..00000000
--- a/src/org/lineageos/lineageparts/weather/WeatherServiceSettings.java
+++ /dev/null
@@ -1,482 +0,0 @@
-/*
- * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2019 The LineageOS Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.lineageos.lineageparts.weather;
-
-import android.app.Activity;
-import android.content.ActivityNotFoundException;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.content.res.XmlResourceParser;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.UserHandle;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.util.Xml;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.RadioButton;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.internal.content.PackageMonitor;
-import com.android.internal.os.BackgroundThread;
-
-import org.lineageos.lineageparts.R;
-import org.lineageos.lineageparts.SettingsPreferenceFragment;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import lineageos.providers.LineageSettings;
-import lineageos.providers.WeatherContract;
-import lineageos.weatherservice.WeatherProviderService;
-
-public class WeatherServiceSettings extends SettingsPreferenceFragment
-        implements Preference.OnPreferenceChangeListener {
-
-    private Context mContext;
-    private Handler mHandler;
-    private static final String TAG = WeatherServiceSettings.class.getSimpleName();
-
-    private static final String PREFERENCE_GENERAL = "weather_general_settings";
-    private static final String PREFERENCE_PROVIDERS = "weather_service_providers";
-    private static final String PREFERENCE_TEMP_UNIT = "weather_temperature_unit";
-
-    private static final float DISABLED_ALPHA = 0.4f;
-
-    private PreferenceCategory mGeneralSettingsCategory;
-    private PreferenceCategory mProvidersCategory;
-    private ListPreference mTemperatureUnit;
-
-    @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
-        mContext = activity;
-        mHandler = new Handler(mContext.getMainLooper());
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        addPreferencesFromResource(R.xml.weather_settings);
-
-        final PreferenceScreen ps = getPreferenceScreen();
-        mGeneralSettingsCategory = ps.findPreference(PREFERENCE_GENERAL);
-        mProvidersCategory = ps.findPreference(PREFERENCE_PROVIDERS);
-        mTemperatureUnit = ps.findPreference(PREFERENCE_TEMP_UNIT);
-        mTemperatureUnit.setOnPreferenceChangeListener(this);
-        
-        ps.removePreference(mGeneralSettingsCategory);
-        watch(LineageSettings.Secure.getUriFor(LineageSettings.Secure.WEATHER_PROVIDER_SERVICE));
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        updateAdapter();
-        registerPackageMonitor();
-
-        mTemperatureUnit.setValue(String.valueOf(getSelectedTemperatureUnit(mContext)));
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        unregisterPackageMonitor();
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (preference == mTemperatureUnit) {
-            LineageSettings.Global.putInt(mContext.getContentResolver(),
-                    LineageSettings.Global.WEATHER_TEMPERATURE_UNIT,
-                    Integer.valueOf((String) newValue));
-        }
-        return true;
-    }
-
-    private void registerPackageMonitor() {
-        mPackageMonitor.register(mContext, BackgroundThread.getHandler().getLooper(),
-                UserHandle.ALL, true);
-    }
-
-    private void launchGetWeatherProviders() {
-        startActivity(new Intent(Intent.ACTION_VIEW,
-                    Uri.parse(getString(R.string.weather_settings_provider_url)))
-                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
-    }
-
-    private void unregisterPackageMonitor() {
-        mPackageMonitor.unregister();
-    }
-
-    private PackageMonitor mPackageMonitor = new PackageMonitor() {
-        @Override
-        public void onPackageAdded(String packageName, int uid) {
-            mHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    updateAdapter();
-                }
-            });
-        }
-
-        @Override
-        public void onPackageRemoved(String packageName, int uid) {
-            mHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    updateAdapter();
-                }
-            });
-        }
-    };
-
-    private static List<WeatherProviderServiceInfo> getInstalledServices(Context context) {
-        final PackageManager pm = context.getPackageManager();
-        final Intent intent = new Intent(WeatherProviderService.SERVICE_INTERFACE);
-        List<ResolveInfo> resolveInfoList = pm.queryIntentServices(intent,
-                PackageManager.GET_SERVICES | PackageManager.GET_META_DATA);
-        List<WeatherProviderServiceInfo> weatherProviderServiceInfos
-                = new ArrayList<>(resolveInfoList.size());
-        ComponentName activeService = getEnabledWeatherServiceProvider(context);
-        for (ResolveInfo resolveInfo : resolveInfoList) {
-            if (resolveInfo.serviceInfo == null) continue;
-
-            if (resolveInfo.serviceInfo.packageName == null
-                    || resolveInfo.serviceInfo.name == null) {
-                //Really?
-                continue;
-            }
-
-            if (!resolveInfo.serviceInfo.permission.equals(
-                    lineageos.platform.Manifest.permission.BIND_WEATHER_PROVIDER_SERVICE)) {
-                continue;
-            }
-            WeatherProviderServiceInfo serviceInfo = new WeatherProviderServiceInfo();
-            serviceInfo.componentName = new ComponentName(resolveInfo.serviceInfo.packageName,
-                    resolveInfo.serviceInfo.name);
-            serviceInfo.isActive = serviceInfo.componentName.equals(activeService);
-            serviceInfo.caption = resolveInfo.loadLabel(pm);
-            serviceInfo.icon = resolveInfo.loadIcon(pm);
-            serviceInfo.settingsComponentName = getSettingsComponent(pm, resolveInfo);
-
-            weatherProviderServiceInfos.add(serviceInfo);
-        }
-        return weatherProviderServiceInfos;
-    }
-
-    private void updateAdapter() {
-        final List<WeatherProviderServiceInfo> weatherProviderServiceInfos =
-                getInstalledServices(getContext());
-
-        final PreferenceScreen ps = getPreferenceScreen();
-        if (!weatherProviderServiceInfos.isEmpty()) {
-            if (ps.findPreference(PREFERENCE_PROVIDERS) == null) {
-                ps.addPreference(mProvidersCategory);
-            }
-
-            mProvidersCategory.removeAll();
-            for (WeatherProviderServiceInfo info : weatherProviderServiceInfos) {
-                mProvidersCategory.addPreference(new WeatherProviderPreference(mContext, info));
-            }
-
-            Preference addServicePreference = new Preference(mContext);
-            addServicePreference.setTitle(R.string.weather_settings_add_weather_provider);
-            addServicePreference.setIcon(R.drawable.ic_menu_add);
-            addServicePreference.setOnPreferenceClickListener(
-                    new Preference.OnPreferenceClickListener() {
-                @Override
-                public boolean onPreferenceClick(Preference preference) {
-                    launchGetWeatherProviders();
-                    return false;
-                }
-            });
-            mProvidersCategory.addPreference(addServicePreference);
-
-        } else {
-            ps.removePreference(mProvidersCategory);
-        }
-
-    }
-
-    /**
-     * Gets the currently selected temperature unit.
-     * If none is selected yet, returns a unit appropriate for the current locale
-     */
-    public static int getSelectedTemperatureUnit(Context context) {
-        int tempUnit = LineageSettings.Global.getInt(context.getContentResolver(),
-                LineageSettings.Global.WEATHER_TEMPERATURE_UNIT, -1);
-        if (tempUnit != -1) {
-            return tempUnit;
-        }
-
-        Locale locale = context.getResources().getConfiguration().locale;
-        boolean useFahrenheit = locale.equals(Locale.US)
-                || locale.toString().equals("en_BS")  // Bahamas
-                || locale.toString().equals("en_BZ")  // Belize
-                || locale.toString().equals("en_KY"); // Cayman Islands
-        return useFahrenheit
-                ? WeatherContract.WeatherColumns.TempUnit.FAHRENHEIT
-                : WeatherContract.WeatherColumns.TempUnit.CELSIUS;
-    }
-
-    private class WeatherProviderPreference extends Preference {
-        private WeatherProviderServiceInfo mInfo;
-        private RadioButton mRadioButton;
-        private View mSettingsButton;
-        private Context mContext;
-
-        public WeatherProviderPreference(Context context, WeatherProviderServiceInfo info) {
-            super(context);
-            mInfo = info;
-            mContext = context;
-
-            setLayoutResource(R.layout.weather_service_provider_info_row);
-            setTitle(mInfo.caption);
-            setIcon(mInfo.icon);
-        }
-
-        @Override
-        public void onBindViewHolder(final PreferenceViewHolder holder) {
-            super.onBindViewHolder(holder);
-
-            mRadioButton = (RadioButton) holder.findViewById(R.id.radio);
-            mRadioButton.setChecked(mInfo.isActive);
-            mRadioButton.setOnTouchListener(new View.OnTouchListener() {
-                @Override
-                public boolean onTouch(View v, MotionEvent event) {
-                    holder.itemView.onTouchEvent(event);
-                    return false;
-                }
-            });
-
-            boolean showSettings = mInfo.settingsComponentName != null;
-            View settingsDivider = holder.findViewById(R.id.divider);
-            settingsDivider.setVisibility(showSettings ? View.VISIBLE : View.INVISIBLE);
-
-            mSettingsButton = holder.findViewById(R.id.settings);
-            mSettingsButton.setVisibility(showSettings ? View.VISIBLE : View.INVISIBLE);
-            mSettingsButton.setAlpha(mInfo.isActive ? 1f : DISABLED_ALPHA);
-            mSettingsButton.setEnabled(mInfo.isActive);
-            mSettingsButton.setFocusable(mInfo.isActive);
-            mSettingsButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    launchSettingsActivity(mInfo);
-                }
-            });
-        }
-
-        @Override
-        public void performClick() {
-            if (isActiveProvider()) {
-                return;
-            }
-            setActiveWeatherProviderService();
-            notifyChanged();
-        }
-
-        private boolean isActiveProvider() {
-            return mInfo.isActive;
-        }
-
-        public void setActiveState(boolean active) {
-            mInfo.isActive = active;
-            mRadioButton.setChecked(active);
-
-            boolean hasSettings = mInfo.settingsComponentName != null;
-            if (hasSettings) {
-                mSettingsButton.setAlpha(mInfo.isActive ? 1f : DISABLED_ALPHA);
-                mSettingsButton.setEnabled(mInfo.isActive);
-                mSettingsButton.setFocusable(mInfo.isActive);
-            }
-        }
-
-        private void launchSettingsActivity(WeatherProviderServiceInfo info) {
-            if (info != null && info.settingsComponentName != null) {
-                try {
-                    mContext.startActivity(new Intent().setComponent(info.settingsComponentName));
-                } catch (ActivityNotFoundException e) {
-                    Toast.makeText(mContext,
-                            R.string.weather_settings_activity_not_found,
-                            Toast.LENGTH_LONG)
-                            .show();
-                    Log.w(TAG, info.settingsComponentName + " not found");
-                }
-            }
-        }
-
-        private void setActiveWeatherProviderService() {
-            if (!mInfo.isActive) {
-                markAsActiveProvider();
-                mInfo.isActive = true;
-                LineageSettings.Secure.putString(mContext.getContentResolver(),
-                        LineageSettings.Secure.WEATHER_PROVIDER_SERVICE,
-                        mInfo.componentName.flattenToString());
-            }
-        }
-
-        private void markAsActiveProvider() {
-            // Check for current active provider
-            PreferenceCategory providersCategory = findPreferenceInHierarchy(
-                    WeatherServiceSettings.PREFERENCE_PROVIDERS);
-            if (providersCategory != null) {
-                final int count = providersCategory.getPreferenceCount();
-                for (int index = 0; index < count; index++) {
-                    Preference p = providersCategory.getPreference(index);
-                    if (p instanceof WeatherProviderPreference) {
-                        WeatherProviderPreference preference = (WeatherProviderPreference) p;
-                        if (preference.isActiveProvider()) {
-                            preference.setActiveState(false);
-                            break;
-                        }
-                    }
-                }
-            }
-            // Mark this provider as active
-            setActiveState(true);
-        }
-    }
-
-    private static ComponentName getSettingsComponent(PackageManager pm, ResolveInfo resolveInfo) {
-        if (resolveInfo == null
-                || resolveInfo.serviceInfo == null
-                || resolveInfo.serviceInfo.metaData == null) {
-            return null;
-        }
-        String cn = null;
-        XmlResourceParser parser = null;
-        Exception caughtException = null;
-
-        try {
-            parser = resolveInfo.serviceInfo.loadXmlMetaData(pm,
-                    WeatherProviderService.SERVICE_META_DATA);
-            if (parser == null) {
-                Log.w(TAG, "Can't find " + WeatherProviderService.SERVICE_META_DATA + " meta-data");
-                return null;
-            }
-            Resources res =
-                    pm.getResourcesForApplication(resolveInfo.serviceInfo.applicationInfo);
-            AttributeSet attrs = Xml.asAttributeSet(parser);
-            int type;
-            while ((type=parser.next()) != XmlPullParser.END_DOCUMENT
-                    && type != XmlPullParser.START_TAG) {
-            }
-            String nodeName = parser.getName();
-            if (!"weather-provider-service".equals(nodeName)) {
-                Log.w(TAG, "Meta-data does not start with weather-provider-service tag");
-                return null;
-            }
-            //Will use Dream styleable for now, it has the attribute we need
-            TypedArray sa = res.obtainAttributes(attrs, com.android.internal.R.styleable.Dream);
-            cn = sa.getString(com.android.internal.R.styleable.Dream_settingsActivity);
-            sa.recycle();
-        } catch (PackageManager.NameNotFoundException e) {
-            caughtException = e;
-        } catch (IOException e) {
-            caughtException = e;
-        } catch (XmlPullParserException e) {
-            caughtException = e;
-        } finally {
-            if (parser != null) parser.close();
-        }
-        if (caughtException != null) {
-            Log.w(TAG, "Error parsing : " + resolveInfo.serviceInfo.packageName,
-                    caughtException);
-            return null;
-        }
-        if (cn != null && cn.indexOf('/') < 0) {
-            cn = resolveInfo.serviceInfo.packageName + "/" + cn;
-        }
-        return cn == null ? null : ComponentName.unflattenFromString(cn);
-    }
-
-    private static ComponentName getEnabledWeatherServiceProvider(Context context) {
-        String activeWeatherServiceProvider = LineageSettings.Secure.getString(
-                context.getContentResolver(), LineageSettings.Secure.WEATHER_PROVIDER_SERVICE);
-        if (activeWeatherServiceProvider == null) return null;
-        return ComponentName.unflattenFromString(activeWeatherServiceProvider);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        ViewGroup contentRoot = (ViewGroup) getListView().getParent();
-        View emptyView = getActivity().getLayoutInflater().inflate(
-                R.layout.empty_weather_state, contentRoot, false);
-        TextView emptyTextView = (TextView) emptyView.findViewById(R.id.message);
-        emptyTextView.setText(R.string.weather_settings_no_services_prompt);
-
-        Button addProviderButton = (Button) emptyView.findViewById(R.id.add_weather_provider);
-        addProviderButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                launchGetWeatherProviders();
-            }
-        });
-
-        contentRoot.addView(emptyView);
-        setEmptyView(emptyView);
-    }
-
-    private static class WeatherProviderServiceInfo {
-        CharSequence caption;
-        Drawable icon;
-        boolean isActive;
-        ComponentName componentName;
-        public ComponentName settingsComponentName;
-    }
-
-    public static final SummaryProvider SUMMARY_PROVIDER = new SummaryProvider() {
-        @Override
-        public String getSummary(Context context, String key) {
-            final List<WeatherProviderServiceInfo> infos = getInstalledServices(context);
-            if (infos != null && infos.size() > 0) {
-                for (WeatherProviderServiceInfo info : infos) {
-                    if (info.isActive) {
-                        Log.d(TAG, "lineageparts: found active provider: " + info.caption);
-                        return String.valueOf(info.caption);
-                    }
-                }
-            }
-            return context.getString(R.string.weather_settings_no_services_summary);
-        }
-    };
-}
-- 
GitLab