From 70fdecc16d35b2d5e3083925561adfbff0f56362 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Wed, 2 Jun 2021 05:47:08 +0200
Subject: [PATCH 01/13] LineageParts: Change references to /e/ OS in Trust ASB
 dialog

Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
 res/values/strings.xml                                     | 1 +
 src/org/lineageos/lineageparts/trust/TrustPreferences.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 02a53169..54225cac 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -651,6 +651,7 @@
     <!-- Lowercase on purpose, appears in trust_feature_security_patches_value_base -->
     <string name="trust_feature_security_patches_value_old">Out of date</string>
     <string name="trust_feature_security_patches_explain">Security patches are released monthly by Google in cooperation with SoC vendors to address flaws which could be exploited by malicious apps to bypass security restrictions and cause permanent damage to your device. Patches made available by Google are applied every month on all supported devices, but patches to proprietary code can only be applied by your device\'s manufacturer. To keep your device safe make sure your LineageOS build is always up-to-date, and (if applicable) ensure your vendor image is updated to the latest one recommended by LineageOS.</string>
+    <string name="trust_feature_security_patches_explain_e">Security patches are released monthly by Google in cooperation with SoC vendors to address flaws which could be exploited by malicious apps to bypass security restrictions and cause permanent damage to your device. Patches made available by Google are applied every month on all supported devices, but patches to proprietary code can only be applied by your device\'s manufacturer. To keep your device safe make sure your /e/ OS build is always up-to-date, and (if applicable) ensure your vendor image is updated to the latest one recommended by /e/ OS.</string>
     <string name="trust_feature_encryption">Encryption</string>
     <string name="trust_feature_encryption_value_enabled">Enabled</string>
     <string name="trust_feature_encryption_value_nolock">Needs a secure lock screen</string>
diff --git a/src/org/lineageos/lineageparts/trust/TrustPreferences.java b/src/org/lineageos/lineageparts/trust/TrustPreferences.java
index a38b395b..f889ee3a 100644
--- a/src/org/lineageos/lineageparts/trust/TrustPreferences.java
+++ b/src/org/lineageos/lineageparts/trust/TrustPreferences.java
@@ -71,7 +71,7 @@ public class TrustPreferences extends SettingsPreferenceFragment {
         mSELinuxPref.setOnPreferenceClickListener(p ->
                 showInfo(R.string.trust_feature_selinux_explain));
         mSecurityPatchesPref.setOnPreferenceClickListener(p ->
-                showInfo(R.string.trust_feature_security_patches_explain));
+                showInfo(R.string.trust_feature_security_patches_explain_e));
         mEncryptionPref.setOnPreferenceClickListener(p ->
                 showInfo(R.string.trust_feature_encryption_explain));
         mSmsLimitPref.setOnPreferenceChangeListener((p, v) ->
-- 
GitLab


From fa567862b9b6ab9b14b33382106105f75ba0f167 Mon Sep 17 00:00:00 2001
From: TheScarastic <warabhishek@e.email>
Date: Thu, 16 Jun 2022 06:03:51 +0000
Subject: [PATCH 02/13] Revert "Remove weather related leftovers"

This reverts commit 77ca6d8bfc874bd53846d7ab09117c25a834ffb3.

Revert "LineageParts: Remove weather related code"

This reverts commit 44d90535c51f0a1ebc7e5baaf5ede7c221038972.

Change-Id: I676082613117e5642b8dfe5c06d58ec6d8e940dd
---
 AndroidManifest.xml                           |  11 +
 res/drawable-hdpi/nav_divider.png             | Bin 0 -> 320 bytes
 res/drawable-mdpi/nav_divider.png             | Bin 0 -> 311 bytes
 res/drawable-xhdpi/nav_divider.png            | Bin 0 -> 332 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       | 485 ++++++++++++++++++
 68 files changed, 1481 insertions(+)
 create mode 100644 res/drawable-hdpi/nav_divider.png
 create mode 100644 res/drawable-mdpi/nav_divider.png
 create mode 100644 res/drawable-xhdpi/nav_divider.png
 create mode 100644 res/drawable/ic_gear.xml
 create mode 100644 res/drawable/ic_settings_weather.xml
 create mode 100644 res/layout/empty_weather_state.xml
 create mode 100644 res/layout/weather_service_provider_info_row.xml
 create mode 100644 res/xml/weather_settings.xml
 create mode 100644 src/org/lineageos/lineageparts/weather/WeatherServiceSettings.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 19bbbb88..87a5beee 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -250,6 +250,17 @@
                  android:enabled="true"
                  android:exported="false" />
 
+        <!-- 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
new file mode 100644
index 0000000000000000000000000000000000000000..b1f035c93d93eb3d9767fa9e266ab62a46ff8b9b
GIT binary patch
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

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/nav_divider.png b/res/drawable-mdpi/nav_divider.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7ed6dff8ecf1393296142e701ec454f7a44286a
GIT binary patch
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

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/nav_divider.png b/res/drawable-xhdpi/nav_divider.png
new file mode 100644
index 0000000000000000000000000000000000000000..00e3852d5b61d77de5f7f230106e10971fa59974
GIT binary patch
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

literal 0
HcmV?d00001

diff --git a/res/drawable/ic_gear.xml b/res/drawable/ic_gear.xml
new file mode 100644
index 00000000..9562ea15
--- /dev/null
+++ b/res/drawable/ic_gear.xml
@@ -0,0 +1,26 @@
+<?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
new file mode 100644
index 00000000..1a5a8a92
--- /dev/null
+++ b/res/drawable/ic_settings_weather.xml
@@ -0,0 +1,30 @@
+<?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
new file mode 100644
index 00000000..ce9e7490
--- /dev/null
+++ b/res/layout/empty_weather_state.xml
@@ -0,0 +1,54 @@
+<?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
new file mode 100644
index 00000000..ad63d3c1
--- /dev/null
+++ b/res/layout/weather_service_provider_info_row.xml
@@ -0,0 +1,80 @@
+<?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 a6991d7d..0da143f9 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -370,6 +370,20 @@
     <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 65244a35..55539d33 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -426,6 +426,20 @@
     <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 720c31f9..3faefda9 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -226,6 +226,20 @@
     <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 55685eda..2bac59e1 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -443,6 +443,20 @@
     <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 791fd67f..9ae90264 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -328,4 +328,11 @@
     <string name="trust_restrict_usb_summary">Кіраванне падтрымкай злучэнняў па USB, такіх як навушнікі, прылады захоўвання даных, увод (мышы, клавіятуры, джойсцікі) і ADB</string>
     <string name="trust_restrict_usb_always">Забараніць злучэнні па 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>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 54ba229a..1731dbe0 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -433,6 +433,20 @@
     <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 69a21241..8a838ddd 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -441,6 +441,20 @@
     <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 b41f9b4e..92efb545 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -441,6 +441,20 @@
     <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 8201a8dd..8ae2e8bf 100644
--- a/res/values-cy/strings.xml
+++ b/res/values-cy/strings.xml
@@ -434,6 +434,20 @@
     <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 a7860f8b..6b90d888 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -411,6 +411,20 @@
     <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="charging_sounds_settings_title">Opladningslyde</string>
     <string name="charging_sounds_enable_title">Aktivér opladningslyde</string>
     <string name="charging_sounds_summary">Afspil en lyd, når du tilslutter eller frakobler en strømkilde</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4f36e51d..6df59d43 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -441,6 +441,20 @@
     <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 24f7a981..bd6832a4 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -445,6 +445,20 @@
     <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 933d487e..737369fc 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -443,6 +443,20 @@
     <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 b383e70c..8ac06985 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -443,6 +443,20 @@
     <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 68c99dcf..8bb6f860 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -443,6 +443,20 @@
     <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 507aa716..c21ef9d6 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -443,6 +443,20 @@
     <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 1195acf3..f3df7141 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -412,6 +412,20 @@
     <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 9410617c..d9e5de74 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -408,6 +408,20 @@
     <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 6e6aa5e1..4467bfb9 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -430,6 +430,20 @@ 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 aa8e3d2a..d6796088 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -404,6 +404,20 @@ 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 3759adbc..734a4533 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -428,6 +428,20 @@
     <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 a60ef8ef..7761fd00 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -428,6 +428,20 @@
     <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 5944289a..acd43240 100644
--- a/res/values-fy-rNL/strings.xml
+++ b/res/values-fy-rNL/strings.xml
@@ -406,6 +406,20 @@
     <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 2d9b0191..a6fee03f 100644
--- a/res/values-gd/strings.xml
+++ b/res/values-gd/strings.xml
@@ -435,6 +435,20 @@
     <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 846a6faa..07e8d500 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -433,6 +433,20 @@
     <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 f48321ee..143ec7ee 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -412,6 +412,20 @@
     <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 ae79631b..39e84d6d 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -441,6 +441,20 @@
     <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 47a99c1a..a77f7e43 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -434,6 +434,20 @@
     <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 7176cdd3..412dc8b1 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -441,6 +441,20 @@
     <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 422d20a4..519a3666 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -400,6 +400,20 @@
     <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 ae14aa39..e097e97e 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -441,6 +441,20 @@
     <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 73d6e76e..f96c3e22 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -397,6 +397,20 @@
     <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 8c2cac28..aa410669 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -440,6 +440,20 @@
     <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 3fc016a6..67d00458 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -370,6 +370,20 @@
     <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 2a8c86f9..08f477a7 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -370,6 +370,20 @@
     <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 7f8351ff..59c23c93 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -444,6 +444,20 @@
     <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 9912f710..793ac316 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -408,6 +408,20 @@
     <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 73322c3f..e6061e87 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -414,6 +414,20 @@
     <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 fe3ddc30..afad95e6 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -441,6 +441,20 @@
     <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 bd7d1e27..d130b27b 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -443,6 +443,20 @@
     <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 622e1564..9492b73a 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -441,6 +441,20 @@
     <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 30317e71..a8fb8e63 100644
--- a/res/values-sc-rIT/strings.xml
+++ b/res/values-sc-rIT/strings.xml
@@ -103,5 +103,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_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 f58d5392..1f4d84c0 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -428,6 +428,20 @@
     <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 6704d152..f9fc99ac 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -443,6 +443,20 @@
     <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 c5834ed7..fa971720 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -441,6 +441,20 @@
     <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">Aplikacione që shfaqen në gjithë ekranin</string>
     <string name="long_screen_settings_summary">Detyro aplikacionet e vjetra të përdorin dimension 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 da0365cd..a0cc98c6 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -401,6 +401,20 @@
     <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 a19c0c77..cfa5987c 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -241,6 +241,15 @@
     <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 a1eccfee..fa427616 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -415,6 +415,20 @@
     <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 4dabc2f2..b884f76a 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -443,6 +443,20 @@
     <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 0748b889..e4cf89a9 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -402,6 +402,20 @@
     <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 23a2ae8d..029afe3a 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -433,6 +433,20 @@
     <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 9a2f53c6..e980e459 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -441,6 +441,20 @@
     <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 303afd1d..f53069db 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -426,6 +426,20 @@
     <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 9f4c965c..d65471fe 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -281,6 +281,17 @@
         <item>2</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 28335c3d..66e5a0a5 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -19,6 +19,8 @@
     <!-- 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 a3ee4370..4236b278 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -20,6 +20,9 @@
     <!-- Metrics server endpoint -->
     <string name="stats_lineage_url">https://stats.lineageos.org/api/v1/stats</string>
 
+    <!-- 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 54225cac..eeeb5bfc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -568,6 +568,23 @@
     <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 9711b217..225b2af6 100644
--- a/res/xml/parts_catalog.xml
+++ b/res/xml/parts_catalog.xml
@@ -80,6 +80,11 @@
           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
new file mode 100644
index 00000000..3a9f3b49
--- /dev/null
+++ b/res/xml/weather_settings.xml
@@ -0,0 +1,40 @@
+<?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
new file mode 100644
index 00000000..94b822f2
--- /dev/null
+++ b/src/org/lineageos/lineageparts/weather/WeatherServiceSettings.java
@@ -0,0 +1,485 @@
+/*
+ * 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);
+
+        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_GENERAL) == null) {
+                ps.addPreference(mGeneralSettingsCategory);
+            }
+            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(mGeneralSettingsCategory);
+            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


From 47358dbe3bd6680a26208368b48c9028760254b9 Mon Sep 17 00:00:00 2001
From: TheScarastic <warabhishek@e.email>
Date: Tue, 23 Aug 2022 06:54:58 +0000
Subject: [PATCH 03/13] LineageParts: Add /e/ contributors

---
 AndroidManifest.xml                           |  2 +-
 res/values/strings.xml                        |  7 +++
 res/xml/contributors.xml                      | 44 +++++++++++++++++++
 res/xml/contributors_cloud.xml                | 20 ---------
 res/xml/parts_catalog.xml                     |  4 +-
 .../contributors/ContributorsSettings.java    | 30 +++++++++++++
 6 files changed, 84 insertions(+), 23 deletions(-)
 create mode 100644 res/xml/contributors.xml
 delete mode 100644 res/xml/contributors_cloud.xml
 create mode 100644 src/org/lineageos/lineageparts/contributors/ContributorsSettings.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 87a5beee..694c9eda 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -206,7 +206,7 @@
 
         <!-- Contributors Cloud (MyDeviceInfo category) -->
         <activity-alias
-            android:name=".contributors.ContributorsCloudFragment"
+            android:name=".contributors.ContributorsSettings"
             android:label="@string/contributors_cloud_fragment_title"
             android:targetActivity="PartsActivity">
             <intent-filter>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index eeeb5bfc..1d013cf5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -694,4 +694,11 @@
     <string name="sms_security_check_limit_summary">Apps can send %s messages in 1 minute before requiring confirmation</string>
     <string name="sms_security_check_limit_summary_none">Apps are not allowed to send any messages without confirmation</string>
     <string name="sms_security_check_limit_always_confirm">Always confirm</string>
+
+    <!-- /e/ additions begin -->
+
+    <!-- contributors -->
+    <string name="e_contributors_title">/e/ contributors</string>
+    <string name="e_supporters_title">/e/ supporters</string>
+    <string name="lineageos_contributors_title">LineageOS contributors</string>
 </resources>
diff --git a/res/xml/contributors.xml b/res/xml/contributors.xml
new file mode 100644
index 00000000..ba2581fd
--- /dev/null
+++ b/res/xml/contributors.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="contributors_cloud"
+    android:title="@string/contributors_cloud_fragment_title">
+
+    <!-- Contributors cloud -->
+    <Preference
+        android:title="@string/lineageos_contributors_title"
+        android:fragment="org.lineageos.lineageparts.contributors.ContributorsCloudFragment" />
+
+    <!-- /e/ contributors (web) -->
+    <Preference
+        android:key="e_contributors"
+        android:title="@string/e_contributors_title">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:data="https://e.foundation/about-e/#people" />
+    </Preference>
+
+    <!-- /e/ supporters (web) -->
+    <Preference
+        android:key="e_supporters"
+        android:title="@string/e_supporters_title">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:data="https://e.foundation/donate/#earlybackers" />
+    </Preference>
+</PreferenceScreen>
diff --git a/res/xml/contributors_cloud.xml b/res/xml/contributors_cloud.xml
deleted file mode 100644
index 2e83511e..00000000
--- a/res/xml/contributors_cloud.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:key="contributors_cloud"
-    android:title="@string/contributors_cloud_fragment_title" />
diff --git a/res/xml/parts_catalog.xml b/res/xml/parts_catalog.xml
index 225b2af6..98814a0b 100644
--- a/res/xml/parts_catalog.xml
+++ b/res/xml/parts_catalog.xml
@@ -41,8 +41,8 @@
 
     <part android:key="contributors"
           android:title="@string/contributors_cloud_fragment_title"
-          android:fragment="org.lineageos.lineageparts.contributors.ContributorsCloudFragment"
-          lineage:xmlRes="@xml/contributors_cloud" />
+          android:fragment="org.lineageos.lineageparts.contributors.ContributorsSettings"
+          lineage:xmlRes="@xml/contributors" />
 
     <part android:key="livedisplay"
           android:title="@*lineageos.platform:string/live_display_title"
diff --git a/src/org/lineageos/lineageparts/contributors/ContributorsSettings.java b/src/org/lineageos/lineageparts/contributors/ContributorsSettings.java
new file mode 100644
index 00000000..abf20072
--- /dev/null
+++ b/src/org/lineageos/lineageparts/contributors/ContributorsSettings.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2022 /e/ Foundation
+ *
+ * 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.contributors;
+
+import android.os.Bundle;
+
+import org.lineageos.lineageparts.R;
+import org.lineageos.lineageparts.SettingsPreferenceFragment;
+
+public class ContributorsSettings extends SettingsPreferenceFragment {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.contributors);
+    }
+}
-- 
GitLab


From 121eb11f7c1f5eb4bafc9d508a828fdebb1b45f8 Mon Sep 17 00:00:00 2001
From: TheScarastic <warabhishek@e.email>
Date: Tue, 23 Aug 2022 08:57:56 +0000
Subject: [PATCH 04/13] LineageParts: Add microg to system settings

---
 AndroidManifest.xml                           | 27 +++++++++++
 res/drawable/ic_settings_microg.xml           | 14 ++++++
 res/values/strings.xml                        |  3 ++
 res/xml/microg_settings.xml                   | 18 ++++++++
 res/xml/parts_catalog.xml                     |  5 +++
 .../lineageparts/microg/MicrogSettings.java   | 45 +++++++++++++++++++
 6 files changed, 112 insertions(+)
 create mode 100644 res/drawable/ic_settings_microg.xml
 create mode 100644 res/xml/microg_settings.xml
 create mode 100644 src/org/lineageos/lineageparts/microg/MicrogSettings.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 694c9eda..3af7298a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -183,6 +183,33 @@
                 android:resource="@string/summary_empty" />
         </activity-alias>
 
+        <!-- Microg settings (System category) -->
+        <activity-alias
+            android:name=".microg.MicrogSettings"
+            android:label="@string/microg_title"
+            android:targetActivity="PartsActivity">
+            <intent-filter>
+                <action android:name="com.android.settings.action.IA_SETTINGS" />
+                <action android:name="org.lineageos.lineageparts.MICROG_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data
+                android:name="com.android.settings.category"
+                android:value="com.android.settings.category.ia.system" />
+            <meta-data
+                android:name="com.android.settings.icon"
+                android:resource="@drawable/ic_settings_microg" />
+            <meta-data
+                android:name="com.android.settings.icon_tintable"
+                android:value="true" />
+            <meta-data
+                android:name="com.android.settings.order"
+                android:value="-253" />
+            <meta-data
+                android:name="com.android.settings.summary"
+                android:resource="@string/summary_empty" />
+        </activity-alias>
+
         <!-- Trust interface (Privacy category) -->
         <activity-alias
             android:name=".trust.TrustPreferences"
diff --git a/res/drawable/ic_settings_microg.xml b/res/drawable/ic_settings_microg.xml
new file mode 100644
index 00000000..4e55f7c1
--- /dev/null
+++ b/res/drawable/ic_settings_microg.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32"
+    android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:fillType="evenOdd"
+        android:pathData="M11.818,11.625C14.042,9.471 17.585,9.507 19.77,11.727C20.157,12.121 20.152,12.754 19.759,13.141C19.365,13.529 18.732,13.524 18.344,13.13C16.931,11.694 14.65,11.672 13.216,13.056C11.807,14.47 11.788,16.752 13.198,18.184C14.613,19.622 16.899,19.642 18.333,18.253C18.729,17.869 19.362,17.879 19.747,18.276C20.131,18.672 20.121,19.305 19.724,19.69C17.501,21.844 13.958,21.807 11.773,19.587C9.585,17.365 9.622,13.821 11.807,11.636C11.811,11.632 11.815,11.628 11.818,11.625Z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M13.629,3L18.4,3.029L18.686,5.886C20.286,6.343 21.771,7.2 22.971,8.4L25.571,7.314L27.886,11.314L25.629,13.029C26.086,14.8 26.057,16.629 25.571,18.343L27.857,20.114L25.343,24.171L22.686,23.029C22.114,23.543 21.514,24.029 20.8,24.429C20.057,24.857 19.257,25.2 18.457,25.429L18.143,28.286L13.371,28.343L13.029,25.486C11.371,25.029 9.857,24.171 8.6,22.943L6,24.029L3.686,20.029L5.943,18.314C5.486,16.571 5.514,14.8 5.971,13.114L3.686,11.4L6.114,7.286L8.8,8.371C9.371,7.829 10.029,7.314 10.771,6.914C11.571,6.457 12.4,6.114 13.229,5.886L13.629,3ZM11.914,1L11.657,2.686L11.4,4.314C10.829,4.543 10.257,4.8 9.714,5.114C9.257,5.371 8.8,5.686 8.371,6L6.829,5.371L5.229,4.714L4.343,6.2L1.914,10.371L1,11.914L2.429,13L3.714,13.943C3.543,15.114 3.543,16.314 3.714,17.486L2.457,18.429L1.057,19.486L1.943,21L4.257,25L5.143,26.514L6.771,25.829L8.229,25.229C9.143,25.943 10.143,26.514 11.2,26.943L11.4,28.543L11.6,30.314L13.4,30.286L18.171,30.229L19.886,30.2L20.114,28.486L20.343,26.857C20.857,26.657 21.371,26.4 21.857,26.114C22.286,25.886 22.686,25.6 23.086,25.314L24.629,25.971L26.2,26.657L27.114,25.2L29.629,21.143L30.571,19.629L29.143,18.543L27.857,17.543C28.057,16.314 28.057,15.086 27.886,13.857L29.143,12.914L30.543,11.857L29.657,10.343L27.343,6.343L26.429,4.8L24.8,5.486L23.343,6.086C22.486,5.429 21.543,4.857 20.543,4.429L20.371,2.829L20.2,1.057H18.4L13.629,1H11.914Z" />
+</vector>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1d013cf5..b2b60009 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -701,4 +701,7 @@
     <string name="e_contributors_title">/e/ contributors</string>
     <string name="e_supporters_title">/e/ supporters</string>
     <string name="lineageos_contributors_title">LineageOS contributors</string>
+
+    <!-- MicroG -->
+    <string name="microg_title">MicroG</string>
 </resources>
diff --git a/res/xml/microg_settings.xml b/res/xml/microg_settings.xml
new file mode 100644
index 00000000..57a51ee5
--- /dev/null
+++ b/res/xml/microg_settings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 /e/ foundation
+     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="microg_settings"
+    android:title="@string/microg_title" />
diff --git a/res/xml/parts_catalog.xml b/res/xml/parts_catalog.xml
index 98814a0b..1a1f9dac 100644
--- a/res/xml/parts_catalog.xml
+++ b/res/xml/parts_catalog.xml
@@ -106,4 +106,9 @@
           android:title="@string/trust_title"
           android:fragment="org.lineageos.lineageparts.trust.TrustPreferences"
           lineage:xmlRes="@xml/trust_preferences" />
+
+    <part android:key="microg_Settings"
+          android:title="@string/microg_title"
+          android:fragment="org.lineageos.lineageparts.microg.MicrogSettings"
+          lineage:xmlRes="@xml/microg_settings" />
 </parts-catalog>
diff --git a/src/org/lineageos/lineageparts/microg/MicrogSettings.java b/src/org/lineageos/lineageparts/microg/MicrogSettings.java
new file mode 100644
index 00000000..3862ba55
--- /dev/null
+++ b/src/org/lineageos/lineageparts/microg/MicrogSettings.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2022 /e/ foundation
+ *
+ * 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.microg;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.os.Bundle;
+
+import org.lineageos.lineageparts.R;
+import org.lineageos.lineageparts.SettingsPreferenceFragment;
+
+public class MicrogSettings extends SettingsPreferenceFragment {
+
+    private static final String MICROG_PACKAGE_NAME = "com.google.android.gms";
+    private static final String MICROG_ACTIVITY_NAME = "org.microg.gms.ui.SettingsActivity";
+
+    @Override
+    public void onCreate(Bundle savedInstance) {
+        super.onCreate(savedInstance);
+
+        Intent intent = new Intent(Intent.ACTION_MAIN);
+        intent.setComponent(new ComponentName(MICROG_PACKAGE_NAME, MICROG_ACTIVITY_NAME));
+        startActivity(intent);
+
+	Activity activity = getActivity();
+        if (activity != null) {
+          activity.finish();
+        }
+    }
+}
-- 
GitLab


From 3b5e6449cfba24b8c7d03155349c025f9c4330aa Mon Sep 17 00:00:00 2001
From: TheScarastic <warabhishek@e.email>
Date: Tue, 23 Aug 2022 12:05:58 +0000
Subject: [PATCH 05/13] LineageParts: Add openkeychain

---
 AndroidManifest.xml                           | 21 +++++++++
 res/values/strings.xml                        |  3 ++
 res/xml/openkeychain_settings.xml             | 18 ++++++++
 res/xml/parts_catalog.xml                     |  5 +++
 .../openkeychain/OpenKeychainSettings.java    | 45 +++++++++++++++++++
 5 files changed, 92 insertions(+)
 create mode 100644 res/xml/openkeychain_settings.xml
 create mode 100644 src/org/lineageos/lineageparts/openkeychain/OpenKeychainSettings.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3af7298a..9ad4c210 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -210,6 +210,27 @@
                 android:resource="@string/summary_empty" />
         </activity-alias>
 
+        <!-- OpenKeychain settings (Security category) -->
+        <activity-alias
+            android:name=".openkeychain.OpenKeychainSettings"
+            android:label="@string/openkeychain_title"
+            android:targetActivity="PartsActivity">
+            <intent-filter>
+                <action android:name="com.android.settings.action.IA_SETTINGS" />
+                <action android:name="org.lineageos.lineageparts.OPENKEYCHAIN_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data
+                android:name="com.android.settings.category"
+                android:value="com.android.settings.category.ia.security" />
+            <meta-data
+                android:name="com.android.settings.order"
+                android:value="75" />
+            <meta-data
+                android:name="com.android.settings.summary"
+                android:resource="@string/summary_empty" />
+        </activity-alias>
+
         <!-- Trust interface (Privacy category) -->
         <activity-alias
             android:name=".trust.TrustPreferences"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b2b60009..3af2399e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -704,4 +704,7 @@
 
     <!-- MicroG -->
     <string name="microg_title">MicroG</string>
+
+    <!-- OpenKeyChain -->
+    <string name="openkeychain_title">OpenKeychain</string>
 </resources>
diff --git a/res/xml/openkeychain_settings.xml b/res/xml/openkeychain_settings.xml
new file mode 100644
index 00000000..8517cf10
--- /dev/null
+++ b/res/xml/openkeychain_settings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 /e/ foundation
+     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="openkeychain_settings"
+    android:title="@string/openkeychain_title" />
diff --git a/res/xml/parts_catalog.xml b/res/xml/parts_catalog.xml
index 1a1f9dac..60c38bd5 100644
--- a/res/xml/parts_catalog.xml
+++ b/res/xml/parts_catalog.xml
@@ -111,4 +111,9 @@
           android:title="@string/microg_title"
           android:fragment="org.lineageos.lineageparts.microg.MicrogSettings"
           lineage:xmlRes="@xml/microg_settings" />
+
+    <part android:key="openkeychain_Settings"
+          android:title="@string/openkeychain_title"
+          android:fragment="org.lineageos.lineageparts.openkeychain.OpenKeychainSettings"
+          lineage:xmlRes="@xml/openkeychain_settings" />
 </parts-catalog>
diff --git a/src/org/lineageos/lineageparts/openkeychain/OpenKeychainSettings.java b/src/org/lineageos/lineageparts/openkeychain/OpenKeychainSettings.java
new file mode 100644
index 00000000..0990a7a1
--- /dev/null
+++ b/src/org/lineageos/lineageparts/openkeychain/OpenKeychainSettings.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2022 /e/ foundation
+ *
+ * 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.openkeychain;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.os.Bundle;
+
+import org.lineageos.lineageparts.R;
+import org.lineageos.lineageparts.SettingsPreferenceFragment;
+
+public class OpenKeychainSettings extends SettingsPreferenceFragment {
+
+    private static final String OPENKEYCHAIN_PACKAGE_NAME = "org.sufficientlysecure.keychain";
+    private static final String OPENKEYCHAIN_ACTIVITY_NAME = "org.sufficientlysecure.keychain.ui.MainActivity";
+
+    @Override
+    public void onCreate(Bundle savedInstance) {
+        super.onCreate(savedInstance);
+
+        Intent intent = new Intent(Intent.ACTION_MAIN);
+        intent.setComponent(new ComponentName(OPENKEYCHAIN_PACKAGE_NAME, OPENKEYCHAIN_ACTIVITY_NAME));
+        startActivity(intent);
+
+	Activity activity = getActivity();
+        if (activity != null) {
+          activity.finish();
+        }
+    }
+}
-- 
GitLab


From 7ce1f8ce2a5b062e92e256ddffa9703a878152f5 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Wed, 2 Jun 2021 05:58:10 +0200
Subject: [PATCH 06/13] LineageParts: Remove LineageOS stats collection support
 completely

Signed-off-by: Aayush Gupta <theimpulson@e.email>
Signed-off-by: althafvly <althafvly@gmail.com>
---
 AndroidManifest.xml                           |  25 ---
 proguard.flags                                |   1 -
 res/values/config.xml                         |   3 -
 res/values/strings.xml                        |  22 --
 res/xml/anonymous_stats.xml                   |  34 ---
 res/xml/parts_catalog.xml                     |   5 -
 res/xml/preview_data.xml                      |  52 -----
 res/xml/trust_preferences.xml                 |   3 -
 .../lineagestats/AnonymousStats.java          |  74 -------
 .../lineagestats/PreviewData.java             |  50 -----
 .../lineagestats/ReportingService.java        |  84 --------
 .../lineagestats/ReportingServiceManager.java | 107 ----------
 .../lineagestats/StatsUploadJobService.java   | 200 ------------------
 .../lineageparts/lineagestats/Utilities.java  | 116 ----------
 14 files changed, 776 deletions(-)
 delete mode 100644 res/xml/anonymous_stats.xml
 delete mode 100644 res/xml/preview_data.xml
 delete mode 100644 src/org/lineageos/lineageparts/lineagestats/AnonymousStats.java
 delete mode 100644 src/org/lineageos/lineageparts/lineagestats/PreviewData.java
 delete mode 100644 src/org/lineageos/lineageparts/lineagestats/ReportingService.java
 delete mode 100644 src/org/lineageos/lineageparts/lineagestats/ReportingServiceManager.java
 delete mode 100644 src/org/lineageos/lineageparts/lineagestats/StatsUploadJobService.java
 delete mode 100644 src/org/lineageos/lineageparts/lineagestats/Utilities.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9ad4c210..218343a2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -273,31 +273,6 @@
                 android:resource="@string/summary_empty" />
         </activity-alias>
 
-        <!-- Anonymous Statistics -->
-        <receiver android:name=".lineagestats.ReportingServiceManager"
-            android:enabled="true"
-            android:exported="false"
-            android:label="ReportingServiceManager">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <action android:name="org.lineageos.lineageparts.action.TRIGGER_REPORT_METRICS" />
-            </intent-filter>
-        </receiver>
-
-        <service android:label="ReportingService"
-            android:enabled="true"
-            android:exported="false"
-            android:name=".lineagestats.ReportingService">
-        </service>
-
-        <service android:name=".lineagestats.StatsUploadJobService"
-                 android:permission="android.permission.BIND_JOB_SERVICE" />
-
-        <service android:name=".lineagestats.ReportingService"
-                 android:label="ReportingService"
-                 android:enabled="true"
-                 android:exported="false" />
-
         <!-- Weather settings -->
         <activity-alias
             android:name=".weather.WeatherServiceSettings"
diff --git a/proguard.flags b/proguard.flags
index 9de64950..911b751c 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -7,7 +7,6 @@
 -keep class org.lineageos.lineageparts.gestures.*
 -keep class org.lineageos.lineageparts.hardware.*
 -keep class org.lineageos.lineageparts.input.*
--keep class org.lineageos.lineageparts.lineagestats.*
 -keep class org.lineageos.lineageparts.livedisplay.*
 -keep class org.lineageos.lineageparts.notificationlight.*
 -keep class org.lineageos.lineageparts.power.*
diff --git a/res/values/config.xml b/res/values/config.xml
index 4236b278..eed044a3 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">
 
-    <!-- Metrics server endpoint -->
-    <string name="stats_lineage_url">https://stats.lineageos.org/api/v1/stats</string>
-
     <!-- When true, weather options will be displayed in settings dashboard -->
     <bool name="config_showWeatherMenu">true</bool>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3af2399e..8d5e2d86 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -533,28 +533,6 @@
                  <b>Total commits:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
                  <b>Last update:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
 
-    <!-- Anonymous Statistics #Lineage -->
-    <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-    <string name="anonymous_statistics_title">LineageOS statistics</string>
-    <string name="anonymous_statistics_summary">Help make LineageOS better by opting into anonymous statistics reporting</string>
-    <string name="anonymous_statistics_warning_title">About</string>
-    <string name="anonymous_statistics_warning">Opting into LineageOS Statistics will allow non-personal data to be submitted to the
-        developers of LineageOS to track unique installations across devices. The information submitted includes an unique identifier,
-        which does not compromise your privacy or personal data. The data is submitted during each boot.\n\nFor an example of the data that is submitted, tap on Preview Data.</string>
-    <string name="enable_reporting_title">Enable reporting</string>
-    <string name="preview_data_title">Preview data</string>
-    <string name="view_stats_title">View stats</string>
-    <string name="anonymous_learn_more">Learn more</string>
-
-    <!-- Anonymous Statistics - Preview -->
-    <string name="preview_id_title">Unique ID</string>
-    <string name="preview_device_title">Device</string>
-    <string name="preview_version_title">Version</string>
-    <string name="preview_country_title">Country</string>
-    <string name="preview_carrier_title">Carrier</string>
-    <string name="stats_collection_title">Stats collection</string>
-    <string name="stats_collection_summary">Allow installation metrics and device statistics to be collected</string>
-
     <!-- Display : Rotation  -->
     <string name="accelerometer_title">Auto-rotate screen</string>
     <string name="display_rotation_title">Rotation settings</string>
diff --git a/res/xml/anonymous_stats.xml b/res/xml/anonymous_stats.xml
deleted file mode 100644
index 04d576c0..00000000
--- a/res/xml/anonymous_stats.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2016 The CyanogenMod Project
-                   2017,2021 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.
--->
-
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:key="lineagestats"
-    android:title="@string/anonymous_statistics_title">
-
-    <lineageos.preference.LineageSecureSettingSwitchPreference
-            android:key="stats_collection"
-            android:title="@string/stats_collection_title"
-            android:summary="@string/stats_collection_summary"
-            android:defaultValue="true" />
-
-    <Preference
-        android:title="@string/preview_data_title"
-        android:fragment="org.lineageos.lineageparts.lineagestats.PreviewData" />
-
-</PreferenceScreen>
diff --git a/res/xml/parts_catalog.xml b/res/xml/parts_catalog.xml
index 60c38bd5..e9298fdd 100644
--- a/res/xml/parts_catalog.xml
+++ b/res/xml/parts_catalog.xml
@@ -70,11 +70,6 @@
           android:fragment="org.lineageos.lineageparts.statusbar.StatusBarSettings"
           lineage:xmlRes="@xml/status_bar_settings" />
 
-    <part android:key="lineagestats"
-          android:title="@string/anonymous_statistics_title"
-          android:fragment="org.lineageos.lineageparts.lineagestats.AnonymousStats"
-          lineage:xmlRes="@xml/anonymous_stats" />
-
     <part android:key="power_menu"
           android:title="@string/power_menu_title"
           android:fragment="org.lineageos.lineageparts.input.PowerMenuActions"
diff --git a/res/xml/preview_data.xml b/res/xml/preview_data.xml
deleted file mode 100644
index 025524ca..00000000
--- a/res/xml/preview_data.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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:title="@string/preview_data_title">
-
-    <Preference
-        android:key="preview_id"
-        style="?android:preferenceInformationStyle"
-        android:title="@string/preview_id_title"
-        android:summary="%s" />
-
-    <Preference
-        android:key="preview_device"
-        style="?android:preferenceInformationStyle"
-        android:title="@string/preview_device_title"
-        android:summary="%s" />
-
-    <Preference
-        android:key="preview_version"
-        style="?android:preferenceInformationStyle"
-        android:title="@string/preview_version_title"
-        android:summary="%s" />
-
-    <Preference
-        android:key="preview_country"
-        style="?android:preferenceInformationStyle"
-        android:title="@string/preview_country_title"
-        android:summary="%s" />
-
-    <Preference
-        android:key="preview_carrier"
-        style="?android:preferenceInformationStyle"
-        android:title="@string/preview_carrier_title"
-        android:summary="%s" />
-
-</PreferenceScreen>
-
diff --git a/res/xml/trust_preferences.xml b/res/xml/trust_preferences.xml
index 7cebff4a..3b890304 100644
--- a/res/xml/trust_preferences.xml
+++ b/res/xml/trust_preferences.xml
@@ -47,9 +47,6 @@
             android:entryValues="@array/trust_restrict_usb_values"
             android:defaultValue="0" />
 
-        <lineageos.preference.LineagePartsPreference
-            android:key="lineagestats" />
-
         <ListPreference
             android:key="sms_security_check_limit"
             android:defaultValue="30"
diff --git a/src/org/lineageos/lineageparts/lineagestats/AnonymousStats.java b/src/org/lineageos/lineageparts/lineagestats/AnonymousStats.java
deleted file mode 100644
index 114872fa..00000000
--- a/src/org/lineageos/lineageparts/lineagestats/AnonymousStats.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2015 The CyanogenMod Project
- * Copyright (C) 2022 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.lineagestats;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-
-import org.lineageos.lineageparts.R;
-import org.lineageos.lineageparts.SettingsPreferenceFragment;
-
-public class AnonymousStats extends SettingsPreferenceFragment {
-
-    private static final String PREF_FILE_NAME = "LineageStats";
-    static final String ANONYMOUS_OPT_IN = "pref_anonymous_opt_in";
-    static final String ANONYMOUS_LAST_CHECKED = "pref_anonymous_checked_in";
-
-    static final String KEY_LAST_JOB_ID = "last_job_id";
-    static final int QUEUE_MAX_THRESHOLD = 1000;
-
-    public static SharedPreferences getPreferences(Context context) {
-        return context.getSharedPreferences(PREF_FILE_NAME, 0);
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        addPreferencesFromResource(R.xml.anonymous_stats);
-    }
-
-    public static void updateLastSynced(Context context) {
-        getPreferences(context)
-                .edit()
-                .putLong(ANONYMOUS_LAST_CHECKED,System.currentTimeMillis())
-                .commit();
-    }
-
-    public static int getLastJobId(Context context) {
-        return getPreferences(context).getInt(KEY_LAST_JOB_ID, 0);
-    }
-
-    private static void setLastJobId(Context context, int id) {
-        getPreferences(context)
-                .edit()
-                .putInt(KEY_LAST_JOB_ID, id)
-                .commit();
-    }
-
-    public static int getNextJobId(Context context) {
-        int lastId = getLastJobId(context);
-        if (lastId >= QUEUE_MAX_THRESHOLD) {
-            lastId = 1;
-        } else {
-            lastId += 1;
-        }
-        setLastJobId(context, lastId);
-        return lastId;
-    }
-}
diff --git a/src/org/lineageos/lineageparts/lineagestats/PreviewData.java b/src/org/lineageos/lineageparts/lineagestats/PreviewData.java
deleted file mode 100644
index d0c3aa2d..00000000
--- a/src/org/lineageos/lineageparts/lineagestats/PreviewData.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2012 The CyanogenMod Project
- *               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.
- */
-
-package org.lineageos.lineageparts.lineagestats;
-
-import android.content.Context;
-import android.os.Bundle;
-
-import androidx.preference.PreferenceScreen;
-
-import org.lineageos.lineageparts.R;
-import org.lineageos.lineageparts.SettingsPreferenceFragment;
-
-public class PreviewData extends SettingsPreferenceFragment {
-    private static final String UNIQUE_ID = "preview_id";
-    private static final String DEVICE = "preview_device";
-    private static final String VERSION = "preview_version";
-    private static final String COUNTRY = "preview_country";
-    private static final String CARRIER = "preview_carrier";
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        addPreferencesFromResource(R.xml.preview_data);
-
-        final PreferenceScreen prefSet = getPreferenceScreen();
-        final Context context = getActivity();
-
-        prefSet.findPreference(UNIQUE_ID).setSummary(Utilities.getUniqueID(context));
-        prefSet.findPreference(DEVICE).setSummary(Utilities.getDevice());
-        prefSet.findPreference(VERSION).setSummary(Utilities.getModVersion());
-        prefSet.findPreference(COUNTRY).setSummary(Utilities.getCountryCode(context));
-        prefSet.findPreference(CARRIER).setSummary(Utilities.getCarrier(context));
-    }
-}
diff --git a/src/org/lineageos/lineageparts/lineagestats/ReportingService.java b/src/org/lineageos/lineageparts/lineagestats/ReportingService.java
deleted file mode 100644
index 44279b3c..00000000
--- a/src/org/lineageos/lineageparts/lineagestats/ReportingService.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2015 The CyanogenMod Project
- *               2017-2022 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.lineagestats;
-
-import android.app.IntentService;
-import android.app.job.JobInfo;
-import android.app.job.JobScheduler;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.os.PersistableBundle;
-import android.util.Log;
-
-public class ReportingService extends IntentService {
-    /* package */ static final String TAG = "LineageStats";
-    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
-
-    public ReportingService() {
-        super(ReportingService.class.getSimpleName());
-    }
-
-    @Override
-    protected void onHandleIntent(Intent intent) {
-        JobScheduler js = getSystemService(JobScheduler.class);
-
-        Context context = getApplicationContext();
-
-        String deviceId = Utilities.getUniqueID(context);
-        String deviceName = Utilities.getDevice();
-        String deviceVersion = Utilities.getModVersion();
-        String deviceCountry = Utilities.getCountryCode(context);
-        String deviceCarrier = Utilities.getCarrier(context);
-        String deviceCarrierId = Utilities.getCarrierId(context);
-
-        final int lineageOldJobId = AnonymousStats.getLastJobId(context);
-        final int lineageOrgJobId = AnonymousStats.getNextJobId(context);
-
-        if (DEBUG) Log.d(TAG, "scheduling job id: " + lineageOrgJobId);
-
-        PersistableBundle lineageBundle = new PersistableBundle();
-        lineageBundle.putString(StatsUploadJobService.KEY_DEVICE_NAME, deviceName);
-        lineageBundle.putString(StatsUploadJobService.KEY_UNIQUE_ID, deviceId);
-        lineageBundle.putString(StatsUploadJobService.KEY_VERSION, deviceVersion);
-        lineageBundle.putString(StatsUploadJobService.KEY_COUNTRY, deviceCountry);
-        lineageBundle.putString(StatsUploadJobService.KEY_CARRIER, deviceCarrier);
-        lineageBundle.putString(StatsUploadJobService.KEY_CARRIER_ID, deviceCarrierId);
-        lineageBundle.putLong(StatsUploadJobService.KEY_TIMESTAMP, System.currentTimeMillis());
-
-        // set job types
-        lineageBundle.putInt(StatsUploadJobService.KEY_JOB_TYPE,
-                StatsUploadJobService.JOB_TYPE_LINEAGEORG);
-
-        // schedule lineage stats upload
-        js.schedule(new JobInfo.Builder(lineageOrgJobId, new ComponentName(getPackageName(),
-                StatsUploadJobService.class.getName()))
-                .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
-                .setMinimumLatency(1000)
-                .setExtras(lineageBundle)
-                .setPersisted(true)
-                .build());
-
-        // cancel old job in case it didn't run yet
-        js.cancel(lineageOldJobId);
-
-        // reschedule
-        AnonymousStats.updateLastSynced(this);
-        ReportingServiceManager.setAlarm(this);
-    }
-}
diff --git a/src/org/lineageos/lineageparts/lineagestats/ReportingServiceManager.java b/src/org/lineageos/lineageparts/lineagestats/ReportingServiceManager.java
deleted file mode 100644
index 6faeb897..00000000
--- a/src/org/lineageos/lineageparts/lineagestats/ReportingServiceManager.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (C) 2012 The CyanogenMod Project
- *               2017,2020-2021 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.lineagestats;
-
-import android.app.AlarmManager;
-import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.UserHandle;
-import android.util.Log;
-
-public class ReportingServiceManager extends BroadcastReceiver {
-    private static final long MILLIS_PER_HOUR = 60L * 60L * 1000L;
-    private static final long MILLIS_PER_DAY = 24L * MILLIS_PER_HOUR;
-    private static final long UPDATE_INTERVAL = 1L * MILLIS_PER_DAY;
-
-    private static final String TAG = ReportingServiceManager.class.getSimpleName();
-
-    public static final String ACTION_LAUNCH_SERVICE =
-            "org.lineageos.lineageparts.action.TRIGGER_REPORT_METRICS";
-    public static final String EXTRA_FORCE = "force";
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        if (intent.getAction().equals(Intent.ACTION_BOOT_COMPLETED)) {
-            setAlarm(context);
-        } else if (intent.getAction().equals(ACTION_LAUNCH_SERVICE)){
-            launchService(context, intent.getBooleanExtra(EXTRA_FORCE, false));
-        }
-    }
-
-    public static void setAlarm(Context context) {
-        SharedPreferences prefs = AnonymousStats.getPreferences(context);
-        if (prefs.contains(AnonymousStats.ANONYMOUS_OPT_IN)) {
-            migrate(context, prefs);
-        }
-        if (!Utilities.isStatsCollectionEnabled(context)) {
-            return;
-        }
-        long lastSynced = prefs.getLong(AnonymousStats.ANONYMOUS_LAST_CHECKED, 0);
-        if (lastSynced == 0) {
-            launchService(context, true); // service will reschedule the next alarm
-            return;
-        }
-        long millisFromNow = (lastSynced + UPDATE_INTERVAL) - System.currentTimeMillis();
-
-        Intent intent = new Intent(ACTION_LAUNCH_SERVICE);
-        intent.setClass(context, ReportingServiceManager.class);
-
-        AlarmManager alarmManager = context.getSystemService(AlarmManager.class);
-        alarmManager.set(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + millisFromNow,
-                PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_IMMUTABLE));
-        Log.d(TAG, "Next sync attempt in : "
-                + (millisFromNow / MILLIS_PER_HOUR) + " hours");
-    }
-
-    public static void launchService(Context context, boolean force) {
-        SharedPreferences prefs = AnonymousStats.getPreferences(context);
-
-        if (!Utilities.isStatsCollectionEnabled(context)) {
-            return;
-        }
-
-        if (!force) {
-            long lastSynced = prefs.getLong(AnonymousStats.ANONYMOUS_LAST_CHECKED, 0);
-            if (lastSynced == 0) {
-                setAlarm(context);
-                return;
-            }
-            long timeElapsed = System.currentTimeMillis() - lastSynced;
-            if (timeElapsed < UPDATE_INTERVAL) {
-                long timeLeft = UPDATE_INTERVAL - timeElapsed;
-                Log.d(TAG, "Waiting for next sync : "
-                        + timeLeft / MILLIS_PER_HOUR + " hours");
-                return;
-            }
-        }
-
-        Intent intent = new Intent();
-        intent.setClass(context, ReportingService.class);
-        context.startServiceAsUser(intent, UserHandle.OWNER);
-    }
-
-    private static void migrate(Context context, SharedPreferences prefs) {
-        Utilities.setStatsCollectionEnabled(context,
-                prefs.getBoolean(AnonymousStats.ANONYMOUS_OPT_IN, true));
-        prefs.edit().remove(AnonymousStats.ANONYMOUS_OPT_IN).commit();
-    }
-
-}
diff --git a/src/org/lineageos/lineageparts/lineagestats/StatsUploadJobService.java b/src/org/lineageos/lineageparts/lineagestats/StatsUploadJobService.java
deleted file mode 100644
index bfe74137..00000000
--- a/src/org/lineageos/lineageparts/lineagestats/StatsUploadJobService.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (C) 2015 The CyanogenMod Project
- *               2017-2022 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.lineagestats;
-
-import android.app.job.JobParameters;
-import android.app.job.JobService;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.PersistableBundle;
-import android.util.ArrayMap;
-import android.util.Log;
-import org.lineageos.lineageparts.R;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.Map;
-
-public class StatsUploadJobService extends JobService {
-
-    private static final String TAG = StatsUploadJobService.class.getSimpleName();
-    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
-
-    public static final String KEY_JOB_TYPE = "job_type";
-    public static final int JOB_TYPE_LINEAGEORG = 1;
-
-    public static final String KEY_UNIQUE_ID = "uniqueId";
-    public static final String KEY_DEVICE_NAME = "deviceName";
-    public static final String KEY_VERSION = "version";
-    public static final String KEY_COUNTRY = "country";
-    public static final String KEY_CARRIER = "carrier";
-    public static final String KEY_CARRIER_ID = "carrierId";
-    public static final String KEY_TIMESTAMP = "timeStamp";
-
-    private final Map<JobParameters, StatsUploadTask> mCurrentJobs
-            = Collections.synchronizedMap(new ArrayMap<JobParameters, StatsUploadTask>());
-
-    @Override
-    public boolean onStartJob(JobParameters jobParameters) {
-        if (DEBUG)
-            Log.d(TAG, "onStartJob() called with " + "jobParameters = [" + jobParameters + "]");
-
-        if (!Utilities.isStatsCollectionEnabled(this)) {
-            return false;
-        }
-
-        final StatsUploadTask uploadTask = new StatsUploadTask(jobParameters);
-        mCurrentJobs.put(jobParameters, uploadTask);
-        uploadTask.execute((Void) null);
-        return true;
-    }
-
-    @Override
-    public boolean onStopJob(JobParameters jobParameters) {
-        if (DEBUG)
-            Log.d(TAG, "onStopJob() called with " + "jobParameters = [" + jobParameters + "]");
-
-        final StatsUploadTask cancelledJob;
-        cancelledJob = mCurrentJobs.remove(jobParameters);
-
-        if (cancelledJob != null) {
-            // cancel the ongoing background task
-            cancelledJob.cancel(true);
-            return true; // reschedule
-        }
-
-        return false;
-    }
-
-    private class StatsUploadTask extends AsyncTask<Void, Void, Boolean> {
-
-        private final JobParameters mJobParams;
-
-        public StatsUploadTask(JobParameters jobParams) {
-            this.mJobParams = jobParams;
-        }
-
-        @Override
-        protected Boolean doInBackground(Void... params) {
-
-            PersistableBundle extras = mJobParams.getExtras();
-
-            String deviceId = extras.getString(KEY_UNIQUE_ID);
-            String deviceName = extras.getString(KEY_DEVICE_NAME);
-            String deviceVersion = extras.getString(KEY_VERSION);
-            String deviceCountry = extras.getString(KEY_COUNTRY);
-            String deviceCarrier = extras.getString(KEY_CARRIER);
-            String deviceCarrierId = extras.getString(KEY_CARRIER_ID);
-
-            boolean success = false;
-            int jobType = extras.getInt(KEY_JOB_TYPE, -1);
-            if (!isCancelled()) {
-                switch (jobType) {
-                    case JOB_TYPE_LINEAGEORG:
-                        try {
-                            JSONObject json = buildStatsRequest(deviceId, deviceName,
-                                    deviceVersion, deviceCountry, deviceCarrier, deviceCarrierId);
-                            success = uploadToLineage(json);
-                        } catch (IOException | JSONException e) {
-                            Log.e(TAG, "Could not upload stats checkin to community server", e);
-                            success = false;
-                        }
-                        break;
-                }
-            }
-            if (DEBUG)
-                Log.d(TAG, "job id " + mJobParams.getJobId() + ", has finished with success="
-                        + success);
-            return success;
-        }
-
-        @Override
-        protected void onPostExecute(Boolean success) {
-            mCurrentJobs.remove(mJobParams);
-            jobFinished(mJobParams, !success);
-        }
-    }
-
-    private JSONObject buildStatsRequest(String deviceId, String deviceName, String deviceVersion,
-                                         String deviceCountry, String deviceCarrier,
-                                         String deviceCarrierId) throws JSONException {
-        JSONObject request = new JSONObject();
-        request.put("device_hash", deviceId);
-        request.put("device_name", deviceName);
-        request.put("device_version", deviceVersion);
-        request.put("device_country", deviceCountry);
-        request.put("device_carrier", deviceCarrier);
-        request.put("device_carrier_id", deviceCarrierId);
-        return request;
-    }
-
-    private boolean uploadToLineage(JSONObject json) throws IOException {
-        final Uri uri = Uri.parse(getString(R.string.stats_lineage_url));
-        URL url = new URL(uri.toString());
-        HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
-        try {
-            urlConnection.setInstanceFollowRedirects(true);
-            urlConnection.setDoOutput(true);
-            urlConnection.setDoInput(true);
-            urlConnection.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
-
-            OutputStream os = urlConnection.getOutputStream();
-            os.write(json.toString().getBytes(StandardCharsets.UTF_8));
-            os.close();
-
-            final int responseCode = urlConnection.getResponseCode();
-            if (DEBUG) Log.d(TAG, "lineage server response code=" + responseCode);
-            final boolean success = responseCode == HttpURLConnection.HTTP_OK;
-            if (!success) {
-                Log.w(TAG, "failed sending, server returned: " + getResponse(urlConnection));
-            }
-            return success;
-        } finally {
-            urlConnection.disconnect();
-        }
-
-    }
-
-    private String getResponse(HttpURLConnection httpUrlConnection)
-            throws IOException {
-        InputStream responseStream = new BufferedInputStream(httpUrlConnection.getErrorStream());
-
-        BufferedReader responseStreamReader = new BufferedReader(
-                new InputStreamReader(responseStream));
-        String line = "";
-        StringBuilder stringBuilder = new StringBuilder();
-        while ((line = responseStreamReader.readLine()) != null) {
-            stringBuilder.append(line).append("\n");
-        }
-        responseStreamReader.close();
-        responseStream.close();
-
-        return stringBuilder.toString();
-    }
-
-}
diff --git a/src/org/lineageos/lineageparts/lineagestats/Utilities.java b/src/org/lineageos/lineageparts/lineagestats/Utilities.java
deleted file mode 100644
index 9757367a..00000000
--- a/src/org/lineageos/lineageparts/lineagestats/Utilities.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (C) 2012 The CyanogenMod Project
- * Copyright (C) 2021-2022 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.lineagestats;
-
-import android.content.Context;
-import android.os.Build;
-import android.os.SystemProperties;
-import android.provider.Settings;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-
-import lineageos.providers.LineageSettings;
-
-import java.math.BigInteger;
-import java.security.MessageDigest;
-import java.util.Locale;
-
-public class Utilities {
-    public static String getUniqueID(Context context) {
-        final String id = Settings.Secure.getString(context.getContentResolver(),
-                Settings.Secure.ANDROID_ID);
-        return digest(context.getPackageName() + id);
-    }
-
-    public static String getCarrier(Context context) {
-        TelephonyManager tm = context.getSystemService(TelephonyManager.class);
-        String carrier = tm.getNetworkOperatorName();
-        if (TextUtils.isEmpty(carrier)) {
-            String simOperator = tm.getSimOperatorName();
-            if (!TextUtils.isEmpty(simOperator)) {
-                carrier = simOperator;
-            } else {
-                carrier = "Unknown";
-            }
-        }
-        return carrier;
-    }
-
-    public static String getCarrierId(Context context) {
-        TelephonyManager tm = context.getSystemService(TelephonyManager.class);
-        String carrierId = tm.getNetworkOperator();
-        if (TextUtils.isEmpty(carrierId)) {
-            carrierId = "0";
-        }
-        return carrierId;
-    }
-
-    public static String getCountryCode(Context context) {
-        TelephonyManager tm = context.getSystemService(TelephonyManager.class);
-        String countryCode = tm.getNetworkCountryIso().toUpperCase();
-        if (TextUtils.isEmpty(countryCode) || isCdmaPhone(tm)) {
-            String localeCountryCode = Locale.getDefault().getCountry();
-            if (localeCountryCode.length() == 2) {
-                countryCode = localeCountryCode;
-            } else {
-                countryCode = "Unknown";
-            }
-        }
-        return countryCode;
-    }
-
-    public static String getDevice() {
-        return SystemProperties.get("ro.lineage.device", Build.PRODUCT);
-    }
-
-    public static String getModVersion() {
-        return SystemProperties.get("ro.lineage.version", Build.DISPLAY);
-    }
-
-    public static String digest(String input) {
-        try {
-            MessageDigest md = MessageDigest.getInstance("SHA-256");
-            return new BigInteger(1, md.digest(input.getBytes())).toString(16).toUpperCase();
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    /**
-     * Check to see if global stats are enabled.
-     * @return Whether or not stats collection is enabled.
-     */
-    public static boolean isStatsCollectionEnabled(Context context) {
-        return LineageSettings.Secure.getInt(context.getContentResolver(),
-                LineageSettings.Secure.STATS_COLLECTION, 1) != 0;
-    }
-
-    /**
-     * Enabled or disable stats collection
-     * @param enabled Boolean that sets collection being enabled.
-     */
-    public static void setStatsCollectionEnabled(Context context, boolean enabled) {
-        int enable = (enabled) ? 1 : 0;
-        LineageSettings.Secure.putInt(context.getContentResolver(),
-                LineageSettings.Secure.STATS_COLLECTION, enable);
-    }
-
-    private static boolean isCdmaPhone(TelephonyManager tm) {
-        return tm != null && tm.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA;
-    }
-}
-- 
GitLab


From 4fb261b1fd6085303320d8b3e74eab41409e3bb6 Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com>
Date: Thu, 20 Oct 2022 13:20:28 +0530
Subject: [PATCH 07/13] parts: Fix microG branding

---
 res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8d5e2d86..5fe09e0a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -680,8 +680,8 @@
     <string name="e_supporters_title">/e/ supporters</string>
     <string name="lineageos_contributors_title">LineageOS contributors</string>
 
-    <!-- MicroG -->
-    <string name="microg_title">MicroG</string>
+    <!-- microG -->
+    <string name="microg_title">microG</string>
 
     <!-- OpenKeyChain -->
     <string name="openkeychain_title">OpenKeychain</string>
-- 
GitLab


From 144c32d710f6056a66ed2fff7c4b8801b8c647d0 Mon Sep 17 00:00:00 2001
From: Yash Garg <yashgarg@murena.io>
Date: Mon, 24 Oct 2022 07:11:23 +0000
Subject: [PATCH 08/13] Remove split screen option from recents long press
 actions (S)

---
 res/values/arrays.xml                                    | 2 --
 src/org/lineageos/lineageparts/input/ButtonSettings.java | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index d65471fe..6fc7fa72 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -62,7 +62,6 @@
         <item>@string/hardware_keys_action_launch_camera</item>
         <item>@string/hardware_keys_action_sleep</item>
         <item>@string/hardware_keys_action_last_app</item>
-        <item>@string/hardware_keys_action_split_screen</item>
         <item>@string/hardware_keys_action_kill_app</item>
     </string-array>
 
@@ -76,7 +75,6 @@
         <item>6</item>
         <item>7</item>
         <item>8</item>
-        <item>9</item>
         <item>10</item>
     </string-array>
 
diff --git a/src/org/lineageos/lineageparts/input/ButtonSettings.java b/src/org/lineageos/lineageparts/input/ButtonSettings.java
index a6fa54f4..7864681c 100644
--- a/src/org/lineageos/lineageparts/input/ButtonSettings.java
+++ b/src/org/lineageos/lineageparts/input/ButtonSettings.java
@@ -227,8 +227,7 @@ public class ButtonSettings extends SettingsPreferenceFragment
                 org.lineageos.platform.internal.R.integer.config_longPressOnHomeBehavior));
         Action defaultHomeDoubleTapAction = Action.fromIntSafe(res.getInteger(
                 org.lineageos.platform.internal.R.integer.config_doubleTapOnHomeBehavior));
-        Action defaultAppSwitchLongPressAction = Action.fromIntSafe(res.getInteger(
-                org.lineageos.platform.internal.R.integer.config_longPressOnAppSwitchBehavior));
+        Action defaultAppSwitchLongPressAction = Action.fromIntSafe(0);
         Action backLongPressAction = Action.fromSettings(resolver,
                 LineageSettings.System.KEY_BACK_LONG_PRESS_ACTION,
                 defaultBackLongPressAction);
-- 
GitLab


From 7d990a3bc46bf412ff62e9fd0e276d9449694af0 Mon Sep 17 00:00:00 2001
From: Yash Garg <yashgarg@murena.io>
Date: Thu, 27 Oct 2022 12:16:56 +0000
Subject: [PATCH 09/13] weather: remove temperature unit selection preference
 category (S)

---
 .../lineageparts/weather/WeatherServiceSettings.java       | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/org/lineageos/lineageparts/weather/WeatherServiceSettings.java b/src/org/lineageos/lineageparts/weather/WeatherServiceSettings.java
index 94b822f2..07f40dd3 100644
--- a/src/org/lineageos/lineageparts/weather/WeatherServiceSettings.java
+++ b/src/org/lineageos/lineageparts/weather/WeatherServiceSettings.java
@@ -100,7 +100,8 @@ public class WeatherServiceSettings extends SettingsPreferenceFragment
         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));
     }
 
@@ -206,9 +207,6 @@ public class WeatherServiceSettings extends SettingsPreferenceFragment
 
         final PreferenceScreen ps = getPreferenceScreen();
         if (!weatherProviderServiceInfos.isEmpty()) {
-            if (ps.findPreference(PREFERENCE_GENERAL) == null) {
-                ps.addPreference(mGeneralSettingsCategory);
-            }
             if (ps.findPreference(PREFERENCE_PROVIDERS) == null) {
                 ps.addPreference(mProvidersCategory);
             }
@@ -232,7 +230,6 @@ public class WeatherServiceSettings extends SettingsPreferenceFragment
             mProvidersCategory.addPreference(addServicePreference);
 
         } else {
-            ps.removePreference(mGeneralSettingsCategory);
             ps.removePreference(mProvidersCategory);
         }
 
-- 
GitLab


From 6cf6dc91e37e49c49d57db487d0031ea6782621c Mon Sep 17 00:00:00 2001
From: Yash Garg <yashgarg@murena.io>
Date: Fri, 11 Nov 2022 12:49:15 +0000
Subject: [PATCH 10/13] ButtonSettings: use config_longPressOnAppSwitchBehavior
 key for default action (S)

---
 src/org/lineageos/lineageparts/input/ButtonSettings.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/org/lineageos/lineageparts/input/ButtonSettings.java b/src/org/lineageos/lineageparts/input/ButtonSettings.java
index 7864681c..a6fa54f4 100644
--- a/src/org/lineageos/lineageparts/input/ButtonSettings.java
+++ b/src/org/lineageos/lineageparts/input/ButtonSettings.java
@@ -227,7 +227,8 @@ public class ButtonSettings extends SettingsPreferenceFragment
                 org.lineageos.platform.internal.R.integer.config_longPressOnHomeBehavior));
         Action defaultHomeDoubleTapAction = Action.fromIntSafe(res.getInteger(
                 org.lineageos.platform.internal.R.integer.config_doubleTapOnHomeBehavior));
-        Action defaultAppSwitchLongPressAction = Action.fromIntSafe(0);
+        Action defaultAppSwitchLongPressAction = Action.fromIntSafe(res.getInteger(
+                org.lineageos.platform.internal.R.integer.config_longPressOnAppSwitchBehavior));
         Action backLongPressAction = Action.fromSettings(resolver,
                 LineageSettings.System.KEY_BACK_LONG_PRESS_ACTION,
                 defaultBackLongPressAction);
-- 
GitLab


From 887c2913d5bad124106d7a7f51bebec909575597 Mon Sep 17 00:00:00 2001
From: Yash Garg <yashgarg@murena.io>
Date: Thu, 1 Dec 2022 10:09:40 +0000
Subject: [PATCH 11/13] Set app switch action to nothing if it's set to split
 screen (S)

---
 src/org/lineageos/lineageparts/BootReceiver.java     |  1 +
 .../lineageos/lineageparts/input/ButtonSettings.java | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/org/lineageos/lineageparts/BootReceiver.java b/src/org/lineageos/lineageparts/BootReceiver.java
index 6b0ab872..b8d62bcb 100644
--- a/src/org/lineageos/lineageparts/BootReceiver.java
+++ b/src/org/lineageos/lineageparts/BootReceiver.java
@@ -41,6 +41,7 @@ public class BootReceiver extends BroadcastReceiver {
             setRestoredTunable(ctx);
         }
 
+        ButtonSettings.setLongPressActionToNothing(ctx);
         ButtonSettings.restoreKeySwapper(ctx);
         TouchscreenGestureSettings.restoreTouchscreenGestureStates(ctx);
 
diff --git a/src/org/lineageos/lineageparts/input/ButtonSettings.java b/src/org/lineageos/lineageparts/input/ButtonSettings.java
index a6fa54f4..6f3af12c 100644
--- a/src/org/lineageos/lineageparts/input/ButtonSettings.java
+++ b/src/org/lineageos/lineageparts/input/ButtonSettings.java
@@ -840,6 +840,18 @@ public class ButtonSettings extends SettingsPreferenceFragment
                 preferences.getBoolean(KEY_SWAP_CAPACITIVE_KEYS, false));
     }
 
+    public static void setLongPressActionToNothing(Context context) {
+        final int action = LineageSettings.System.getIntForUser(context.getContentResolver(),
+                LineageSettings.System.KEY_APP_SWITCH_LONG_PRESS_ACTION, context.getResources().getInteger(
+                org.lineageos.platform.internal.R.integer.config_longPressOnAppSwitchBehavior),
+                UserHandle.USER_CURRENT);
+
+        if (action == Action.SPLIT_SCREEN.ordinal()) {
+            LineageSettings.System.putInt(context.getContentResolver(),
+                LineageSettings.System.KEY_APP_SWITCH_LONG_PRESS_ACTION, Action.NOTHING.ordinal());
+        }
+    }
+
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {
         if (preference == mSwapVolumeButtons) {
-- 
GitLab


From fdc8ddc7d7a8d23f757b53a97855fa8be4cc52ac Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Fri, 17 Mar 2023 21:05:36 +0530
Subject: [PATCH 12/13] Apply our color palette on trust welcome screen

---
 res/values/styles.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values/styles.xml b/res/values/styles.xml
index aaf7bdfa..33aec0e6 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -42,7 +42,7 @@
     </style>
 
     <style name="OnBoardingStyle" parent="Theme.AppCompat.DayNight">
-        <item name="colorAccent">#167c80</item>
+        <item name="colorAccent">@*android:color/accent_device_default</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
-- 
GitLab


From b4f277f8e785ab9d6c9bee2207257480074e6ee5 Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Wed, 22 Mar 2023 18:26:24 +0530
Subject: [PATCH 13/13] Port translation changes from Android S

---
 res/values-ar/strings.xml |  7 ++-----
 res/values-de/strings.xml | 21 ++++++++++++-------
 res/values-es/strings.xml | 44 +++++++++++++++++++++++++++++++++++----
 res/values-fr/strings.xml | 28 +++++++++++++++++++++----
 res/values-it/strings.xml |  9 ++++----
 res/values-nl/strings.xml | 44 +++++++++++++++++++++------------------
 res/values-ru/strings.xml | 13 ++++++++----
 res/values-uk/strings.xml |  7 +++----
 8 files changed, 119 insertions(+), 54 deletions(-)

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 55539d33..3806f97e 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -14,8 +14,7 @@
 	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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+--><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="lineageparts_title">إعدادات LineageOS</string>
     <string name="loading">تحميل\u2026</string>
     <string name="dlg_ok">موافق</string>
@@ -86,8 +85,6 @@
     <string name="live_display_color_temperature_title">درجة حرارة اللون</string>
     <string name="live_display_color_temperature_summary">النهار: <xliff:g id="day_temperature">%1$d</xliff:g>K  الليل: <xliff:g id="night_temperature">%2$d</xliff:g>K</string>
     <string name="live_display_color_temperature_label"><xliff:g id="degrees">%1$d</xliff:g>K</string>
-    <string name="live_display_day"/>
-    <string name="live_display_night"/>
     <string name="live_display_outdoor_mode_title">وضع في الخارج التلقائي</string>
     <string name="live_display_outdoor_mode_summary">زيادة الإضاءة والإشباع تلقائياً تحت أشعة الشمس</string>
     <string name="live_display_anti_flicker_title">مضاد الوميض</string>
@@ -519,4 +516,4 @@
     <string name="sms_security_check_limit_summary">التطبيقات يمكنها إرسال %s رسائل في 1 دقيقة قبل ان تتطلب التأكيد</string>
     <string name="sms_security_check_limit_summary_none">لا يُسمح للتطبيقات بإرسال أيّة رسائل دون إذن</string>
     <string name="sms_security_check_limit_always_confirm">التأكيد دائماً</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 6df59d43..d6f2177f 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -14,10 +14,9 @@
 	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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+--><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="lineageparts_title">LineageOS-Einstellungen</string>
-    <string name="loading">Wird geladen\u2026</string>
+    <string name="loading">Wird geladen …</string>
     <string name="dlg_ok">OK</string>
     <string name="cancel">Abbrechen</string>
     <string name="add">Hinzufügen</string>
@@ -84,7 +83,7 @@
     <string name="notification_light_automagic_summary">Farben automatisch wählen</string>
     <string name="led_notification_title">LED-Einstellungen</string>
     <string name="led_notification_text">Benachrichtigungs-LED durch Einstellungen aktiviert</string>
-    <string name="notification_light_add_apps_empty_summary">Um App-spezifische Einstellungen hinzuzufügen, „%1$s“ aktivieren und „Hinzufügen“ antippen</string>
+    <string name="notification_light_add_apps_empty_summary">Um App-spezifische Kontrolle hinzuzufügen, aktiviere \'%1$s\' und tippe auf \'Hinzufügen\'</string>
     <string name="live_display_summary">Optimiert deinen Bildschirm basierend auf der Tageszeit und den Umgebungsbedingungen, um die Lesbarkeit zu verbessern und die Ermüdung der Augen zu mildern</string>
     <string name="live_display_mode">Bildschirmmodus</string>
     <string name="live_display_color_temperature_title">Farbtemperatur</string>
@@ -160,7 +159,7 @@
     <string name="hardware_keys_action_split_screen">Geteilter Bildschirm</string>
     <string name="hardware_keys_action_kill_app">App im Vordergrund beenden</string>
     <string name="camera_sleep_on_release_title">Kurzer Blick</string>
-    <string name="camera_sleep_on_release_summary">Der Bildschirm bleibt aktiviert, solange die Kamera-Taste halb durchgedrückt gehalten wird.</string>
+    <string name="camera_sleep_on_release_summary">Der Bildschirm bleibt aktiviert, solange die Taste halb durchgedrückt gehalten wird</string>
     <string name="camera_launch_title">Kamera starten</string>
     <string name="camera_launch_summary">Langes Drücken und Loslassen startet die Kamera</string>
     <string name="volbtn_music_controls_title">Wiedergabe steuern</string>
@@ -224,7 +223,7 @@
     <string name="power_menu_devicecontrols_title">Gerätesteuerung</string>
     <string name="power_menu_advanced_restart_title">Erweiterter Neustart</string>
     <string name="power_menu_advanced_restart_summary">Bei entsperrtem Bildschirm dem Neustartmenü Optionen für Neustart in Recovery oder in Bootloader hinzufügen</string>
-    <string name="power_menu_emergency_affordance_enabled">Notfallausstattung ist aktiviert</string>
+    <string name="power_menu_emergency_affordance_enabled">Die Notfallfunktion ist aktiviert</string>
     <string name="camera_double_tap_power_gesture_title">Doppelt drücken für Kamera</string>
     <string name="camera_double_tap_power_gesture_desc">Kamera ohne Entsperren deines Bildschirms schnell öffnen</string>
     <string name="torch_long_press_power_gesture_title">Lange drücken für Taschenlampe</string>
@@ -510,7 +509,7 @@
     <string name="touchscreen_gesture_action_ambient_display">Inaktivitätsdisplay anzeigen</string>
     <string name="trust_category_features">Status</string>
     <string name="trust_feature_selinux">SELinux</string>
-    <string name="trust_feature_selinux_value_enforcing">Enforcing</string>
+    <string name="trust_feature_selinux_value_enforcing">Erzwingen</string>
     <string name="trust_feature_selinux_value_disabled">Deaktiviert</string>
     <string name="trust_feature_selinux_explain">SELinux bestimmt, welche Prozesse Zugriff auf welche Dateien/Verzeichnisse auf deinem Gerät haben.\nDadurch wird verhindert, dass Anwendungen und Dienste auf Dateien zugreifen, die sie nicht benötigen: Auf diese Weise wird ein potenziell bösartiger Prozess eingeschränkt und deine Sicherheit gewahrt.</string>
     <string name="trust_feature_security_patches">Android-Sicherheitspatches</string>
@@ -542,4 +541,10 @@
     <string name="sms_security_check_limit_summary">Apps können %s Nachrichten in 1 Minute ohne Bestätigung versenden</string>
     <string name="sms_security_check_limit_summary_none">Apps dürfen keine Nachrichten ohne Bestätigung versenden</string>
     <string name="sms_security_check_limit_always_confirm">Immer bestätigen</string>
-</resources>
+    <string name="openkeychain_title">OpenKeychain</string>
+    <string name="microg_title">microG</string>
+    <string name="lineageos_contributors_title">LineageOS Mitwirkende</string>
+    <string name="e_supporters_title">/e/ Unterstützer</string>
+    <string name="e_contributors_title">/e/ Mitwirkende</string>
+    <string name="trust_feature_security_patches_explain_e">Sicherheits-Patches werden monatlich von Google in Zusammenarbeit mit SoC-Anbietern veröffentlicht, um Schwachstellen zu beheben, die von bösartigen Apps ausgenutzt werden könnten, um Sicherheitseinschränkungen zu umgehen und das Gerät dauerhaft zu beschädigen. Die von Google zur Verfügung gestellten Patches werden jeden Monat auf alle unterstützten Geräte aufgespielt, aber Patches für proprietären Code können nur vom Hersteller deines Geräts aufgespielt werden. Um dein Gerät zu schützen, solltest du sicherstellen, dass dein /e/-OS-Build immer auf dem neuesten Stand ist, und (falls zutreffend) dass dein Hersteller-Image auf die neueste von /e/OS empfohlene Version aktualisiert ist.</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index d9e5de74..1bb99014 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -14,8 +14,7 @@
 	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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+--><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="lineageparts_title">Ajustes de LineageOS</string>
     <string name="loading">Cargando\u2026</string>
     <string name="dlg_ok">OK</string>
@@ -286,7 +285,7 @@
     <string name="vibrate_mode">Modo de vibración</string>
     <string name="choose_soundtone">Elegir el tono de notificación</string>
     <string name="choose_ringtone">Elegir el tono de llamada</string>
-    <string name="ringtone_title">Tono de llamada del teléfono</string>
+    <string name="ringtone_title">Tono de llamada</string>
     <string name="soundtone_title">Tono de notificación</string>
     <string name="profile_system_settings_title">Ajustes del sistema</string>
     <string name="profile_lockmode_title">Modo de bloqueo de la pantalla</string>
@@ -473,4 +472,41 @@
     <string name="trust_onboarding_learn_more">Saber más</string>
     <string name="trust_onboarding_done">Entiendo</string>
     <string name="sms_security_check_limit_title">Límite de mensajes SMS</string>
-</resources>
+    <string name="touchscreen_gesture_one_finger_up_swipe_home_title">Desliza el dedo hacia arriba desde el botón de inicio</string>
+    <string name="wireless_charging_sounds_title">Carga inalámbrica</string>
+    <string name="wired_charging_sounds_title">Carga por cable</string>
+    <string name="charging_sounds_notification_category_title">Sonidos de notificación</string>
+    <string name="charging_sounds_enable_title">Activar sonidos de carga</string>
+    <string name="long_screen_settings_summary">Obligar a las aplicaciones heredadas a utilizar la relación de aspecto de pantalla completa</string>
+    <string name="long_screen_settings_title">Aplicaciones a pantalla completa</string>
+    <string name="contributions_info_msg">&lt;b&gt;Contribuidores totales:&lt;/b&gt; &lt;xliff:g id=total_contributors&gt;%1$s&lt;/xliff:g&gt;&lt;br/&gt;&lt;br/&gt; &lt;b&gt;Objetivos totales:&lt;/b&gt; &lt;xliff:g id=total_commits&gt;%2$s&lt;/xliff:g&gt;&lt;br/&gt;&lt;br/&gt; &lt;b&gt;Última actualización:&lt;/b&gt; &lt;xliff:g id=date&gt;%3$s&lt;/xliff:g&gt;</string>
+    <string name="contributor_info_msg">&lt;b&gt;Nombre:&lt;/b&gt; &lt;xliff:g id=name&gt;%1$s&lt;/xliff:g&gt;&lt;br/&gt;&lt;br/&gt; &lt;b&gt;Nick:&lt;/b&gt; &lt;xliff:g id=nick&gt;%2$s&lt;/xliff:g&gt;&lt;br/&gt;&lt;br/&gt; &lt;b&gt;Objetivos:&lt;/b&gt; &lt;xliff:g id=commits&gt;%3$s&lt;/xliff:g&gt;</string>
+    <string name="status_bar_clock_auto_hide_summary">Ocultar el reloj si el lanzador está visible</string>
+    <string name="status_bar_clock_show_seconds_summary">Mostrar horas, minutos y segundos</string>
+    <string name="status_bar_clock_show_seconds_title">Mostrar segundos</string>
+    <string name="profiles_create_new">Crear un nuevo perfil</string>
+    <string name="profiles_settings_enable_title">Activar perfiles</string>
+    <string name="power_menu_emergency_affordance_enabled">La función de emergencia está activada</string>
+    <string name="power_menu_advanced_restart_summary">Cuando esté desbloqueado, incluir opciones en el menú de encendido para reiniciar en recovery o bootloader</string>
+    <string name="power_menu_advanced_restart_title">Reinicio avanzado</string>
+    <string name="power_menu_devicecontrols_title">Controles del dispositivo</string>
+    <string name="power_menu_emergency_title">Emergencia</string>
+    <string name="power_menu_bug_report_unavailable_for_user">El informe de errores está deshabilitado para usuarios no principales.</string>
+    <string name="power_menu_bug_report_devoptions_unavailable">La notificación de errores está desactivada, ya que los ajustes de desarrollo no están activados</string>
+    <string name="power_menu_items_title">Elementos del menú Energía</string>
+    <string name="navigation_bar_back_long_press_title">Acción de pulsación larga hacia atrás</string>
+    <string name="navigation_bar_enable_taskbar_title">Activar la barra de tareas</string>
+    <string name="swap_capacitive_keys_summary">Intercambiar el orden de los botones \"Recientes\" y \"Atrás</string>
+    <string name="volume_panel_on_left_summary">Panel de volumen en la parte izquierda de la pantalla</string>
+    <string name="volume_panel_on_left_title">Mostrar panel de la izquierda</string>
+    <string name="hardware_keys_action_kill_app">Desactivar aplicación en primer plano</string>
+    <string name="live_display_reading_mode_summary">Modo de escala de grises para una lectura prolongada</string>
+    <string name="live_display_reading_mode_title">Modo lectura</string>
+    <string name="live_display_anti_flicker_summary">Evita el parpadeo generalizado y reduce la fatiga visual en condiciones de poca luz. Puede degradar la precisión del color y afectar a la forma en que se muestran algunos elementos.</string>
+    <string name="live_display_anti_flicker_title">Antireflectante</string>
+    <string name="notification_light_add_apps_empty_summary">Para añadir un control por aplicación, active \"%1$s\" y pulse \"Añadir\"</string>
+    <string name="notification_light_enable_title">Activar luz de notificación</string>
+    <string name="battery_light_full_charge_disabled_title">Se apaga cuando está completamente cargado</string>
+    <string name="battery_light_enable_title">Activar la luz de batería</string>
+    <string name="channel_light_settings_name">Vista previa de los ajustes de luz</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 7761fd00..e2b8a770 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -14,8 +14,7 @@
 	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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+--><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="lineageparts_title">Paramètres de LineageOS</string>
     <string name="loading">Chargement\u2026</string>
     <string name="dlg_ok">OK</string>
@@ -501,7 +500,7 @@
     <string name="trust_feature_security_patches_value_new">À jour</string>
     <string name="trust_feature_security_patches_value_medium">Obsolète de quelques mois</string>
     <string name="trust_feature_security_patches_value_old">Obsolète</string>
-    <string name="trust_feature_security_patches_explain">Les correctifs de sécurité sont publiés chaque mois par Google, en coopération avec les fournisseurs de SoC. Ils permettent de corriger des failles que des applications malveillantes sont susceptibles d\'exploiter pour contourner les restrictions de sécurité et endommager votre appareil de façon définitive. Les correctifs fournis par Google sont appliqués chaque mois à tous les appareils compatibles, mais ceux concernant le code propriétaire ne peuvent l\'être que par le fabricant de votre appareil. Pour garantir la sécurité de votre appareil, veillez à toujours utiliser la dernière version de LineageOS et, le cas échéant, mettez à jour votre fichier vendor.img afin qu\'il corresponde à la dernière version recommandée par LineageOS.</string>
+    <string name="trust_feature_security_patches_explain">Les correctifs de sécurité sont publiés chaque mois par Google, en coopération avec les fabricants de puces SoC (System On a Chip). Ils permettent de corriger des failles que des applications malveillantes sont susceptibles d\'exploiter pour contourner les restrictions de sécurité et endommager votre appareil de façon définitive. Les correctifs fournis par Google sont appliqués chaque mois à tous les appareils compatibles, mais ceux concernant le code propriétaire ne peuvent l\'être que par le fabricant de votre appareil. Pour garantir la sécurité de votre appareil, veillez à toujours utiliser la dernière version de LineageOS et, le cas échéant, mettez à jour votre fichier vendor.img afin qu\'il corresponde à la dernière version recommandée par LineageOS.</string>
     <string name="trust_feature_encryption">Chiffrement</string>
     <string name="trust_feature_encryption_value_enabled">Activé</string>
     <string name="trust_feature_encryption_value_nolock">Écran de verrouillage sécurisé requis</string>
@@ -521,4 +520,25 @@
     <string name="sms_security_check_limit_summary">Les applications peuvent envoyer %s messages en une minute avant qu\'une confirmation ne soit requise</string>
     <string name="sms_security_check_limit_summary_none">Les applications ne sont pas autorisées à envoyer de messages sans confirmation</string>
     <string name="sms_security_check_limit_always_confirm">Toujours confirmer</string>
-</resources>
+    <string name="lineageos_contributors_title">Contributeurs LineageOS</string>
+    <string name="wired_charging_sounds_title">Charge par câble</string>
+    <string name="wireless_charging_sounds_title">Charge sans fil</string>
+    <string name="charging_sounds_notification_category_title">Sons des notifications</string>
+    <string name="status_bar_clock_auto_hide_summary">Masquer l\'horloge si le lanceur d\'applications est visible</string>
+    <string name="trust_feature_security_patches_explain_e">Les correctifs de sécurité sont publiés chaque mois par Google, en coopération avec les fabricants de puces SoC (System On a Chip). Ils permettent de corriger des failles que des applications malveillantes sont susceptibles d\'exploiter pour contourner les restrictions de sécurité et endommager votre appareil de façon définitive. Les correctifs fournis par Google sont appliqués chaque mois à tous les appareils compatibles, mais ceux concernant le code propriétaire ne peuvent l\'être que par le fabricant de votre appareil. Pour garantir la sécurité de votre appareil, veillez à toujours utiliser la dernière version de /e/OS et, le cas échéant, mettez à jour votre fichier vendor.img afin qu\'il corresponde à la dernière version recommandée par /e/OS.</string>
+    <string name="charging_sounds_enable_title">Activer les sons d\'alimentation</string>
+    <string name="profiles_create_new">Créer un nouveau profil</string>
+    <string name="profiles_settings_enable_title">Activer les profils</string>
+    <string name="power_menu_advanced_restart_summary">Inclure les options de redémarrage en mode recovery ou bootloader dans le menu Marche/Arrêt lorsque l\'appareil est déverrouillé</string>
+    <string name="power_menu_advanced_restart_title">Redémarrage avancé</string>
+    <string name="power_menu_devicecontrols_title">Commande des appareils</string>
+    <string name="power_menu_items_title">Eléments du menu Marche/Arrêt</string>
+    <string name="navigation_bar_enable_taskbar_title">Activer la barre des tâches</string>
+    <string name="notification_light_add_apps_empty_summary">Pour ajouter une gestion par application, activez \'%1$s\' et appuyez sur \'Ajouter\'</string>
+    <string name="notification_light_enable_title">Activer les voyants de notification</string>
+    <string name="battery_light_enable_title">Activer le voyant batterie</string>
+    <string name="channel_light_settings_name">Aperçu des paramètres de voyants</string>
+    <string name="trust_restrict_usb_disabled">Toujours autoriser les connexions USB</string>
+    <string name="openkeychain_title">OpenKeychain</string>
+    <string name="microg_title">microG</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 412dc8b1..184d424c 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -14,10 +14,9 @@
 	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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+--><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="lineageparts_title">Impostazioni LineageOS</string>
-    <string name="loading">Caricamento\u2026</string>
+    <string name="loading">Caricamento…</string>
     <string name="dlg_ok">OK</string>
     <string name="cancel">Annulla</string>
     <string name="add">Aggiungi</string>
@@ -84,7 +83,7 @@
     <string name="notification_light_automagic_summary">I colori sono scelti automaticamente</string>
     <string name="led_notification_title">Impostazioni luci</string>
     <string name="led_notification_text">LED attivato dalle impostazioni</string>
-    <string name="notification_light_add_apps_empty_summary">Per aggiungere impostazioni per specifiche app, attiva \'%1$s\' e premi \'Aggiungi\'</string>
+    <string name="notification_light_add_apps_empty_summary">Per aggiungere un controllo per App, attiva \'%1$s\' e premi \'Aggiungi\'</string>
     <string name="live_display_summary">Ottimizza lo schermo in base all\'ora del giorno e alle condizioni ambientali per migliorare la leggibilità e ridurre l\'affaticamento degli occhi</string>
     <string name="live_display_mode">Modalità display</string>
     <string name="live_display_color_temperature_title">Temperatura colore</string>
@@ -542,4 +541,4 @@
     <string name="sms_security_check_limit_summary">Le applicazioni possono inviare %s messaggi in 1 minuto prima di richiedere conferma</string>
     <string name="sms_security_check_limit_summary_none">Non è consentito alle app l\'invio di messaggi senza conferma</string>
     <string name="sms_security_check_limit_always_confirm">Conferma sempre</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 59c23c93..8c1f0471 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -14,15 +14,14 @@
 	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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+--><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="lineageparts_title">LineageOS-instellingen</string>
-    <string name="loading">Laden\u2026</string>
+    <string name="loading">Laden…</string>
     <string name="dlg_ok">OK</string>
     <string name="cancel">Annuleren</string>
-    <string name="add">Toevoegen</string>
-    <string name="choose_app">App selecteren</string>
-    <string name="reset">Opnieuw instellen</string>
+    <string name="add">Voeg toe</string>
+    <string name="choose_app">Kies applicatie</string>
+    <string name="reset">Herstel</string>
     <string name="advanced">Geavanceerd</string>
     <string name="settings">Instellingen</string>
     <string name="name">Naam</string>
@@ -116,7 +115,7 @@
     <string name="live_display_color_profile_basic_title">Basis</string>
     <string name="live_display_color_profile_basic_summary">Scherm ongekalibreerd gebruiken</string>
     <string name="live_display_color_profile_adaptive_title">Aanpasbaar</string>
-    <string name="live_display_color_profile_adaptive_summary">Kleuren passen zich aan aan de omgeving</string>
+    <string name="live_display_color_profile_adaptive_summary">Kleuren zullen zich aanpassen aan de omgeving</string>
     <string name="live_display_color_profile_reading_title">Lezen</string>
     <string name="live_display_color_profile_reading_summary">Warmere kleuren voor minder vermoeidheid van de ogen</string>
     <string name="live_display_color_profile_srgb_title">sRGB</string>
@@ -266,7 +265,7 @@
     <string name="profile_write_nfc_tag">Schrijven naar NFC-tag</string>
     <string name="profile_write_touch_tag">Raak tag aan om te schrijven</string>
     <string name="profile_write_success">Tag succesvol geschreven</string>
-    <string name="profile_write_failed">Tag schrijven mislukt</string>
+    <string name="profile_write_failed">Tag schrijven mislukt!</string>
     <string name="profile_selected">Gekozen profiel: %1$s</string>
     <string name="profile_nfc_text">Een profiel naar een NFC-tag schrijven maakt het mogelijk een profiel te kiezen door de tag aan te raken. Een tweede keer aanraken selecteert het vorig gekozen profiel.</string>
     <string name="profile_unknown_nfc_tag">Onbekend profiel</string>
@@ -275,12 +274,12 @@
     <string name="profile_remove_dialog_message">Profiel %1$s verwijderen?</string>
     <string name="profile_populate_profile_from_state">Profiel instellen met behulp van huidige apparaatinstellingen?</string>
     <string name="profile_menu_fill_from_state">Huidige apparaatinstellingen importeren</string>
-    <string name="profile_remove_current_profile">Kan huidige profiel niet verwijderen.</string>
+    <string name="profile_remove_current_profile">Kan huidig profiel niet verwijderen!</string>
     <string name="profile_app_group_category_title">Meldingen aanpassen</string>
     <string name="profile_app_group_item_instructions">Groepen toevoegen of verwijderen</string>
     <string name="profile_app_group_item_instructions_summary">App-groepen toevoegen of verwijderen om meldingsgedrag te manipuleren</string>
     <string name="profile_entries_on">Aan</string>
-    <string name="profile_entries_off">Off</string>
+    <string name="profile_entries_off">Uit</string>
     <string name="profile_entries_no_override">Niet wijzigen</string>
     <string name="profile_name_title">Naam</string>
     <string name="new_profile_name">&lt;nieuw profiel&gt;</string>
@@ -404,17 +403,15 @@
     <string name="network_traffic_disabled_clock">Netwerkverkeersindicator uitgeschakeld vanwege klokpositie</string>
     <string name="protected_apps_manager_title">Beschermde apps</string>
     <string name="protected_apps_manager_summary">Beheren welke apps beschermd zijn</string>
-    <string name="contributors_cloud_fragment_title">Bijdragers</string>
-    <string name="contributors_cloud_loading_message">Informatie over bijdragers laden\u2026</string>
-    <string name="contributors_cloud_failed_message">Kan informatie over bijdragers niet laden</string>
-    <string name="contributor_info_menu">Informatie over bijdragers</string>
+    <string name="contributors_cloud_fragment_title">Medewerkers</string>
+    <string name="contributors_cloud_loading_message">Informatie over medewerkers laden…</string>
+    <string name="contributors_cloud_failed_message">Kan informatie over medewerkers niet laden</string>
+    <string name="contributor_info_menu">Informatie over medewerkers</string>
     <string name="contributor_info_msg"><![CDATA[<b>Naam:</b> <xliff:g id="name">%1$s</xliff:g><br/><br/>
                  <b>Bijnaam:</b> <xliff:g id="nick">%2$s</xliff:g><br/><br/>
                  <b>Commits:</b> <xliff:g id="commits">%3$s</xliff:g>]]></string>
-    <string name="contributions_info_menu">Informatie over bijdragers</string>
-    <string name="contributions_info_msg"><![CDATA[<b>Totaal aantal bijdragers:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
-                 <b>Totaal aantal commits:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
-                 <b>Laatste update:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
+    <string name="contributions_info_menu">Informatie over medewerkers</string>
+    <string name="contributions_info_msg">&lt;b&gt;Totaal aantal medewerkers:&lt;/b&gt; &lt;xliff:g id=total_contributors&gt;%1$s&lt;/xliff:g&gt;&lt;br/&gt;&lt;br/&gt; &lt;b&gt;Totaal aantal commits:&lt;/b&gt; &lt;xliff:g id=total_commits&gt;%2$s&lt;/xliff:g&gt;&lt;br/&gt;&lt;br/&gt; &lt;b&gt;Laatste update:&lt;/b&gt; &lt;xliff:g id=date&gt;%3$s&lt;/xliff:g&gt;</string>
     <string name="anonymous_statistics_title">LineageOS-statistieken</string>
     <string name="anonymous_statistics_summary">Help LineageOS te verbeteren door anonieme statistieken te verzenden</string>
     <string name="anonymous_statistics_warning_title">Over</string>
@@ -512,7 +509,8 @@
     <string name="trust_feature_selinux">SELinux</string>
     <string name="trust_feature_selinux_value_enforcing">Afdwingen (enforcing)</string>
     <string name="trust_feature_selinux_value_disabled">Uitgeschakeld</string>
-    <string name="trust_feature_selinux_explain">SELinux bepaalt welke processen toegang hebben tot welke bestanden/mappen op uw apparaat.\nDit voorkomt dat applicaties en services toegang krijgen tot bestanden die ze niet nodig hebben: op deze manier wordt een potentieel kwaadaardig proces beperkt en uw veiligheid behouden.</string>
+    <string name="trust_feature_selinux_explain">SELinux bepaalt welke processen toegang hebben tot welke bestanden/mappen op uw toestel.
+\nDit voorkomt dat apps en services toegang hebben tot bestanden waar ze niet aan hoeven te komen: op deze manier wordt een potentieel schadelijk proces ingetoomd, en blijft de veiligheid gewaarborgd.</string>
     <string name="trust_feature_security_patches">Android-beveiligingspatches</string>
     <string name="trust_feature_security_patches_value_base">Platform: %1$s\nProvider: %2$s</string>
     <string name="trust_feature_security_patches_value_new">Bijgewerkt</string>
@@ -542,4 +540,10 @@
     <string name="sms_security_check_limit_summary">Apps kunnen %s berichten binnen 1 minuut verzenden zonder bevestiging</string>
     <string name="sms_security_check_limit_summary_none">Apps mogen geen berichten verzenden zonder bevestiging</string>
     <string name="sms_security_check_limit_always_confirm">Altijd bevestigen</string>
-</resources>
+    <string name="openkeychain_title">OpenKeychain</string>
+    <string name="microg_title">microG</string>
+    <string name="lineageos_contributors_title">LineageOS medewerkers</string>
+    <string name="e_supporters_title">/e/ ondersteuners</string>
+    <string name="e_contributors_title">/e/ medewerkers</string>
+    <string name="trust_feature_security_patches_explain_e">Veiligheidsupdates worden maandelijks vrijgegeven door Google in samenwerking met SoC fabrikanten om gebreken te verbeteren die kunnen misbruikt worden door schadelijke apps om veiligheidsrestricties te omzeilen en je toestel permanent te beschadigen. Veiligheidsupdates van Google worden maandelijks toegepast op alle ondersteunde toestellen, maar updates voor propriëtaire code kunnen enkel toegepast worden door de fabrikant van jouw toestel. Om de veiligheid op je toestel te garanderen, hou je /e/ OS altijd up-to-date, en (indien van toepassing) zorg er voor dat de vendor-image is bijgewerkt tot de laatste versie, aangeraden door /e/ OS.</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 9492b73a..a22b6a2e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -14,8 +14,7 @@
 	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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+--><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="lineageparts_title">Настройки LineageOS</string>
     <string name="loading">Загрузка\u2026</string>
     <string name="dlg_ok">OK</string>
@@ -224,7 +223,7 @@
     <string name="power_menu_devicecontrols_title">Управление устройством</string>
     <string name="power_menu_advanced_restart_title">Варианты перезапуска</string>
     <string name="power_menu_advanced_restart_summary">Когда устройство разблокировано, в меню кнопки питания доступны опции перезагрузки в Recovery и загрузчик</string>
-    <string name="power_menu_emergency_affordance_enabled">Возможности для экстренных ситуаций включены</string>
+    <string name="power_menu_emergency_affordance_enabled">Экстренная возможность включена</string>
     <string name="camera_double_tap_power_gesture_title">Нажмите кнопку питания дважды для запуска камеры</string>
     <string name="camera_double_tap_power_gesture_desc">Быстро запустить камеру без разблокировки устройства</string>
     <string name="torch_long_press_power_gesture_title">Длительное нажатие для включения фонарика</string>
@@ -542,4 +541,10 @@
     <string name="sms_security_check_limit_summary">Запрашивать подтверждение при отправке более %s сообщений в минуту</string>
     <string name="sms_security_check_limit_summary_none">Приложениям запрещено отправлять сообщения без подтверждения</string>
     <string name="sms_security_check_limit_always_confirm">Подтверждать всегда</string>
-</resources>
+    <string name="e_contributors_title">участники проекта /e/</string>
+    <string name="trust_feature_security_patches_explain_e">Исправления безопасности ежемесячно выпускаются Google в сотрудничестве с производителями SoC для устранения недостатков, которые могут быть использованы вредоносными приложениями для обхода ограничений безопасности и нанесения постоянного ущерба вашему устройству. Исправления, выпускаемые Google, применяются каждый месяц на всех поддерживаемых устройствах, но исправления для собственного кода могут быть применены только производителем вашего устройства. Для обеспечения безопасности вашего устройства убедитесь, что сборка /e/ OS всегда актуальна, и (если это применимо) убедитесь, что образ производителя обновлен до последней версии, рекомендованной /e/ OS.</string>
+    <string name="openkeychain_title">OpenKeychain</string>
+    <string name="e_supporters_title">Поддерживающие проект /e/ люди</string>
+    <string name="microg_title">microG</string>
+    <string name="lineageos_contributors_title">Участники проекта LineageOS</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index e4cf89a9..d3c021e0 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -14,11 +14,10 @@
 	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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+--><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="loading">Завантаження\u2026</string>
     <string name="dlg_ok">ОК</string>
-    <string name="cancel">Скаcувати</string>
+    <string name="cancel">Скасувати</string>
     <string name="add">Додати</string>
     <string name="choose_app">Виберіть додаток</string>
     <string name="reset">Скинути</string>
@@ -480,4 +479,4 @@
     <string name="sms_security_check_limit_title">Обмеження SMS-повідомлень</string>
     <string name="sms_security_check_limit_summary">При спробі застосунків надіслати понад %s повідомлень за хвилину буде запитано підтвердження</string>
     <string name="sms_security_check_limit_always_confirm">Завжди підтверджувати</string>
-</resources>
+</resources>
\ No newline at end of file
-- 
GitLab