diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9b2cf24..97de9a5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -273,10 +273,6 @@
                 <action android:name="android.settings.WIFI_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter android:priority="1">
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.settings.SHORTCUT" />
-            </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.wifi.WifiSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -285,7 +281,7 @@
 
         <activity
             android:name="Settings$NetworkProviderSettingsActivity"
-            android:label="@string/network_dashboard_title"
+            android:label="@string/provider_internet_settings"
             android:icon="@drawable/ic_homepage_network"
             android:exported="true"
             android:configChanges="orientation|keyboardHidden|screenSize">
@@ -304,6 +300,26 @@
         </activity>
 
         <activity
+            android:name="Settings$WifiDetailsSettingsActivity"
+            android:label="@string/wifi_details_title"
+            android:icon="@drawable/ic_homepage_network"
+            android:exported="true"
+            android:permission="android.permission.CHANGE_WIFI_STATE"
+            android:configChanges="orientation|keyboardHidden|screenSize">
+            <!-- The intent action is only public to OEM, because a special library is required. -->
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.WIFI_DETAILS_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data
+                android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.wifi.details.WifiNetworkDetailsFragment" />
+            <meta-data
+                android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
+        </activity>
+
+        <activity
             android:name=".wifi.WifiPickerActivity"
             android:exported="true">
             <intent-filter android:priority="1">
diff --git a/res/drawable-nodpi/color_mode_preview.jpg b/res/drawable-nodpi/color_mode_preview.jpg
deleted file mode 100644
index 804bcf1..0000000
--- a/res/drawable-nodpi/color_mode_preview.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-nodpi/color_mode_preview1.jpg b/res/drawable-nodpi/color_mode_preview1.jpg
new file mode 100644
index 0000000..71bcb7e
--- /dev/null
+++ b/res/drawable-nodpi/color_mode_preview1.jpg
Binary files differ
diff --git a/res/drawable-nodpi/color_mode_preview2.jpg b/res/drawable-nodpi/color_mode_preview2.jpg
new file mode 100644
index 0000000..4153d8e
--- /dev/null
+++ b/res/drawable-nodpi/color_mode_preview2.jpg
Binary files differ
diff --git a/res/drawable-nodpi/color_mode_preview3.jpg b/res/drawable-nodpi/color_mode_preview3.jpg
new file mode 100644
index 0000000..ab83f08
--- /dev/null
+++ b/res/drawable-nodpi/color_mode_preview3.jpg
Binary files differ
diff --git a/res/drawable/ic_color_arrow_left_lt.xml b/res/drawable/ic_color_arrow_left_lt.xml
new file mode 100644
index 0000000..237a1a3
--- /dev/null
+++ b/res/drawable/ic_color_arrow_left_lt.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2021 The Android Open Source 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:pathData="M0,0h24v24h-24z"/>
+  <path
+      android:pathData="M16.41,18.59L15,20L7,12L15,4L16.41,5.41L9.83,12"
+      android:fillColor="?android:attr/colorAccent"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/res/drawable/ic_color_arrow_right_lt.xml b/res/drawable/ic_color_arrow_right_lt.xml
new file mode 100644
index 0000000..5107243
--- /dev/null
+++ b/res/drawable/ic_color_arrow_right_lt.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2021 The Android Open Source 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:pathData="M0,0h24v24h-24z"/>
+  <path
+      android:pathData="M7.59,5.41L9,4L17,12L9,20L7.59,18.59L14.17,12"
+      android:fillColor="?android:attr/colorAccent"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/res/drawable/ic_color_page_indicator_focused.xml b/res/drawable/ic_color_page_indicator_focused.xml
new file mode 100644
index 0000000..6173358
--- /dev/null
+++ b/res/drawable/ic_color_page_indicator_focused.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2021 The Android Open Source 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="6dp"
+    android:height="6dp"
+    android:viewportWidth="6"
+    android:viewportHeight="6">
+  <path
+      android:pathData="M3,0C4.65686,0 6,1.34315 6,3C6,4.65686 4.65685,6 3,6C1.34315,6 0,4.65685 0,3C0,1.34315 1.34315,0 3,0Z"
+      android:fillColor="?android:attr/colorAccent"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/res/drawable/ic_color_page_indicator_unfocused.xml b/res/drawable/ic_color_page_indicator_unfocused.xml
new file mode 100644
index 0000000..57a13d8
--- /dev/null
+++ b/res/drawable/ic_color_page_indicator_unfocused.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2021 The Android Open Source 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="6dp"
+    android:height="6dp"
+    android:viewportWidth="6"
+    android:viewportHeight="6">
+  <path
+      android:pathData="M3,0C4.65686,0 6,1.34315 6,3C6,4.65686 4.65685,6 3,6C1.34315,6 0,4.65685 0,3C0,1.34315 1.34315,0 3,0Z"
+      android:fillColor="?android:attr/colorAccent"
+      android:fillAlpha="0.24"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/res/layout/battery_chart_graph.xml b/res/layout/battery_chart_graph.xml
index db86693..e89c912 100644
--- a/res/layout/battery_chart_graph.xml
+++ b/res/layout/battery_chart_graph.xml
@@ -40,12 +40,14 @@
         android:contentDescription="@string/battery_usage_chart"
         android:textAppearance="?android:attr/textAppearanceSmall"
         settings:textColor="?android:attr/textColorSecondary" />
+    <!-- Use non-scalable text size from text_size_small_material -->
     <TextView
         android:id="@+id/companion_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="gone"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="?android:attr/textColorSecondary"/>
+        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="14dp" />
 
 </LinearLayout>
diff --git a/res/layout/color_mode_preview.xml b/res/layout/color_mode_preview.xml
index 88b8281..b8601c9 100644
--- a/res/layout/color_mode_preview.xml
+++ b/res/layout/color_mode_preview.xml
@@ -14,16 +14,55 @@
      limitations under the License.
 -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <ImageView
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/color_mode_preview_height"
-        android:scaleType="centerCrop"
-        android:cropToPadding="true"
-        android:src="@drawable/color_mode_preview"
-        android:contentDescription="@null" />
+        android:layout_height="wrap_content">
 
-</FrameLayout>
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/viewpager"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/color_mode_preview_height"/>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="48dp">
+
+        <FrameLayout
+            android:id="@+id/arrow_previous"
+            android:layout_width="wrap_content"
+            android:layout_height="48dp"
+            android:paddingLeft="24dp"
+            android:layout_gravity="center_vertical|left"
+            android:contentDescription="@string/previous_page_content_description">
+
+            <ImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_gravity="center"
+                android:src="@drawable/ic_color_arrow_left_lt"/>
+        </FrameLayout>
+
+        <LinearLayout
+            android:id="@+id/viewGroup"
+            android:layout_width="fill_parent"
+            android:layout_height="48dp"
+            android:gravity="center"/>
+
+        <FrameLayout
+            android:id="@+id/arrow_next"
+            android:layout_width="wrap_content"
+            android:layout_height="48dp"
+            android:paddingRight="24dp"
+            android:layout_gravity="center_vertical|right"
+            android:contentDescription="@string/next_page_content_description">
+
+            <ImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_gravity="center"
+                android:src="@drawable/ic_color_arrow_right_lt"/>
+        </FrameLayout>
+    </FrameLayout>
+
+</LinearLayout>
diff --git a/res/layout/color_mode_view1.xml b/res/layout/color_mode_view1.xml
new file mode 100644
index 0000000..4bdaec1
--- /dev/null
+++ b/res/layout/color_mode_view1.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source 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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:foregroundGravity="center_horizontal">
+
+        <ImageView
+            android:id="@+id/image1"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/color_mode_preview_height"
+            android:scaleType="centerCrop"
+            android:cropToPadding="true"
+            android:src="@drawable/color_mode_preview1"
+            android:contentDescription="@null" />
+
+    </FrameLayout>
+</LinearLayout>
diff --git a/res/layout/color_mode_view2.xml b/res/layout/color_mode_view2.xml
new file mode 100644
index 0000000..c70fa75
--- /dev/null
+++ b/res/layout/color_mode_view2.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source 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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:foregroundGravity="center_horizontal">
+
+        <ImageView
+            android:id="@+id/image2"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/color_mode_preview_height"
+            android:scaleType="centerCrop"
+            android:cropToPadding="true"
+            android:src="@drawable/color_mode_preview2"
+            android:contentDescription="@null" />
+
+    </FrameLayout>
+</LinearLayout>
diff --git a/res/layout/color_mode_view3.xml b/res/layout/color_mode_view3.xml
new file mode 100644
index 0000000..430e3b2
--- /dev/null
+++ b/res/layout/color_mode_view3.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source 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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:foregroundGravity="center_horizontal">
+
+        <ImageView
+            android:id="@+id/image3"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/color_mode_preview_height"
+            android:scaleType="centerCrop"
+            android:cropToPadding="true"
+            android:src="@drawable/color_mode_preview3"
+            android:contentDescription="@null" />
+
+    </FrameLayout>
+</LinearLayout>
diff --git a/res/layout/notification_history_app_layout.xml b/res/layout/notification_history_app_layout.xml
index 8f66628..52c0e42 100644
--- a/res/layout/notification_history_app_layout.xml
+++ b/res/layout/notification_history_app_layout.xml
@@ -16,6 +16,7 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">
@@ -78,13 +79,27 @@
         android:layout_height="1dp"
         android:background="?android:attr/listDivider"/>
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/notification_list_wrapper"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
         <com.android.settings.notification.history.NotificationHistoryRecyclerView
-            android:id="@+id/notification_list"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:id="@+id/notification_list"
             android:clipChildren="true"
             android:clipToPadding="true"
+            android:clipToOutline="true"
             android:importantForAccessibility="yes"
-            android:scrollbars="none"/>
+            app:layout_constrainedHeight="true"
+            app:layout_constraintHeight_min="48dp"
+            app:layout_constraintHeight_max="500dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/preference_labeled_slider.xml b/res/layout/preference_labeled_slider.xml
index 75902cf..f120a44 100644
--- a/res/layout/preference_labeled_slider.xml
+++ b/res/layout/preference_labeled_slider.xml
@@ -37,9 +37,18 @@
         android:textAppearance="?android:attr/textAppearanceListItem"
         android:textColor="?android:attr/textColorPrimary" />
 
+    <TextView
+        android:id="@android:id/summary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@android:id/title"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textAlignment="viewStart"
+        android:textColor="?android:attr/textColorSecondary" />
+
     <SeekBar
         android:id="@*android:id/seekbar"
-        android:layout_below="@android:id/title"
+        android:layout_below="@android:id/summary"
         android:layout_gravity="center_vertical"
         android:layout_width="match_parent"
         android:layout_height="48dp"
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 0f73dbc..879a0f0 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Gekas (aktiwiteitkliënt)"</item>
     <item msgid="8186970968968646288">"Gekas (leeg)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Blougroen"</item>
+    <item msgid="7216413848731287689">"Groenblou"</item>
     <item msgid="5661027589207588703">"Blou"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Groen"</item>
     <item msgid="6331809026622602308">"Pers"</item>
     <item msgid="6390546163902724700">"Pienk"</item>
-    <item msgid="6618900408138432102">"Rooi"</item>
+    <item msgid="6500473130620545980">"Oranje"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Meer as 30 dae oud"</item>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 858c69b..d3d8057 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Nog een keer"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Volg die vingerafdrukikoon"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Hou aan om jou vinger op te lig om die verskillende dele van jou vingerafdruk by te voeg"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Raak en hou elke keer wanneer die vingerafdrukikoon skuif. Dit help om meer van jou vingerafdruk vas te vang."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Plaas jou vingertop op die sensor"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Plaas laaste die kante van jou vinger"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Plaas die kant van jou vingerafdruk op die sensor en hou; ruil dan om na die ander kant"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Dit help om meer van jou vingerafdruk vas te vang"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Raak en hou elke keer wanneer die vingerafdrukikoon skuif. Dit help om jou volle vingerafdruk vas te vang."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Dit help om jou volle vingerafdruk vas te vang"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Skryf tans vingerafdruk in <xliff:g id="PERCENTAGE">%d</xliff:g> persent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Vingerafdruk bygevoeg"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Jy kan nou jou vingerafdruk gebruik om jou foon te ontsluit of te verifieer dis jy, soos wanneer jy by programme aanmeld"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Stelselgebruik vir die afgelope 24 u."</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Stelselgebruik vir <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Programgebruik vir <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"vm."</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"nm."</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: minder as \'n min."</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Agtergrond: minder as \'n min."</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Totaal: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Aktiveer die Assistent deur die aan/af-skakelaar te hou"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Aan/af- en noodkieslys:\nDruk tegelyk aan/af-skakelaar en volume harder."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Keer dat dit lui:\nKortpad in die volumekieslys beskikbaar."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Hoe lank om te druk en hou"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Verstel sensitiwiteit deur te kies hoe lank jy die aan/af-skakelaar moet druk en hou"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Kort"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Lank"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Wys beursie"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Laat toegang tot beursie vanaf sluitskerm en kitsinstellings toe"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Wys toestelkontroles"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Tydelik nie beskikbaar nie"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Geen SIM nie"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Netwerkvoorkeure"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Koppel aan publieke netwerke"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"netwerkverbinding, internet, draadloos, data, wifi, wi-fi, wi fi, sellulêr, mobiel, selfoondiensverskaffer, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Skakel wi-fi aan"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Skakel wi-fi af"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+-netwerk"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"AFGELAAIDE SIM"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"AFGELAAIDE SIM-KAARTE"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Aktief"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Onaktief"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Verstek vir <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Vir alle programme en dienste"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Speletjie-instellings"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Skakel Spelkontroleskerm-kortpad ensovoorts aan"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Vorige"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Volgende"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Kleurvoorskou"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Versoek vir toegang tot SIM-kaart"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"\'n Toestel wil toegang tot jou SIM-kaart hê. Tik vir besonderhede."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Laat toegang tot SIM-kaart toe?"</string>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index 5f06fbf..794942b 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"የተሸጎጠ (የእንቅስቃሴ ደንበኛ)"</item>
     <item msgid="8186970968968646288">"የተሸጎጠ (ባዶ)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"ጥቁር አረንጓዴ-ሰማያዊ"</item>
+    <item msgid="7216413848731287689">"ሳያን"</item>
     <item msgid="5661027589207588703">"ሰማያዊ"</item>
-    <item msgid="3795787248113275442">"ወይን ጠጅ"</item>
+    <item msgid="1219738214736244749">"አረንጓዴ"</item>
     <item msgid="6331809026622602308">"ሐምራዊ"</item>
     <item msgid="6390546163902724700">"ሮዝ"</item>
-    <item msgid="6618900408138432102">"ቀይ"</item>
+    <item msgid="6500473130620545980">"ብርቱካናማ"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"ከ30 ቀኖች በላይ የሆናቸው"</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 548021d..4503b6b 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"አንድ ሌላ ተጨማሪ ጊዜ"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"የጣት አሻራ አዶውን ይከተሉ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"የእርስዎን የጣት አሻራ የተለያዩ ክፍሎችን ለማከል ጣትዎትን ማንሳትና ማስቀመጥዎን ይቀጥሉ"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"የጣት አሻራ አዶው በተንቀሳቀሰ ቁጥር ነክተው ይያዙት። ይህ ተጨማሪ የጣት አሻራዎን ክፍል እንዲይዝ ያግዛል።"</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"የጣትዎን ላይኛው ጫፍ በዳሳሹ ላይ ያስቀምጡት"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"በመጨረሻም፣ የጣትዎን ጠርዞች ያስቀምጡት"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"የጣት አሻራዎን ጎን በዳሳሹ ላይ አስቀምጠው ይያዙት፣ ከዚያ ወደ ሌላኛው ጎን ይቀይሩ"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"ይህ ተጨማሪ የጣት አሻራዎን ክፍል እንዲይዝ ያግዛል"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"የጣት አሻራ አዶው በተንቀሳቀሰ ቁጥር ነክተው ይያዙት። ይህ ሙሉ የጣት አሻራዎን ለመያዝ ይረዳል።"</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"ይህ ሙሉ የጣት አሻራዎን ለመያዝ ይረዳል"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"የጣት አሻራ <xliff:g id="PERCENTAGE">%d</xliff:g> መቶኛን በመመዝገብ ላይ"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"የጣት አሻራ ታክሏል"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"አሁን ስልክዎን ለመክፈት ወይም እንደ በመለያ ወደ መተግበሪያዎች ሲገቡ ላለ እርስዎ መሆንዎን ለማረጋገጥ የእርስዎን የጣት አሻራ መጠቀም ይችላሉ"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"ላለፉት 24 ሰዓቶች የሥርዓት አጠቃቀም"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"የ<xliff:g id="SLOT">%s</xliff:g> የሥርዓት አጠቃቀም"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"የ<xliff:g id="SLOT">%s</xliff:g> የመተግበሪያ አጠቃቀም"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"ጠዋት"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"ከሰዓት"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"ጠቅላላ፦ ከአንድ ደቂቃ በታች"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"ዳራ፦ ከአንድ ደቂቃ በታች"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"ጠቅላላ፦ <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"የኃይል አዝራሩን በመያዝ ረዳቱን ያስነሱ"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"የኃይል እና ድንገተኛ አደጋ ምናሌ፦\nበተመሳሳይ ጊዜ ኃይልን እና ድምፅ ጨምርን ይጫኑ።"</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"መደወልን ይከላከሉ፦\nበድምጽ ምናሌው ውስጥ አቋራጭ ይገኛል።"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"የመጫን እና የመያዝ የቆይታ ጊዜ"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"የማብሪያ/ማጥፊያ አዝራሩን ለምን ያህል ጊዜ ተጭኖ እንደሚያዝ በመምረጥ ትብነትን ያስተካክሉ"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"አጭር"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"ረጅም"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"የኪስ ቦርሳን አሳይ"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"ከማያ ገጽ ቁልፍ እና ፈጣን ቅንብሮች ሆነው የኪስ ቦርሳ መድረሻን ይፍቀዱ"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"የመሣሪያ መቆጣጠሪያዎችን አሳይ"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"ለጊዜው አይገኝም"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM የለም"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"የአውታረ መረብ ምርጫዎች"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ከይፋዊ አውታረ መረቦች ጋር አገናኝ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"የአውታረ መረብ ግንኙነት በይነመረብ፣ ገመድ-አልባ፣ ውሂብ፣ wifi፣ wi-fi፣ wi fi፣ ተንቀሳቃሽ ስልክ፣ ሞባይል፣ የተንቀሳቃሽ ስልክ አገልግሎት አቅራቢ፣ 4ጂ፣ 3ጂ፣ 2ጂ፣ lte፣ ኤልቲኢ"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Wi-Fi ያብሩ"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Wi-Fiን አጥፋ"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ አውታረ መረብ"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"ሲም"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"የወረደ ሲም"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"የወረዱ ሲሞች"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"ንቁ"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"ያልነቃ"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / ለ<xliff:g id="ID_1">%1$s</xliff:g> ነባሪ"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"ለሁሉም መተግበሪያዎች እና አገልግሎቶች"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"የጨዋታ ቅንብሮች"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"የጨዋታ ዳሽቦርድ አቋራጭን ያብሩ ወዘተ"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"ቀዳሚ"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"ቀጣይ"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"የቀለም ቅድመ-እይታ"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"የሲም ካርድ መዳረሻ ጥያቄ"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"አንድ መሣሪያ ሲም ካርድዎን መድረስ ይፈልጋል። ዝርዝሮችን ለማግኘት መታ ያድርጉ።"</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"የሲም ካርድ መዳረሻ ይፈቀድ?"</string>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index e8f4b7e..2f19c46 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"تخزين مؤقت (برنامج النشاط)"</item>
     <item msgid="8186970968968646288">"تخزين مؤقت (فارغ)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"أزرق مخضر"</item>
+    <item msgid="7216413848731287689">"سماوي"</item>
     <item msgid="5661027589207588703">"أزرق"</item>
-    <item msgid="3795787248113275442">"نيلي"</item>
+    <item msgid="1219738214736244749">"أخضر"</item>
     <item msgid="6331809026622602308">"أرجواني"</item>
     <item msgid="6390546163902724700">"قرنفلي"</item>
-    <item msgid="6618900408138432102">"أحمر"</item>
+    <item msgid="6500473130620545980">"برتقالي"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"تم إنشاؤها قبل أكثر من 30 يومًا."</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 94d46ca..9c4193e 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -500,11 +500,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"مرة أخرى"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"اتّبِع رمز بصمة الإصبع"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"استمر في وضع إصبعك ورفعه لإضافة الأجزاء المختلفة لبصمة الإصبع"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"انقر مع الاستمرار في كل مرة يتحرك فيها رمز بصمة الإصبع. يساعد هذا على التقاط قدر أكبر من بصمة إصبعك."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"ضع طرف إصبعك على المستشعر."</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"في النهاية، ضع حواف إصبعك."</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"ضع جانب بصمة الإصبع على المستشعر واضغط مع الاستمرار ثم بدِّل إلى الجانب الآخر."</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"يساعد هذا على التقاط قدر أكبر من بصمة إصبعك."</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"انقر مع الاستمرار في كل مرة يتحرك فيها رمز بصمة الإصبع. يساعدك هذا الإجراء في تسجيل بصمة إصبعك بالكامل."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"يساعدك هذا الإجراء في تسجيل بصمة إصبعك بالكامل."</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"تسجيل بصمة الإصبع <xliff:g id="PERCENTAGE">%d</xliff:g> في المئة."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"تمت إضافة بصمة الإصبع"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"يمكنك الآن استخدام بصمة إصبعك لفتح قفل هاتفك أو إثبات هويتك، مثلاً عند تسجيل الدخول إلى التطبيقات."</string>
@@ -3029,8 +3026,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"استخدام النظام خلال آخر 24 ساعة"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"استخدام النظام خلال <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"استخدام التطبيق خلال <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"صباحًا"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"مساءً"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"مدة الاستخدام الإجمالي: أقل من دقيقة"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"مدة استخدام البطارية في الخلفية: أقل من دقيقة"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"مدة الاستخدام الإجمالي: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5756,6 +5751,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"‏تشغيل \"مساعد Google\" عن طريق الضغط مع الاستمرار على زر التشغيل"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"قائمة زر التشغيل وحالات الطوارئ:\nاضغط على زرَّي التشغيل ورفع الصوت في آنٍ واحد."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"منع الرنين:\nالاختصار متاح في قائمة مفتاح مستوى الصوت."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"مدة الضغط والضغط مع الاستمرار"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"يمكنك تعديل حساسية الضغطة من خلال اختيار مدة الضغط والضغط مع الاستمرار على زر التشغيل."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"ضغطة قصيرة"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"ضغطة طويلة"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"إظهار المحفظة"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"السماح بالوصول إلى المحفظة من شاشة القفل والإعدادات السريعة"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"إظهار عناصر التحكّم في الجهاز"</string>
@@ -5801,7 +5800,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"غير متاح مؤقتًا"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"‏بلا شريحة SIM"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"الإعدادات المفضَّلة للشبكة"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"‏الاتصال بشبكات Wi-Fi عامة"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"‏الاتصال بالشبكة، الإنترنت، لاسلكي، بيانات، wifi، wi-fi، wi fi، خلوي، جهاز جوّال، مشغل شبكة الجوال، جيل رابع، جيل ثالث، جيل ثاني، lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"‏تفعيل شبكة Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"‏إيقاف Wi-Fi"</string>
@@ -5819,6 +5817,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"‏شبكة W+‎"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"‏شريحة SIM التي تم تنزيلها"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"‏شرائح SIM التي تم تنزيلها"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"نشطة"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"غير نشطة"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / الإعدادات التلقائية لـ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5896,6 +5895,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"لكل التطبيقات والخدمات"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"إعدادات الألعاب"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"تفعيل \"اختصار لوحة بيانات الألعاب\" إلخ"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"السابق"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"التالي"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"معاينة اللون"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"‏طلب الوصول إلى شريحة SIM"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"‏يريد أحد الأجهزة الوصول إلى شريحة SIM. انقر للحصول على التفاصيل."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"‏هل تريد السماح بالوصول إلى شريحة SIM؟"</string>
diff --git a/res/values-as/arrays.xml b/res/values-as/arrays.xml
index 8ffed81..7e9132b 100644
--- a/res/values-as/arrays.xml
+++ b/res/values-as/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"কেশ্ব কৰা হোৱা (কাৰ্যকলাপ গ্ৰাহক)"</item>
     <item msgid="8186970968968646288">"কেশ্ব কৰা হোৱা (খালী)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"গাঢ় সেউজ-নীলা"</item>
+    <item msgid="7216413848731287689">"সেউজ নীলা"</item>
     <item msgid="5661027589207588703">"নীলা"</item>
-    <item msgid="3795787248113275442">"ইণ্ডিগ\'"</item>
+    <item msgid="1219738214736244749">"সেউজীয়া"</item>
     <item msgid="6331809026622602308">"বেঙুনীয়া"</item>
     <item msgid="6390546163902724700">"গুলপীয়া"</item>
-    <item msgid="6618900408138432102">"ৰঙা"</item>
+    <item msgid="6500473130620545980">"কমলা"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"৩০দিনতকৈ অধিক পুৰণি"</item>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 067af83..f69095f 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -331,7 +331,7 @@
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_message_accessibility" msgid="1986648712195281391"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"আৰম্ভণি"</string>
-    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="2965952386172202665">"সাধ্য সুবিধা ম\'ডত ফেচ আনলক অফ কৰিলে, TalkBackত কিছুমান ছেটআপৰ পদক্ষেপে ভালদৰে কাম নকৰিবও পাৰে।"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="2965952386172202665">"সাধ্য সুবিধা ম\'ডত ফেচ আনলক অফ কৰিলে, টকবেকত কিছুমান ছেটআপৰ পদক্ষেপে ভালদৰে কাম নকৰিবও পাৰে।"</string>
     <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"উভতি যাওক"</string>
     <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"ছেট আপ কৰাটো অব্যাহত ৰাখক"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"সাধ্য সুবিধা ছেট আপ ব্যৱহাৰ কৰক"</string>
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"আৰু এবাৰ"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"ফিংগাৰপ্ৰিণ্টৰ চিহ্নটো অনুসৰণ কৰক"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"আপোনাৰ ফিংগাৰপ্ৰিণ্টৰ সকলো অংশ যোগ কৰিবলৈ আঙুলিটো কেইবাবাৰো উঠাব আৰু পুনৰ লগাব লাগিব"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"প্ৰতিবাৰে ফিংগাৰপ্ৰিণ্টৰ চিহ্নটো লৰচৰ কৰিলে সেইটোত স্পৰ্শ কৰি ধৰি ৰাখক। এইটোৱে আপোনাৰ ফিংগাৰপ্ৰিণ্টৰ অধিক কেপচাৰ কৰাত সহায় কৰে।"</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"ছেন্সৰটোত আপোনাৰ আঙুলিটোৰ আগ অংশ ৰাখক"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"অৱশেষত, আপোনাৰ আঙুলিটোৰ কাষকেইটা ৰাখক"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"আপোনাৰ ফিংগাৰপ্ৰিণ্টৰ কাষটো ছেন্সৰটোত ৰাখি অলপ সময় ধৰি থাকক, তাৰ পাছত আনটো কাষ ৰাখক"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"এইটোৱে আপোনাৰ ফিংগাৰপ্ৰিণ্টৰ অধিক কেপচাৰ কৰাত সহায় কৰে"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"প্ৰতিবাৰে ফিংগাৰপ্ৰিণ্টৰ চিহ্নটো লৰচৰ কৰিলে সেইটোত স্পৰ্শ কৰি ধৰি ৰাখক। এইটোৱে আপোনাৰ সম্পূৰ্ণ ফিংগাৰপ্ৰিণ্টটো কেপচাৰ কৰাত সহায় কৰে।"</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"এইটোৱে আপোনাৰ সম্পূৰ্ণ ফিংগাৰপ্ৰিণ্ট কেপচাৰ কৰাত সহায় কৰে"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"ফিংগাৰপ্ৰিণ্ট <xliff:g id="PERCENTAGE">%d</xliff:g> শতাংশ পঞ্জীয়ন কৰা হ\'ল"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"ফিংগাৰপ্ৰিণ্ট যোগ কৰা হ’ল"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"এতিয়া আপুনি নিজৰ ফ’নটো আনলক কৰিবলৈ অথবা এপত ছাইন ইন কৰাৰ দৰে কাৰ্য কৰোঁতে এইয়া আপুনিয়েই বুলি সত্যাপন কৰিবলৈ নিজৰ ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰিব পাৰে"</string>
@@ -2285,7 +2282,7 @@
     <string name="user_installed_services_category_title" msgid="2639470729311439731">"ডাউনল’ড কৰা এপ্"</string>
     <string name="experimental_category_title" msgid="898904396646344152">"পৰীক্ষামূলক"</string>
     <string name="feature_flags_dashboard_title" msgid="348990373716658289">"বৈশিষ্ট সম্পৰ্কীয় পতাকাবোৰ"</string>
-    <string name="talkback_title" msgid="8756080454514251327">"TalkBack"</string>
+    <string name="talkback_title" msgid="8756080454514251327">"টকবেক"</string>
     <string name="talkback_summary" msgid="5820927220378864281">"স্ক্ৰীণ ৰীডাৰ সেৱা প্ৰধানতঃ অন্ধ আৰু চকুৰে কম দেখা লোকৰ বাবে"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"ডাঙৰকৈ পঢ়ি দিয়া শুনিবলৈ স্ক্ৰীণত থকা বস্তুবোৰ স্পৰ্শ কৰক"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"কেপশ্বনৰ অগ্ৰাধিকাৰসমূহ"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"যোৱা ২৪ ঘণ্টাত হোৱা ছিষ্টেমৰ ব্যৱহাৰ"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"<xliff:g id="SLOT">%s</xliff:g>ৰ বাবে ছিষ্টেমৰ ব্যৱহাৰ"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"<xliff:g id="SLOT">%s</xliff:g>ৰ বাবে এপৰ ব্যৱহাৰ"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"পূৰ্বাহ্ন"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"অপৰাহ্ন"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"মুঠ: এক মিনিটতকৈ কম"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"নেপথ্য: এক মিনিটতকৈ কম"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"মুঠ: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"পাৱাৰ বুটাম টিপি ধৰি ৰাখি Assistant সক্ৰিয় কৰক"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"পাৱাৰ আৰু জৰুৰীকালীন মেনু:\nপাৱাৰ আৰু ভলিউম বঢ়োৱা বুটাম একেলগে টিপক।"</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"ৰিং কৰাত বাধা দিয়ক:\nভলিউমৰ মেনুখনত শ্বৰ্টকাট উপলব্ধ।"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"হেঁচি ধৰি থকাৰ সময় অৱধি"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"পাৱাৰ বুটামটো কিমান সময়লৈ হেঁচি ধৰি থাকিব লাগে সেয়া বাছনি কৰি সংবেদনশীলতা মিলাওক"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"চুটি"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"দীঘলীয়া"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"ৱালেট দেখুৱাওক"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"লক স্ক্ৰীন আৰু ক্ষিপ্ৰ ছেটিঙৰ পৰা ৱালেটৰ এক্সেছ দিয়ক"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"ডিভাইচৰ নিয়ন্ত্ৰণ দেখুৱাওক"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"সাময়িকভাৱে উপলব্ধ নহয়"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"ছিম নাই"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"নেটৱৰ্কৰ অগ্ৰাধিকাৰ"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ৰাজহুৱা নেটৱৰ্কসমূহৰ সৈতে সংযোগ কৰক"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"নেটৱৰ্ক সংযোগ, ইণ্টাৰনেট, বেতাঁৰ, ডেটা, ৱাইফাই, ৱাই-ফাই, ৱাই ফাই, চেলুলাৰ, ম’বাইল, চেল কেৰিয়াৰ, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"বাই-ফাই অন কৰক"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"ৱাই-ফাই অফ কৰক"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ নেটৱৰ্ক"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"ছিম"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"ডাউনল’ড কৰা ছিম"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"ডাউনল’ড কৰা ছিম"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"সক্ৰিয় হৈ আছে"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"নিষ্ক্ৰিয় হৈ আছে"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / <xliff:g id="ID_1">%1$s</xliff:g>ৰ বাবে ডিফ’ল্ট"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"আটাইবোৰ এপ্‌ আৰু সেৱাৰ বাবে"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"গে’ম ছেটিং"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"গে’ম ডেশ্বব’ৰ্ডৰ শ্বৰ্টকাট ইত্যাদি অন কৰক"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"পূৰ্বৱৰ্তী"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"পৰৱৰ্তী"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"ৰঙৰ পূৰ্বদৰ্শন"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"ছিম কাৰ্ড এক্সেছ কৰাৰ অনুৰোধ"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"এটা ডিভাইচে আপোনাৰ ছিম কাৰ্ড এক্সেছ কৰিব বিচাৰিছে। সবিশেষ জানিবলৈ টিপক।"</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"ছিম কাৰ্ড এক্সেছ কৰিবলৈ দিবনে?"</string>
diff --git a/res/values-az/arrays.xml b/res/values-az/arrays.xml
index 70de5cb..08a2243 100644
--- a/res/values-az/arrays.xml
+++ b/res/values-az/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Keşlənmiş (fəaliyyət klienti)"</item>
     <item msgid="8186970968968646288">"Keşlənmiş (boş)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Firuzəyi"</item>
+    <item msgid="7216413848731287689">"Mavi"</item>
     <item msgid="5661027589207588703">"Göy"</item>
-    <item msgid="3795787248113275442">"İndiqo"</item>
+    <item msgid="1219738214736244749">"Yaşıl"</item>
     <item msgid="6331809026622602308">"Bənövşəyi"</item>
     <item msgid="6390546163902724700">"Çəhrayı"</item>
-    <item msgid="6618900408138432102">"Qırmızı"</item>
+    <item msgid="6500473130620545980">"Narıncı"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 gündən köhnə"</item>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 2012fd0..a9ba491 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Bir daha"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Barmaq izi ikonasını izləyin"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Barmaq izini tam əlavə etmək üçün barmağınızı qaldırmağa davam edin"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Hər dəfə barmaq izi ikonası hərəkət etdikdə toxunub saxlayın. Bu, barmaq izinizi daha yaxşı çəkməyə kömək edir."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Barmağınızın ucunu sensora yerləşdirin"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Sonra, barmağınızın kənarlarını yerləşdirin"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Barmaq izinizin yan tərəfini sensora yerləşdirib saxlayın, sonra digər tərəfə keçin"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Bu, barmaq izinizi daha yaxşı çəkməyə kömək edir"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Hər dəfə barmaq izi ikonası hərəkət etdikdə toxunub saxlayın. Bu, tam barmaq izinizi çəkməyə kömək edir."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Bu, tam barmaq izinizi çəkməyə kömək edir"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Barmaq izi qeydiyyatı: <xliff:g id="PERCENTAGE">%d</xliff:g> faiz"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Barmaq izi əlavə edildi"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"İndi tətbiqlərə daxil olmaq kimi hallarda telefonu kiliddən çıxarmaq və ya kimlik doğrulaması üçün barmaq izinizdən istifadə edə bilərsiniz"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Son 24 saat üçün sistem istifadəsi"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"<xliff:g id="SLOT">%s</xliff:g> üçün sistem istifadəsi"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"<xliff:g id="SLOT">%s</xliff:g> üçün tətbiq istifadəsi"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"am"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"pm"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Cəmi: bir dəqiqədən az"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Arxa fon: bir dəqiqədən az"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Cəmi: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Qidalanma düyməsini basıb saxlayaraq Assistenti işə salın"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Qidalanma &amp; Fövqəladə Hal Menyusu:\nQidalanma və Səsin artırılması düymələrini eyni anda basın."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Zəng çalmanın qarşısını alın:\nSəs səviyyəsi menyusunda qısayol verilmişdir."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Basıb saxlama müddəti"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Qidalanma düyməsinə nə qədər basıb saxlamağı seçərək həssaslığı tənzimləyin"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Qısa"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Uzun"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Pulqabını göstərin"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Kilid ekranından və sürətli ayarlardan pulqabına girişə icazə verin"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Cihaz nizamlayıcılarını göstərin"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Müvəqqəti olaraq əlçatan deyil"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM yoxdur"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Şəbəkə tərcihləri"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"İctimai şəbəkələrə qoşulsun"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"şəbəkə bağlantısı, internet, simsiz, data, wifi, wi-fi, wi fi, mobil şəbəkə, mobil, mobil operator, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Wi-Fi\'ı aktivləşdirin"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Wi-Fi şəbəkəsini deaktiv edin"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ şəbəkəsi"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"ENDİRİLMİŞ SIM"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"ENDİRİLMİŞ SIM-LƏR"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Aktiv"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"İnaktiv"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / <xliff:g id="ID_1">%1$s</xliff:g> üçün defolt"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Bütün tətbiqlər və xidmətlər üçün"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Oyun ayarları"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Oyun Paneli qısayolunu aktiv edin və s."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Öncəki"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Sonrakı"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Rəng önizləməsi"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SİM karta giriş sorğusu"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Cihaz SİM kartınıza giriş etmək istəyir. Detallar üçün toxunun."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"SİM karta girişə icazə verilsin?"</string>
diff --git a/res/values-b+sr+Latn/arrays.xml b/res/values-b+sr+Latn/arrays.xml
index 8a03b5f..3c3be0f 100644
--- a/res/values-b+sr+Latn/arrays.xml
+++ b/res/values-b+sr+Latn/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Keširana (klijent aktivnosti)"</item>
     <item msgid="8186970968968646288">"Keširana (prazno)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Plavozelena"</item>
+    <item msgid="7216413848731287689">"Tirkizna"</item>
     <item msgid="5661027589207588703">"Plava"</item>
-    <item msgid="3795787248113275442">"Tamnoplava"</item>
+    <item msgid="1219738214736244749">"Zelena"</item>
     <item msgid="6331809026622602308">"Ljubičasta"</item>
     <item msgid="6390546163902724700">"Roze"</item>
-    <item msgid="6618900408138432102">"Crvena"</item>
+    <item msgid="6500473130620545980">"Narandžasta"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Starije od 30 dana"</item>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 2ccdea3..c110dd1 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -488,11 +488,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Još jednom"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Pratite ikonu utiska prsta"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Nastavite da podižete prst da biste dodali različite delove otiska prsta"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Dodirnite i zadržite svaki put kada se ikona otiska prsta pomeri. Tako ćete snimiti veći deo otiska prsta."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Stavite vrh prsta na senzor"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Na kraju stavite ivice prsta"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Stavite jednu stranu prsta na senzor i zadržite, pa stavite drugu stranu"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Tako ćete snimiti veći deo otiska prsta"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Dodirnite i zadržite svaki put kada se ikona otiska prsta pomeri. Ovo nam pomaže da snimimo ceo otisak prsta."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Ovo nam pomaže da snimimo ceo otisak prsta"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Registrovanje otiska prsta je na <xliff:g id="PERCENTAGE">%d</xliff:g> posto"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Otisak prsta je dodat"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Sada možete da koristite otisak prsta za otključavanje telefona ili potvrdu identiteta, na primer, kad se prijavljujete u aplikacije"</string>
@@ -2915,8 +2912,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Potrošnja od strane sistema u prethodna 24 sata"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Potrošnja od strane sistema za: <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Potrošnja od strane aplikacija za: <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"pre podne"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"po podne"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Ukupno: manje od minut"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Pozadina: manje od minut"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Ukupno: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5489,6 +5484,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Pokrenite Pomoćnik tako što ćete zadržati dugme za uključivanje"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Meni dugmeta za uključivanje i za hitne slučajeve:\nIstovremeno pritisnite dugme za uključivanje i dugme za pojačavanje zvuka."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Spreči zvonjenje:\nPrečica je dostupna u meniju dugmeta za jačinu zvuka."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Koliko dugo treba da se pritisne i zadrži"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Prilagodite osetljivost tako što ćete odabrati koliko dugo treba da se pritisne i zadrži dugme za uključivanje"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Kratko"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Dugo"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Prikaži novčanik"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Dozvolite pristup novčaniku sa zaključanog ekrana i iz brzih podešavanja"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Prikaži kontrole uređaja"</string>
@@ -5534,7 +5533,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Privremeno je nedostupno"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nema SIM kartice"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Podešavanja mreže"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Povežite se sa javnim mrežama"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"mrežna veza, internet, bežično, podaci, wifi, wi-fi, wi fi, mobilni telefon, mobilni, mobilni operater, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Uključi WiFi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Isključi WiFi"</string>
@@ -5552,6 +5550,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ mreža"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"PREUZETI SIM"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"PREUZETE SIM KARTICE"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Aktivno"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Neaktivno"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" /Podrazumevano za: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5629,6 +5628,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Za sve aplikacije i usluge"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Podešavanja igara"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Uključite prečicu za kontrolnu tablu igre itd."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Prethodna"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Sledeća"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Pregled boje"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Zahtev za pristup SIM kartici"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Uređaj želi da pristupa SIM kartici. Dodirnite za detalje."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Želite da dozvolite pristup SIM kartici?"</string>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index c890c97..bb99c97 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Кэшавана (кліент дзейнасці)"</item>
     <item msgid="8186970968968646288">"Кэшавана (пуста)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Сіне-зялёны"</item>
+    <item msgid="7216413848731287689">"Блакітны"</item>
     <item msgid="5661027589207588703">"Сiнi"</item>
-    <item msgid="3795787248113275442">"Індыга"</item>
+    <item msgid="1219738214736244749">"Зялёны"</item>
     <item msgid="6331809026622602308">"Фіялетавы"</item>
     <item msgid="6390546163902724700">"Ружовы"</item>
-    <item msgid="6618900408138432102">"Чырвоны"</item>
+    <item msgid="6500473130620545980">"Аранжавы"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Старэйшыя за 30 дзён"</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 2b3afe8..73148c8 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -492,11 +492,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Яшчэ адзін раз"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Сачыце за значком адбітка пальца"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Дакраніцеся некалькі разоў, каб адбітак быў больш дакладны"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Кожны раз падчас руху значка адбітка пальца ўтрымлівайце палец націснутым. Гэта працэдура дапаможа больш дакладна зафіксаваць адбітак пальца."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Прыкладзіце да датчыка кончык пальца"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Пасля прыкладзіце краі пальца"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Прыкладзіце палец да датчыка адным бокам і ўтрымлівайце яго, потым павярніце іншым бокам"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Гэта працэдура дапаможа больш дакладна зафіксаваць адбітак пальца"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Кожны раз падчас руху значка адбітка пальца ўтрымлівайце палец націснутым. Гэта дзеянне дапаможа атрымаць поўны адбітак пальца."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Гэта дзеянне дапаможа атрымаць поўны адбітак пальца"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
@@ -2955,8 +2952,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Выкарыстанне сістэмай зараду за апошнія 24 гадз"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Выкарыстанне сістэмай за <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Выкарыстанне праграмай за <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"перад паўднём"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"пасля паўдня"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Усяго: менш адной хвіліны"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"У фонавым рэжыме: менш адной хвіліны"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Усяго: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5580,6 +5575,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Для выкліку Памочніка ўтрымлівайце націснутай кнопку сілкавання"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Меню кнопкі сілкавання і экстранных выклікаў:\nадначасова націсніце кнопку сілкавання і павелічэння гучнасці."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Прадухіліць званок:\nярлык даступны ў меню гучнасці."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Працягласць націску і ўтрымання"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Наладзіць адчувальнасць, выбраўшы працягласць націску і ўтрымання кнопкі сілкавання"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Коратка"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Доўга"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Паказ кашалька"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Дазволіць доступ да кашалька з заблакіраванага экрана і хуткіх налад"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Паказ элементаў кіравання прыладай"</string>
@@ -5625,7 +5624,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Часова недаступны"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Няма SIM-карты"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Параметры сеткі"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Падключацца да агульнадаступных сетак"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"падключэнне да сеткі, інтэрнэт, бесправадны, даныя, wifi, wi-fi, wi fi, сотавая сетка, мабільны, аператар сотавай сувязі, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Уключыць Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Выключыць Wi-Fi"</string>
@@ -5643,6 +5641,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"Сетка W+"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM-карта"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"СПАМПАВАНАЯ SIM-КАРТА"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"СПАМПАВАНЫЯ SIM-КАРТЫ"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Актыўная"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Неактыўная"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Стандартна для наступнага: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5720,6 +5719,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Для ўсіх праграм і сэрвісаў"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Налады гульні"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Уключэнне ярлыка гульнявой панэлі і г. д."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Назад"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Далей"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Перадпрагляд колеру"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Запыт на доступ да SIM-карты"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Прылада запытвае доступ да SIM-карты. Націсніце, каб убачыць больш інфармацыі."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Дазволіць доступ да SIM-карты?"</string>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 8146b3b..bcb64eb 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Кеширано (клиентска програма за активността)"</item>
     <item msgid="8186970968968646288">"Кеширано (празно)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"синьо-зелено"</item>
+    <item msgid="7216413848731287689">"синьо-зелено"</item>
     <item msgid="5661027589207588703">"синьо"</item>
-    <item msgid="3795787248113275442">"индиго"</item>
+    <item msgid="1219738214736244749">"зелено"</item>
     <item msgid="6331809026622602308">"лилаво"</item>
     <item msgid="6390546163902724700">"розово"</item>
-    <item msgid="6618900408138432102">"червено"</item>
+    <item msgid="6500473130620545980">"оранжево"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"По-стари от 30 дни"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 2d2cf37..3ed87f1 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Още веднъж"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Следвайте иконата за отпечатъци"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Продължавайте да вдигате пръста си, за да добавите различните части от отпечатъка си"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"При всяко преместване на иконата за отпечатъци я докоснете и задръжте. По този начин се улавя най-голяма част от отпечатъка ви."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Поставете върха на пръста си върху сензора"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Накрая поставете краищата на пръста си"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Поставете едната страна на отпечатъка си върху сензора и задръжте, след това поставете другата"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"По този начин се улавя най-голяма част от отпечатъка ви"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"При всяко преместване на иконата за отпечатъци я докоснете и задръжте. Това помага да се обхване целият ви отпечатък."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Това помага да се обхване целият ви отпечатък"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
@@ -2879,8 +2876,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Използване от системата за последните 24 ч"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Използване от системата за <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Използване от приложенията за <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"am"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"pm"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Общо: По-малко от една минута"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"На заден план: По-малко от една минута"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Общо: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5402,6 +5397,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Задействайте Асистент, като задържите бутона за включване/изключване"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Меню за включване/изключване и при спешни случаи:\nНатиснете едновременно бутона за включване/изключване и този за увеличаване на силата на звука."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Предотвратяване на звъненето:\nВ менюто за силата на звука е налице пряк път."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Продължителност на натискането и задържането"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Коригирайте чувствителността, като изберете колко дълго да трябва да задържите натиснат бутона за захранване"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Кратко"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Продължително"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Показване на портфейла"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Разрешаване на достъп до портфейла от заключения екран и от бързите настройки"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Показване на контролите за устройството"</string>
@@ -5447,7 +5446,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Временно не е налице"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Няма SIM карта"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Предпочитания за мрежата"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Свързване с обществени мрежи"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"връзка с мрежата, интернет, безжична мрежа, данни, Wi-Fi, мобилни данни, мобилна мрежа, мобилен оператор, 4G, 3G, 2G, LTE"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Включване на Wi‑Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Изключване на Wi-Fi"</string>
@@ -5465,6 +5463,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ мрежа"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM карта"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"ИЗТЕГЛЕНА SIM КАРТА"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"ИЗТЕГЛЕНИ SIM КАРТИ"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Активна"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Неактивна"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" /основна за <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5542,6 +5541,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"За всички приложения и услуги"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Настройки за игри"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Включване на прекия път в таблото за управление на играта и др."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Назад"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Напред"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Визуализация на цвета"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Заявка за достъп до SIM картата"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Устройство иска да осъществи достъп до SIM картата ви. Докоснете за подробности."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Да се разреши ли достъпът до SIM картата?"</string>
diff --git a/res/values-bn/arrays.xml b/res/values-bn/arrays.xml
index 1f1afe9..03504a4 100644
--- a/res/values-bn/arrays.xml
+++ b/res/values-bn/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"ব্যবহৃত ক্যাশে (অ্যাক্টিভিটি ক্লায়েন্ট)"</item>
     <item msgid="8186970968968646288">"ব্যবহৃত ক্যাশে (খালি)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"টিল"</item>
+    <item msgid="7216413848731287689">"নীলাভ রঙ"</item>
     <item msgid="5661027589207588703">"নীল"</item>
-    <item msgid="3795787248113275442">"বেগুনী নীলবর্ণ"</item>
+    <item msgid="1219738214736244749">"সবুজ রঙ"</item>
     <item msgid="6331809026622602308">"বেগুনী"</item>
     <item msgid="6390546163902724700">"গোলাপী"</item>
-    <item msgid="6618900408138432102">"লাল"</item>
+    <item msgid="6500473130620545980">"কমলা রঙ"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"৩০ দিনের বেশি পুরনো"</item>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index d9e61c0..e730775 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"আরও একবার"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"আঙ্গুলের ছাপ আইকন ফলো করুন"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"আপনার আঙ্গুলের ছাপের বিভিন্ন অংশ যোগ করার জন্য বারবার আঙুল তুলে আবার স্পর্শ করতে থাকুন"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"প্রতিবার ফিঙ্গারপ্রিন্ট আইকনটি সরার সময় টাচ করে ধরে থাকুন। এইভাবে সহজে আপনার ফিঙ্গারপ্রিন্টের বেশিরভাগটাই ক্যাপচার করা যাবে।"</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"সেন্সরে আপনার আঙুল ছোঁয়ান"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"পরিশেষে, আপনার আঙুলের প্রান্ত ছোঁয়ান"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"সেন্সরের উপরে আপনার ফিঙ্গারপ্রিন্টের এক দিক ছুঁইয়ে ধরে রাখুন তারপর অন্য দিকটিও ছোঁয়ান এবং একই ভাবে ধরে রাখুন"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"এইভাবে সহজে আপনার ফিঙ্গারপ্রিন্টের বেশিরভাগটাই ক্যাপচার করা যাবে"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"প্রতিবার আঙ্গুলের ছাপ আইকনটি সরার সময় টাচ করে ধরে থাকুন। এর সহায়তায় আপনি সম্পূর্ণ আঙ্গুলের ছাপ ক্যাপচার করতে পারবেন।"</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"এর সহায়তায় আপনি সম্পূর্ণ আঙ্গুলের ছাপ ক্যাপচার করতে পারবেন"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"আঙ্গুলের ছাপ নথিভুক্ত করার কাজটি <xliff:g id="PERCENTAGE">%d</xliff:g> শতাংশ সম্পূর্ণ হয়েছে"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"আঙ্গুলের ছাপ যোগ করা হয়েছে"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"অ্যাপে সাইন-ইন করার মতোই এখন ফিঙ্গারপ্রিন্ট ব্যবহার করে আপনি ফোন আনলক বা নিজের পরিচয় যাচাই করতে পারবেন"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"গত ২৪ ঘন্টা ব্যাটারি সিস্টেম ব্যবহারের তথ্য"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"<xliff:g id="SLOT">%s</xliff:g>-এর জন্য সিস্টেমের ব্যবহার"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"<xliff:g id="SLOT">%s</xliff:g>-এর জন্য অ্যাপের ব্যবহার"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"am"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"pm"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"মোট: এক মিনিটের থেকে কম"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"ব্যাকগ্রাউন্ড: এক মিনিটের থেকে কম"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"মোট: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"পাওয়ার বোতাম প্রেস করে ধরে রেখে Assistant চালু করুন"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"পাওয়ার &amp; ইমারজেন্সি মেনু:\nএকসাথে \'পাওয়ার\' এবং \'ভলিউম বাড়ানোর বোতাম\' প্রেস করুন।"</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"রিং হওয়া বন্ধ করতে:\n\'ভলিউম\' মেনুতে শর্টকাট রয়েছে।"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"বোতাম টিপে রাখার সময়"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"পাওয়ার বোতাম কতক্ষণ টিপে ধরে থাকবেন সেটি বেছে নিয়ে সেন্সিটিভিটি অ্যাডজাস্ট করুন"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"কম সময়ের জন্য"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"দীর্ঘ সময়ের জন্য"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"ওয়ালেট দেখুন"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"লক স্ক্রিন এবং দ্রুত সেটিংস থেকে ওয়ালেটে অ্যাক্সেসের অনুরোধ করুন"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"ডিভাইস কন্ট্রোল দেখুন"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"সাময়িকভাবে উপলভ্য নেই"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"কোনও সিম নেই"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"নেটওয়ার্ক সংক্রান্ত পছন্দ"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"সর্বজনীন নেটওয়ার্কে কানেক্ট করুন"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"নেটওয়ার্ক কানেকশন, ইন্টারনেট, ওয়্যারলেস, ডেটা, ওয়াই-ফাই, ওয়াই-ফাই, ওয়াই-ফাই, মোবাইল ডেটা, মোবাইল, মোবাইল পরিষেবা প্রদানকারী, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"ওয়াই-ফাই চালু করুন"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"ওয়াই-ফাই বন্ধ করুন"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ নেটওয়ার্ক"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"সিম"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"ডাউনলোড করা সিম"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"ডাউনলোড করা সিম"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"অ্যাক্টিভ আছে"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"অ্যাক্টিভ নেই"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / <xliff:g id="ID_1">%1$s</xliff:g> এর জন্য ডিফল্ট হিসেবে"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"সমস্ত অ্যাপ ও পরিষেবার জন্য"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"গেম সেটিংস"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"গেম ড্যাশবোর্ড শর্টকাট ইত্যাদি চালু করুন"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"আগের"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"পরের"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"রঙের এক ঝলক"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"সিম কার্ড অ্যাক্সেস করার অনুমতি"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"একটি ডিভাইস আপনার সিম কার্ড অ্যাক্সেস করতে চাইছে। বিশদ বিবরণের জন্য ট্যাপ করুন।"</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"সিম কার্ড অ্যাক্সেস করার অনুমতি দিতে চান?"</string>
diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml
index 2f727e8..8e60228 100644
--- a/res/values-bs/arrays.xml
+++ b/res/values-bs/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Keširana (aktivnost klijenta)"</item>
     <item msgid="8186970968968646288">"Keširano (prazno)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Plavozelena"</item>
+    <item msgid="7216413848731287689">"Cijan"</item>
     <item msgid="5661027589207588703">"Plava"</item>
-    <item msgid="3795787248113275442">"Indigoplava"</item>
+    <item msgid="1219738214736244749">"Zelena"</item>
     <item msgid="6331809026622602308">"Ljubičasta"</item>
     <item msgid="6390546163902724700">"Ružičasta"</item>
-    <item msgid="6618900408138432102">"Crvena"</item>
+    <item msgid="6500473130620545980">"Narandžasta"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Starije od 30 dana"</item>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 04614ad..fe00a42 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -488,11 +488,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Još jednom"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Pratite ikonu otiska prsta"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Nastavite podizati prst da dodate različite dijelove otiska prsta"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Dodirnite i zadržite svaki put kada se ikona otiska prsta pomjeri. Na ovaj način se snima veći dio otiska prsta."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Postavite vrh prsta na senzor"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Na kraju, postavite rubove prsta"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Stranu prsta postavite na senzor i zadržite, a zatim ga prebacite na drugu stranu"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Na ovaj način se snima veći dio otiska prsta"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Dodirnite i zadržite svaki put kada se ikona otiska prsta pomjeri. Na ovaj način će se lakše snimiti cijeli otisak prsta."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Na ovaj način će se lakše snimiti cijeli otisak prsta"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Prijava otiska prsta: <xliff:g id="PERCENTAGE">%d</xliff:g> posto"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Dodan je otisak prsta"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Sada možete koristiti otisak prsta da otključate telefon ili potvrdite identitet, npr. kada se prijavljujete u aplikacije"</string>
@@ -2915,8 +2912,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Korištenje sistema u posljednja 24 h"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Korištenje sistema za: <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Korištenje aplikacije za: <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"prijepodne"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"poslijepodne"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Ukupno: manje od minute"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Pozadina: manje od minute"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Ukupno: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5489,6 +5484,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Aktivirajte Asistenta držanjem dugmeta za uključivanje"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Meni napajanja i hitnih službi:\nIstovremeno pritisnite dugme za uključivanje i dugme za pojačavanje zvuka."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Sprječavanje zvonjenja:\nPrečica je dostupna u meniju jačine zvuka."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Trajanje pritiska i držanja"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Podesite osjetljivost odabirom koliko dugo treba pritisnuti i držati dugme za uključivanje"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Kratko"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Dugo"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Prikaži novčanik"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Dozvolite pristup novčaniku sa zaključanog ekrana i iz brzih postavki"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Prikaži kontrole uređaja"</string>
@@ -5534,7 +5533,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Trenutno nije dostupno"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nema SIM-a"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Postavke mreže"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Povežite se s javnim mrežama"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"mrežna veza, internet, bežični, podaci, wifi, wi-fi, wi fi, celularni, mobilni, mobilni operater, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Uključite WiFi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Isključite WiFi"</string>
@@ -5552,6 +5550,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ mreža"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"PREUZETI SIM"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"PREUZETI SIM-ovi"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Aktivno"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Neaktivno"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Zadano za: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5629,6 +5628,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Za sve aplikacije i usluge"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Postavke igre"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Uključite prečicu za kontrolnu tablu igre, itd."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Nazad"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Naprijed"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Pregled boje"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Zahtjev za pristup SIM kartici"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Uređaj želi pristupiti vašoj SIM kartici. Dodirnite za detalje."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Dozvoliti pristup SIM kartici?"</string>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 1b97667..209a522 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"A la memòria cau (client de l\'activitat)"</item>
     <item msgid="8186970968968646288">"A la memòria cau (buit)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Verd blavós"</item>
+    <item msgid="7216413848731287689">"Cian"</item>
     <item msgid="5661027589207588703">"Blau"</item>
-    <item msgid="3795787248113275442">"Anyil"</item>
+    <item msgid="1219738214736244749">"Verd"</item>
     <item msgid="6331809026622602308">"Porpra"</item>
     <item msgid="6390546163902724700">"Rosa"</item>
-    <item msgid="6618900408138432102">"Vermell"</item>
+    <item msgid="6500473130620545980">"Taronja"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Més de 30 dies d\'antiguitat"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index dca5297..4571e14 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Un cop més"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Segueix la icona de l\'empremta digital"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Continua aixecant el dit per afegir les diferents parts de l\'empremta digital"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Mantén premuda la icona d\'empremta digital cada vegada que es mogui. Això ajuda a capturar millor l\'empremta digital."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Col·loca la punta del dit al sensor"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Per acabar, col·loca les vores del dit"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Col·loca un costat del dit al sensor i espera; a continuació, canvia a l\'altre costat"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Això ajuda a capturar millor l\'empremta digital"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Mantén premut el sensor cada vegada que la icona d\'empremta digital es mogui. Això ajuda a capturar l\'empremta digital completa."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Això ajuda a capturar l\'empremta digital completa"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Registre de l\'empremta digital <xliff:g id="PERCENTAGE">%d</xliff:g> per cent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"S\'ha afegit l\'empremta digital"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Ara pots utilitzar l\'empremta digital per desbloquejar el telèfon o verificar la teva identitat, com ara quan inicies la sessió en aplicacions"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Ús del sistema durant les 24 darreres hores"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Ús del sistema: <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Ús d\'aplicacions durant <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"a. m."</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"p. m."</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: menys d\'un minut"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"En segon pla: menys d\'un minut"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Activa l\'Assistent mantenint premut el botó d\'engegada"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Menú d\'engegada i emergència:\nPrem els botons d\'engegada i d\'apujar el volum al mateix temps."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Impedeix els sons:\nDrecera disponible al menú de volum."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Durada de mantenir premut"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Tria quanta estona vols mantenir premut el botó d\'engegada per ajustar la sensibilitat"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Curt"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Llarg"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Mostra la cartera"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Permet l\'accés a la cartera des de la pantalla de bloqueig i la configuració ràpida"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Mostra el control de dispositius"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"No disponible temporalment"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"No hi ha cap SIM"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferències de xarxa"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connecta\'t a xarxes públiques"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"connexió a la xarxa, internet, sense fil, dades, wifi, wi‑fi, wi fi, mòbils, mòbil, operador de telefonia mòbil, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Activa la Wi‑Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Desactiva la Wi‑Fi"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"Xarxa W+"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"SIM BAIXADA"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"SIM BAIXADES"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Activa"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Inactiva"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Opció predeterminada per a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Per a tots els serveis i aplicacions"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Configuració de jocs"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Activa la drecera al tauler de joc, etc."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Anterior"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Següent"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Previsualització del color"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Sol·licitud d\'accés a la targeta SIM"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Un dispositiu vol accedir a la teva targeta SIM. Toca per obtenir informació."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Vols permetre l\'accés a la targeta SIM?"</string>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index effe6a0..7b191af 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"V mezipaměti (klient aktivity)"</item>
     <item msgid="8186970968968646288">"V mezipaměti (prázdné)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Šedozelená"</item>
+    <item msgid="7216413848731287689">"Azurová"</item>
     <item msgid="5661027589207588703">"Modrá"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Zelená"</item>
     <item msgid="6331809026622602308">"Fialová"</item>
     <item msgid="6390546163902724700">"Růžová"</item>
-    <item msgid="6618900408138432102">"Červená"</item>
+    <item msgid="6500473130620545980">"Oranžová"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Starší než 30 dní"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index c55ec66..00ee366 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -492,11 +492,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Ještě jednou"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Sledujte ikonu otisku prstu"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Prst opakovaně zvedejte a pokládejte, aby se zaznamenaly různé části otisku."</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Podržte snímač pokaždé, když se ikona otisku prstu pohne. Bude tak zachycena větší část otisku prstu."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Umístěte špičku prstu na snímač"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Nakonec umístěte okraje prstu"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Umístěte boční stranu prstu na snímač a podržte ho, poté ho „překulte“ na druhou stranu"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Bude tak zachycena větší část otisku prstu"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Podržte snímač pokaždé, když se ikona otisku prstu pohne. To pomůže zaznamenat celý otisk prstu."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"To pomůže zaznamenat celý otisk prstu"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Registrace otisku prstu: <xliff:g id="PERCENTAGE">%d</xliff:g> procent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Otisk byl přidán"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Odteď můžete pomocí otisku prstu odemykat telefon nebo ověřovat svoji totožnost, například při přihlašování do aplikací."</string>
@@ -2953,8 +2950,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Využití baterie systémem za posledních 24 hodin"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Využití systému <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Využití aplikace <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"am"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"pm"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Celkem: méně než minuta"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Na pozadí: méně než minuta"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Celkem: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5578,6 +5573,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Asistenta aktivujete podržením vypínače"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Nabídka napájení a tísňového volání:\nStiskněte současně vypínač a tlačítko zvýšení hlasitosti."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Zabránit vyzvánění:\nZkratka je k dispozici v nabídce hlasitosti."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Délka podržení"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Nastavte citlivost úpravou délky podržení vypínače"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Krátké"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Dlouhé"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Zobrazit peněženku"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Povolit přístup k peněžence z obrazovky uzamčení a rychlého nastavení"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Zobrazit ovládací prvky zařízení"</string>
@@ -5623,7 +5622,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Dočasně nedostupné"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Žádná SIM karta"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Nastavení sítě"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Připojovat se k veřejným sítím"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"připojení k síti, internet, bezdrátové, data, wifi, wi-fi, wi fi, mobilní síť, mobilní operátor, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Zapnout Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Vypnout Wi-Fi"</string>
@@ -5641,6 +5639,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"Síť W+"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"STAŽENÁ SIM KARTA"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"STAŽENÉ SIM KARTY"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Aktivní"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Neaktivní"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Výchozí pro <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5718,6 +5717,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Pro všechny aplikace a služby"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Nastavení her"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Zapnout zkratku Herního panelu atd."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Předchozí"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Další"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Náhled barvy"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Žádost o přístup k SIM kartě"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Zařízení žádá o přístup k vaší SIM kartě. Podrobnosti zobrazíte klepnutím."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Povolit přístup k SIM kartě?"</string>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 0e5f665..103f57d 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Cachelagret (aktivitetsklient)"</item>
     <item msgid="8186970968968646288">"Cachelagret (tom)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Turkis"</item>
+    <item msgid="7216413848731287689">"Cyan"</item>
     <item msgid="5661027589207588703">"Blå"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Grøn"</item>
     <item msgid="6331809026622602308">"Lilla"</item>
     <item msgid="6390546163902724700">"Pink"</item>
-    <item msgid="6618900408138432102">"Rød"</item>
+    <item msgid="6500473130620545980">"Orange"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Mere end 30 dage gamle"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index cbbe51d..b5cdbd6 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -295,17 +295,17 @@
     <string name="owner_info_settings_edit_text_hint" msgid="841926875876050274">"Eksempel: Jacobs Android"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Vis profiloplysninger på låseskærmen"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Konti"</string>
-    <string name="location_settings_title" msgid="8375074508036087178">"Lokation"</string>
-    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Brug lokation"</string>
+    <string name="location_settings_title" msgid="8375074508036087178">"Placering"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Brug placering"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Fra"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
-      <item quantity="one">Til – <xliff:g id="COUNT_1">%1$d</xliff:g> app har adgang til din lokation</item>
-      <item quantity="other">Til – <xliff:g id="COUNT_1">%1$d</xliff:g> apps har adgang til din lokation</item>
+      <item quantity="one">Til – <xliff:g id="COUNT_1">%1$d</xliff:g> app har adgang til din placering</item>
+      <item quantity="other">Til – <xliff:g id="COUNT_1">%1$d</xliff:g> apps har adgang til din placering</item>
     </plurals>
     <string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Indlæser…"</string>
     <string name="location_settings_footer_general" msgid="1040507068701188821">"Apps med tilladelse fra enheder i nærheden kan fastslå den relative placering af forbundne enheder."</string>
-    <string name="location_settings_footer_location_off" msgid="8568995909147566720">"Adgangen til Lokation er deaktiveret for apps og tjenester. Din enhedslokation kan stadig blive sendt til redningspersonale, hvis du ringer eller sender en sms til et alarmnummer."</string>
-    <string name="location_settings_footer_learn_more_content_description" msgid="5329024810729665156">"Få flere oplysninger om lokationsindstillinger."</string>
+    <string name="location_settings_footer_location_off" msgid="8568995909147566720">"Adgangen til Placering er deaktiveret for apps og tjenester. Din enhedsplacering kan stadig blive sendt til redningspersonale, hvis du ringer eller sender en sms til et alarmnummer."</string>
+    <string name="location_settings_footer_learn_more_content_description" msgid="5329024810729665156">"Få flere oplysninger om placeringsindstillinger."</string>
     <string name="account_settings_title" msgid="9138880127246241885">"Konti"</string>
     <string name="security_settings_title" msgid="6710768415432791970">"Sikkerhed"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Kryptering og loginoplysninger"</string>
@@ -315,8 +315,8 @@
     <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"Enheden er ikke krypteret"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"Låseskærm"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Hvad der skal vises"</string>
-    <string name="security_settings_summary" msgid="1627059516127354233">"Angiv Min lokation, oplåsning af skærmen, låst SIM-kort og lager for loginoplysninger"</string>
-    <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Angiv Min lokation, oplåsning af skærmen, lager for loginoplysninger"</string>
+    <string name="security_settings_summary" msgid="1627059516127354233">"Angiv Min placering, oplåsning af skærmen, låst SIM-kort og lager for loginoplysninger"</string>
+    <string name="cdma_security_settings_summary" msgid="2455517905101186330">"Angiv Min placering, oplåsning af skærmen, lager for loginoplysninger"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"Privatliv"</string>
     <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Ikke tilgængelig"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Sikkerhedsstatus"</string>
@@ -472,7 +472,7 @@
     <string name="security_settings_udfps_enroll_find_sensor_message" msgid="8383106460819519961">"Fingeraftrykslæseren er på din skærm. Du registrerer dit fingeraftryk på den næste skærm."</string>
     <string name="security_settings_udfps_enroll_find_sensor_start_button" msgid="3172268783620336357">"Start"</string>
     <string name="security_settings_udfps_enroll_a11y" msgid="1899453114050362235">"Bevæg fingeren hen over skærmen for at finde sensoren. Hold fingeren nede på fingeraftrykslæseren."</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Illustration med enhed og lokation af fingeraftrykslæser"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Illustration med enhed og placering af fingeraftrykslæser"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Navn"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Slet"</string>
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Én gang til"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Følg fingeraftryksikonet"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Bliv ved med at løfte fingeren for at tilføje forskellige dele af dit fingeraftryk"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Hver gang fingeraftryksikonet flyttes, skal du holde fingeren på det. På den måde registrere en større del af dit fingeraftryk."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Placer din fingerspids på aflæseren"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Til sidst skal du trykke med kanterne af din finger"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Placer siden af din finger på aflæseren, og hold den nede. Skift derefter til den anden side."</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"På den måde registrere en større del af dit fingeraftryk"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Hver gang fingeraftryksikonet flyttes, skal du holde fingeren på det. Dette hjælper med at registrere hele dit fingeraftryk."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Dette hjælper med at registrere hele dit fingeraftryk"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Scanning af fingeraftryk: <xliff:g id="PERCENTAGE">%d</xliff:g> procent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingeraftryk tilføjet"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Nu kan du bruge dit fingeraftryk til at låse din telefon op eller bekræfte din identitet, f.eks. når du logger ind i apps"</string>
@@ -853,7 +850,7 @@
     <string name="bluetooth_advanced_titlebar" msgid="5369701494951467257">"Avanceret Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="316627049372961941">"Når Bluetooth er aktiveret, kan enheden kommunikere med andre Bluetooth-enheder i nærheden."</string>
     <string name="bluetooth_scanning_on_info_message" msgid="6667723887545056976">"Når Bluetooth er aktiveret, kan din enhed kommunikere med andre Bluetooth-enheder i nærheden.\n\nFor at forbedre enhedsoplevelsen kan apps og tjenester stadig til enhver tid søge efter enheder i nærheden, også selvom Bluetooth er deaktiveret. Dette kan f.eks. bruges til at forbedre stedbaserede funktioner og tjenester. Du kan ændre dette i "<annotation id="link">"indstillingerne for Bluetooth-scanning"</annotation>"."</string>
-    <string name="ble_scan_notify_text" msgid="1358879010396045164">"For at forbedre lokationsnøjagtigheden kan systemapps og -tjenester stadig registrere Bluetooth-enheder. Du kan ændre dette i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>indstillingerne for scanning<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="ble_scan_notify_text" msgid="1358879010396045164">"For at forbedre placeringsnøjagtigheden kan systemapps og -tjenester stadig registrere Bluetooth-enheder. Du kan ændre dette i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>indstillingerne for scanning<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Det lykkedes ikke at oprette forbindelse. Prøv igen."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Enhedsoplysninger"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Enhedens Bluetooth-adresse: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
@@ -949,7 +946,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="191058832201741013">"Giv besked om et tilgængeligt offentligt netværk af høj kvalitet"</string>
     <string name="wifi_wakeup" msgid="3834327315861781611">"Aktivér Wi-Fi automatisk"</string>
     <string name="wifi_wakeup_summary" msgid="5778059083790221465">"Wi-Fi aktiveres igen, når du er i nærheden af gemte netværk af høj kvalitet, f.eks dit hjemmenetværk"</string>
-    <string name="wifi_wakeup_summary_no_location" msgid="681323616606485096">"Ikke tilgængelig, fordi lokation er deaktiveret. Aktivér "<annotation id="link">"lokation"</annotation>"."</string>
+    <string name="wifi_wakeup_summary_no_location" msgid="681323616606485096">"Ikke tilgængelig, fordi placering er deaktiveret. Aktivér "<annotation id="link">"placering"</annotation>"."</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="1771489741850119751">"Ikke tilgængelig, fordi Wi-Fi-scanning er slået fra"</string>
     <string name="wifi_wakeup_summary_scoring_disabled" msgid="3615120120960539780">"Vælg en udbyder af netværksvurdering for at bruge funktionen"</string>
     <string name="wifi_poor_network_detection" msgid="8210035875160288422">"Undgå dårlige forbindelser"</string>
@@ -960,8 +957,8 @@
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="2299284032301667622">"Vælg en udbyder af netværksvurdering for at bruge funktionen"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="1780306481499369913">"Vælg en kompatibel udbyder af netværksvurdering for at bruge funktionen"</string>
     <string name="wifi_install_credentials" msgid="5192903644606839972">"Installer certifikater"</string>
-    <string name="wifi_scan_notify_text" msgid="7163137260385995873">"For at gøre lokationen mere nøjagtig kan apps og tjenester stadig til enhver tid søge efter Wi‑Fi-netværk, også selvom Wi-Fi er deaktiveret. Dette kan f.eks. bruges til at forbedre stedbaserede funktioner og tjenester. Du kan ændre dette i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>indstillingerne for Wi-Fi-scanning<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
-    <string name="wifi_scan_notify_text_scanning_off" msgid="7439201783168213149">"Du kan gøre lokationen mere nøjagtig ved at aktivere Wi-Fi-scanning i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>indstillingerne for Wi‑Fi-scanning<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="wifi_scan_notify_text" msgid="7163137260385995873">"For at gøre placeringen mere nøjagtig kan apps og tjenester stadig til enhver tid søge efter Wi‑Fi-netværk, også selvom Wi-Fi er deaktiveret. Dette kan f.eks. bruges til at forbedre stedbaserede funktioner og tjenester. Du kan ændre dette i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>indstillingerne for Wi-Fi-scanning<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="wifi_scan_notify_text_scanning_off" msgid="7439201783168213149">"Du kan gøre placeringen mere nøjagtig ved at aktivere Wi-Fi-scanning i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>indstillingerne for Wi‑Fi-scanning<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="8436897497968907701">"Vis ikke igen"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="6285374200292675649">"Hold Wi-Fi aktiveret i dvale"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8753852404141070878">"Wi-Fi aktiveret i dvaletilstand"</string>
@@ -1088,8 +1085,8 @@
     <string name="wifi_wps_available_second_item" msgid="1717024103303480804">" (WPS er tilgængelig)"</string>
     <string name="wifi_carrier_connect" msgid="4511538300946413213">"Wi-Fi-netværk for mobilselskab"</string>
     <string name="wifi_carrier_content" msgid="2876499905644083615">"Opret forbindelse via <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="2165909441512029921">"For bl.a. at kunne angive en mere nøjagtig lokation vil <xliff:g id="APP_NAME">%1$s</xliff:g> gerne aktivere netværkssøgning, selv når Wi-Fi er deaktiveret.\n\nVil du tillade dette for alle apps, der gerne vil søge?"</string>
-    <string name="wifi_scan_always_turn_on_message_unknown" msgid="4903345360745717385">"For bl.a. at kunne angive en mere nøjagtig lokation vil en ukendt app gerne aktivere netværkssøgning, selv når Wi-Fi er deaktiveret.\n\nVil du tillade dette for alle apps, der gerne vil søge?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="2165909441512029921">"For bl.a. at kunne angive en mere nøjagtig placering vil <xliff:g id="APP_NAME">%1$s</xliff:g> gerne aktivere netværkssøgning, selv når Wi-Fi er deaktiveret.\n\nVil du tillade dette for alle apps, der gerne vil søge?"</string>
+    <string name="wifi_scan_always_turn_on_message_unknown" msgid="4903345360745717385">"For bl.a. at kunne angive en mere nøjagtig placering vil en ukendt app gerne aktivere netværkssøgning, selv når Wi-Fi er deaktiveret.\n\nVil du tillade dette for alle apps, der gerne vil søge?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="93691286302680448">"Gå til Avanceret i prikmenuen for at slå denne funktion fra."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="4154200627800959777">"Tillad"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="6997087934558839256">"Afvis"</string>
@@ -1237,7 +1234,7 @@
     <string name="wifi_calling_off_explanation" msgid="6295526820826322895">"Når Wi-Fi-opkald er slået til, kan enheden dirigere opkald via Wi-Fi-netværk eller dit mobilselskabs netværk, afhængigt af hvad du foretrækker, og hvor signalet er stærkest. Før du slår denne funktion til, skal du kontakte dit mobilselskab angående gebyrer og andre oplysninger.<xliff:g id="ADDITIONAL_TEXT">%1$s</xliff:g>"</string>
     <string name="wifi_calling_off_explanation_2" msgid="3487475808574416183"></string>
     <string name="emergency_address_title" msgid="3490633500025717573">"Adresse til nødstilfælde"</string>
-    <string name="emergency_address_summary" msgid="3022628750270626473">"Anvendes som din lokation, hvis du foretager et nødopkald via Wi-Fi"</string>
+    <string name="emergency_address_summary" msgid="3022628750270626473">"Anvendes som din placering, hvis du foretager et nødopkald via Wi-Fi"</string>
     <string name="private_dns_help_message" msgid="851221502063782306"><annotation id="url">"Få flere oplysninger"</annotation>" om private DNS-funktioner"</string>
     <string name="private_dns_mode_on" msgid="8878679071975375696">"Til"</string>
     <string name="wifi_calling_pref_managed_by_carrier" msgid="129524064888622179">"Indstillingen administreres af mobilselskabet"</string>
@@ -1380,8 +1377,8 @@
     <string name="night_display_activation_on_custom" msgid="4951143503599226846">"Aktivér indtil <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_activation_off_custom" msgid="79965738861100371">"Deaktiver indtil <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_not_currently_on" msgid="6600205753103093827">"Nattelys er deaktiveret"</string>
-    <string name="twilight_mode_location_off_dialog_message" msgid="4559150893687124801">"Enhedslokation er påkrævet til bestemmelse af tidspunkter for solnedgang og solopgang."</string>
-    <string name="twilight_mode_launch_location" msgid="7799112373591153956">"Lokationsindstillinger"</string>
+    <string name="twilight_mode_location_off_dialog_message" msgid="4559150893687124801">"Enhedsplacering er påkrævet til bestemmelse af tidspunkter for solnedgang og solopgang."</string>
+    <string name="twilight_mode_launch_location" msgid="7799112373591153956">"Placeringsindstillinger"</string>
     <string name="dark_ui_activation_on_manual" msgid="1541006734577325234">"Aktivér nu"</string>
     <string name="dark_ui_activation_off_manual" msgid="2395333709291250065">"Deaktiver nu"</string>
     <string name="dark_ui_activation_on_auto" msgid="4824339634784765049">"Aktivér indtil solopgang"</string>
@@ -1650,7 +1647,7 @@
     <string name="storage_wizard_move_progress_title" msgid="3912406225614672391">"Flytter <xliff:g id="APP">^1</xliff:g>…"</string>
     <string name="storage_wizard_move_progress_body" msgid="2396714553394935094">"Fjern ikke dit <xliff:g id="NAME">^1</xliff:g> under flytningen. \n\nAppen <xliff:g id="APP">^2</xliff:g> på denne enhed vil ikke være tilgængelig, før flytningen er gennemført."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="3494022998599718937">"Annuller flytning"</string>
-    <string name="storage_wizard_slow_body" msgid="8293565076885232029">"Dette <xliff:g id="NAME_0">^1</xliff:g> ser ud til at være langsomt. \n\nDu kan sagtens fortsætte, men apps, der er flyttet til denne lokation, vil muligvis hakke, og dataoverførsler kan tage længere tid. \n\nDu kan også skifte til et hurtigere <xliff:g id="NAME_1">^1</xliff:g> for at få en bedre ydeevne."</string>
+    <string name="storage_wizard_slow_body" msgid="8293565076885232029">"Dette <xliff:g id="NAME_0">^1</xliff:g> ser ud til at være langsomt. \n\nDu kan sagtens fortsætte, men apps, der er flyttet til denne placering, vil muligvis hakke, og dataoverførsler kan tage længere tid. \n\nDu kan også skifte til et hurtigere <xliff:g id="NAME_1">^1</xliff:g> for at få en bedre ydeevne."</string>
     <string name="storage_wizard_init_v2_title" msgid="2538630338392381113">"Hvordan vil du bruge dette <xliff:g id="NAME">^1</xliff:g>?"</string>
     <string name="storage_wizard_init_v2_internal_title" product="tablet" msgid="1884468440013151482">"Brug som ekstra tabletlagerplads"</string>
     <string name="storage_wizard_init_v2_internal_summary" product="tablet" msgid="2907833056467441047">"Kun til apps, filer og medier på denne tablet"</string>
@@ -1835,54 +1832,54 @@
     <string name="mobile_no_provisioning_url" msgid="609462719893503773">"<xliff:g id="OPERATOR">%1$s</xliff:g> har intet kendt website til provisionering"</string>
     <string name="mobile_insert_sim_card" msgid="3639245241283948038">"Indsæt SIM-kort, og genstart"</string>
     <string name="mobile_connect_to_internet" msgid="8162654404357069060">"Opret forbindelse til internettet"</string>
-    <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Seneste lokationsanmodninger"</string>
+    <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Seneste placeringsanmodninger"</string>
     <string name="location_recent_location_requests_see_all" msgid="7918405176741692524">"Se alle"</string>
-    <string name="location_category_location_services" msgid="8163798686832434284">"Lokationstjenester"</string>
-    <string name="location_title" msgid="5819154746934945021">"Min lokation"</string>
-    <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Lokation for arbejdsprofil"</string>
+    <string name="location_category_location_services" msgid="8163798686832434284">"Placeringstjenester"</string>
+    <string name="location_title" msgid="5819154746934945021">"Min placering"</string>
+    <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Placering for arbejdsprofil"</string>
     <string name="location_app_level_permissions" msgid="907206607664629759">"Placeringstilladelser for apps"</string>
-    <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Lokation er slået fra"</string>
+    <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Placering er slået fra"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
-      <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ud af <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> app har adgang til din lokation</item>
-      <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ud af <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> apps har adgang til din lokation</item>
+      <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ud af <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> app har adgang til din placering</item>
+      <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ud af <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> apps har adgang til din placering</item>
     </plurals>
     <string name="location_category_recent_location_access" msgid="2558063524482178146">"Seneste adgang"</string>
     <string name="location_recent_location_access_see_all" msgid="4203102419355323325">"Se alle"</string>
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Se info"</string>
-    <string name="location_no_recent_apps" msgid="6814206631456177033">"Ingen apps har anmodet om lokation for nylig"</string>
-    <string name="location_no_recent_accesses" msgid="6031735777805464247">"Ingen apps har haft adgang til lokationen for nylig"</string>
+    <string name="location_no_recent_apps" msgid="6814206631456177033">"Ingen apps har anmodet om placering for nylig"</string>
+    <string name="location_no_recent_accesses" msgid="6031735777805464247">"Ingen apps har haft adgang til placeringen for nylig"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Højt batteriforbrug"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Lavt batteriforbrug"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi-Fi-scanning"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Tillad, at apps og tjenester altid kan søge efter Wi-Fi-netværk, også selvom Wi-Fi er deaktiveret. Dette kan f.eks. bruges til at forbedre placeringsbaserede funktioner og tjenester."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-scanning"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Tillad, at apps og tjenester altid kan søge efter enheder i nærheden, også selvom Bluetooth er deaktiveret. Dette kan f.eks. bruges til at forbedre placeringsbaserede funktioner og tjenester."</string>
-    <string name="location_services_preference_title" msgid="604317859531782159">"Lokationstjenester"</string>
-    <string name="location_services_screen_title" msgid="5640002489976602476">"Lokationstjenester"</string>
-    <string name="managed_profile_location_services" msgid="8172092734138341880">"Lokationstjenester til arbejdet"</string>
-    <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Brug lokation til at indstille tidszone"</string>
-    <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Enhedens lokation skal aktiveres"</string>
-    <string name="location_time_zone_detection_location_is_off_dialog_message" msgid="5846316326139169523">"Hvis du vil angive tidszonen ved hjælp af din lokation, skal du aktivere lokation og derefter opdatere indstillingerne for tidszone"</string>
-    <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Lokationsindstillinger"</string>
+    <string name="location_services_preference_title" msgid="604317859531782159">"Placeringstjenester"</string>
+    <string name="location_services_screen_title" msgid="5640002489976602476">"Placeringstjenester"</string>
+    <string name="managed_profile_location_services" msgid="8172092734138341880">"Placeringstjenester til arbejdet"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Brug placering til at indstille tidszone"</string>
+    <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Enhedens placering skal aktiveres"</string>
+    <string name="location_time_zone_detection_location_is_off_dialog_message" msgid="5846316326139169523">"Hvis du vil angive tidszonen ved hjælp af din placering, skal du aktivere placering og derefter opdatere indstillingerne for tidszone"</string>
+    <string name="location_time_zone_detection_location_is_off_dialog_ok_button" msgid="2685647335717750297">"Placeringsindstillinger"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_cancel_button" msgid="3968729678789071154">"Luk"</string>
     <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatisk tidszone er deaktiveret"</string>
-    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Registrering af tidszone ved hjælp af lokation er deaktiveret"</string>
-    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Registrering af tidszone ved hjælp af lokation understøttes ikke"</string>
-    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Ændringer i forbindelse med registrering af tidszone ved hjælp af lokation er ikke tilladt"</string>
-    <string name="location_network_based" msgid="5247042890080021887">"Lokation af Wi-Fi- og mobilnet."</string>
-    <string name="location_neighborhood_level" msgid="3668890550358558267">"Tillad, at apps bruger Googles lokationstjeneste til at beregne din lokation hurtigere. Der indsamles anonyme lokationsdata, som sendes til Google."</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Registrering af tidszone ved hjælp af placering er deaktiveret"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Registrering af tidszone ved hjælp af placering understøttes ikke"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Ændringer i forbindelse med registrering af tidszone ved hjælp af placering er ikke tilladt"</string>
+    <string name="location_network_based" msgid="5247042890080021887">"Placering af Wi-Fi- og mobilnet."</string>
+    <string name="location_neighborhood_level" msgid="3668890550358558267">"Tillad, at apps bruger Googles placeringstjeneste til at beregne din placering hurtigere. Der indsamles anonyme placeringsdata, som sendes til Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Placeringen fastlægges af Wi-Fi"</string>
     <string name="location_gps" msgid="8783616672454701134">"GPS-satellitter"</string>
-    <string name="location_street_level" product="tablet" msgid="865953107414742784">"Tillad, at apps bruger GPS på din tablet til at udpege din lokation"</string>
-    <string name="location_street_level" product="default" msgid="3813836654645896185">"Tillad, at apps bruger GPS på din telefon til at udpege din lokation"</string>
+    <string name="location_street_level" product="tablet" msgid="865953107414742784">"Tillad, at apps bruger GPS på din tablet til at udpege din placering"</string>
+    <string name="location_street_level" product="default" msgid="3813836654645896185">"Tillad, at apps bruger GPS på din telefon til at udpege din placering"</string>
     <string name="assisted_gps" msgid="1714546606018821498">"Brug assisteret GPS"</string>
     <string name="assisted_gps_enabled" msgid="6220188450779319248">"Brug serveren til at assistere GPS (fjern markering for at mindske netværksforbrug)"</string>
     <string name="assisted_gps_disabled" msgid="1062496503892849">"Brug serveren til at assistere GPS (fjern markering for at forbedre GPS-ydelsen)"</string>
-    <string name="use_location_title" msgid="1345594777162897654">"Lokation og søgning"</string>
-    <string name="use_location_summary" msgid="377322574549729921">"Lad Google bruge din lokation til at forbedre søgeresultater og andre tjenester"</string>
-    <string name="location_access_title" msgid="4052667453826272040">"Adgang til min lokation"</string>
+    <string name="use_location_title" msgid="1345594777162897654">"Placering og søgning"</string>
+    <string name="use_location_summary" msgid="377322574549729921">"Lad Google bruge din placering til at forbedre søgeresultater og andre tjenester"</string>
+    <string name="location_access_title" msgid="4052667453826272040">"Adgang til min placering"</string>
     <string name="location_access_summary" msgid="8634100005481578143">"Tillad apps, der har bedt om tilladelse, at bruge dine stedoplysninger"</string>
-    <string name="location_sources_heading" msgid="6126965815860570524">"Lokationskilder"</string>
+    <string name="location_sources_heading" msgid="6126965815860570524">"Placeringskilder"</string>
     <string name="about_settings" product="tablet" msgid="2888705054709289693">"Om din tablet"</string>
     <string name="about_settings" product="default" msgid="4038626127378127613">"Om telefonen"</string>
     <string name="about_settings" product="device" msgid="9012888717090302815">"Om enheden"</string>
@@ -2363,7 +2360,7 @@
     <string name="accessibility_button_gesture_description" msgid="2516420653060025670">"Få hurtigt adgang til hjælpefunktioner på enhver skærm.\n\nKom godt i gang ved at gå til indstillingerne for hjælpefunktioner og vælge en funktion. Tryk på genvejen, og vælg knappen Hjælpefunktioner.\n\nHvis du vil bruge knappen Hjælpefunktioner i navigationslinjen i stedet, skal du skifte til navigation med to knapper eller navigation med tre knapper."</string>
     <string name="accessibility_button_description" msgid="7372405202698400339">"Få hurtigt adgang til hjælpefunktioner på enhver skærm. \n\nKom godt i gang ved at gå til indstillingerne for hjælpefunktioner og vælge en funktion. Tryk på genvejen, og vælg knappen Hjælpefunktioner."</string>
     <string name="accessibility_button_or_gesture_title" msgid="3510075963401163529">"Brug knappen eller bevægelsen"</string>
-    <string name="accessibility_button_location_title" msgid="7182107846092304942">"Lokation"</string>
+    <string name="accessibility_button_location_title" msgid="7182107846092304942">"Placering"</string>
     <string name="accessibility_button_size_title" msgid="5785110470538960881">"Størrelse"</string>
     <string name="accessibility_button_fade_title" msgid="8081993897680588829">"Udton, når funktionen ikke bruges"</string>
     <string name="accessibility_button_fade_summary" msgid="7865950833524973709">"Udtones efter et par sekunder, så det bliver nemmere at se din skærm"</string>
@@ -2739,10 +2736,10 @@
     <string name="dialog_background_check_message" product="tablet" msgid="1282389215667916176">"Din tablet kan ikke administrere batteriet normalt, fordi <xliff:g id="APP_0">%1$s</xliff:g> bliver ved med at vække din tablet.\n\nDu kan prøve at løse problemet ved at stoppe <xliff:g id="APP_1">%1$s</xliff:g> og forhindre appen i at køre i baggrunden."</string>
     <string name="dialog_background_check_message" product="device" msgid="8005524265739819577">"Din enhed kan ikke administrere batteriet normalt, fordi <xliff:g id="APP_0">%1$s</xliff:g> bliver ved med at vække din enhed.\n\nDu kan prøve at løse problemet ved at stoppe <xliff:g id="APP_1">%1$s</xliff:g> og forhindre appen i at køre i baggrunden."</string>
     <string name="dialog_background_check_ok" msgid="5792934035264144797">"Slå fra"</string>
-    <string name="dialog_location_title" msgid="1323400468370901875">"Vil du slå lokation fra?"</string>
-    <string name="dialog_location_message" product="default" msgid="5597959072209122057">"Din telefon kan ikke administrere batteriet normalt, fordi <xliff:g id="APP">%1$s</xliff:g> bliver ved med at anmode om din lokation, når du ikke bruger appen.\n\nDu kan prøve at løse problemet ved at deaktivere lokation for denne app."</string>
-    <string name="dialog_location_message" product="tablet" msgid="7165269165194599595">"Din tablet kan ikke administrere batteriet normalt, fordi <xliff:g id="APP">%1$s</xliff:g> bliver ved med at anmode om din lokation, når du ikke bruger appen.\n\nDu kan prøve at løse problemet ved at deaktivere lokation for denne app."</string>
-    <string name="dialog_location_message" product="device" msgid="4606829479989940464">"Din enhed kan ikke administrere batteriet normalt, fordi <xliff:g id="APP">%1$s</xliff:g> bliver ved med at anmode om din lokation, når du ikke bruger appen.\n\nDu kan prøve at løse problemet ved at deaktivere lokation for denne app."</string>
+    <string name="dialog_location_title" msgid="1323400468370901875">"Vil du slå placering fra?"</string>
+    <string name="dialog_location_message" product="default" msgid="5597959072209122057">"Din telefon kan ikke administrere batteriet normalt, fordi <xliff:g id="APP">%1$s</xliff:g> bliver ved med at anmode om din placering, når du ikke bruger appen.\n\nDu kan prøve at løse problemet ved at deaktivere placering for denne app."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7165269165194599595">"Din tablet kan ikke administrere batteriet normalt, fordi <xliff:g id="APP">%1$s</xliff:g> bliver ved med at anmode om din placering, når du ikke bruger appen.\n\nDu kan prøve at løse problemet ved at deaktivere placering for denne app."</string>
+    <string name="dialog_location_message" product="device" msgid="4606829479989940464">"Din enhed kan ikke administrere batteriet normalt, fordi <xliff:g id="APP">%1$s</xliff:g> bliver ved med at anmode om din placering, når du ikke bruger appen.\n\nDu kan prøve at løse problemet ved at deaktivere placering for denne app."</string>
     <string name="dialog_location_ok" msgid="6338680851382069716">"Slå fra"</string>
     <string name="power_screen" msgid="4596900105850963806">"Skærm"</string>
     <string name="power_flashlight" msgid="8993388636332573202">"Lommelygte"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Systemforbrug for de seneste 24 timer"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Systemforbrug for <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Appforbrug for <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"om morgenen"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"om aftenen"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"I alt: Under et minut"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Baggrund: Under et minut"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"I alt: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -3026,7 +3021,7 @@
     <string name="device_admin_status" msgid="6332571781623084064">"Denne administratorapp er aktiv og giver appen <xliff:g id="APP_NAME">%1$s</xliff:g> tilladelse til at udføre følgende handlinger:"</string>
     <string name="profile_owner_add_title" msgid="2774489881662331549">"Vil du aktivere Profiladministrator?"</string>
     <string name="profile_owner_add_title_simplified" msgid="2320828996993774182">"Vil du tillade overvågning?"</string>
-    <string name="adding_profile_owner_warning" msgid="6868275476058020513">"Hvis du fortsætter, administreres din bruger af din administrator, som også kan gemme tilknyttede data ud over dine personlige data.\n\nDin administrator kan overvåge og administrere indstillinger, adgang, apps og data, der er knyttet til denne bruger, herunder netværksaktivitet og din enheds lokationsoplysninger."</string>
+    <string name="adding_profile_owner_warning" msgid="6868275476058020513">"Hvis du fortsætter, administreres din bruger af din administrator, som også kan gemme tilknyttede data ud over dine personlige data.\n\nDin administrator kan overvåge og administrere indstillinger, adgang, apps og data, der er knyttet til denne bruger, herunder netværksaktivitet og din enheds placeringsoplysninger."</string>
     <string name="admin_disabled_other_options" msgid="8122039047419172139">"Andre valgmuligheder er deaktiveret af din administrator"</string>
     <string name="admin_more_details" msgid="4928985331640193758">"Få flere oplysninger"</string>
     <string name="notification_log_title" msgid="2812594935014664891">"Notifikationslogfil"</string>
@@ -3431,7 +3426,7 @@
     <string name="restriction_nfc_enable_summary_config" msgid="8065688740509581028">"Tillad dataudveksling, når denne <xliff:g id="DEVICE_NAME">%1$s</xliff:g> rører ved en anden NFC-enhed"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="6397567147629410131">"Tillad dataudveksling, når tabletten rører en anden enhed"</string>
     <string name="restriction_nfc_enable_summary" product="default" msgid="3331800894734678808">"Tillad dataudveksling, når telefonen rører en anden enhed"</string>
-    <string name="restriction_location_enable_title" msgid="4872281754836538066">"Lokation"</string>
+    <string name="restriction_location_enable_title" msgid="4872281754836538066">"Placering"</string>
     <string name="restriction_location_enable_summary" msgid="7139292323897390221">"Tillad, at apps bruger dine stedoplysninger"</string>
     <string name="wizard_back" msgid="8257697435061870191">"Tilbage"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Næste"</string>
@@ -3539,7 +3534,7 @@
     <string name="keywords_sounds" msgid="1850691834585575875">"højttalerbip, højttaler, lydstyrke, slå lyden fra, lydløs, lyd, musik"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="1500312884808362467">"forstyr ikke, afbryd, afbrydelse, pause"</string>
     <string name="keywords_app" msgid="7983814237980258061">"RAM"</string>
-    <string name="keywords_location" msgid="8016374808099706213">"tæt på, lokation, historik, rapportering, GPS"</string>
+    <string name="keywords_location" msgid="8016374808099706213">"tæt på, placering, historik, rapportering, GPS"</string>
     <string name="keywords_accounts" msgid="3482052586502133909">"konto, tilføj en konto, arbejdsprofil, tilføj konto"</string>
     <string name="keywords_users" msgid="3497517660077620843">"begrænsning, begræns, begrænset"</string>
     <string name="keywords_keyboard_and_ime" msgid="4741098648730042570">"rettelser, ret, lyd, vibrer, automatisk, sprog, bevægelse, anbefale, forslag, tema, stødende, ord, type, emoji, international"</string>
@@ -3969,7 +3964,7 @@
     <string name="interact_across_profiles_consent_dialog_app_data_title" msgid="8436318876213958940">"Appdata"</string>
     <string name="interact_across_profiles_consent_dialog_app_data_summary" msgid="6057019384328088311">"Denne app har adgang til data i din personlige <xliff:g id="NAME">%1$s</xliff:g>-app."</string>
     <string name="interact_across_profiles_consent_dialog_permissions_title" msgid="2316852600280487055">"Tilladelser"</string>
-    <string name="interact_across_profiles_consent_dialog_permissions_summary" msgid="995051542847604039">"Denne app kan bruge din personlige <xliff:g id="NAME">%1$s</xliff:g>-apps tilladelser, f.eks. adgang til lokationer, lager eller kontakter."</string>
+    <string name="interact_across_profiles_consent_dialog_permissions_summary" msgid="995051542847604039">"Denne app kan bruge din personlige <xliff:g id="NAME">%1$s</xliff:g>-apps tilladelser, f.eks. adgang til placeringer, lager eller kontakter."</string>
     <string name="interact_across_profiles_number_of_connected_apps_none" msgid="8573289199942092964">"Der er ingen forbundne apps"</string>
     <plurals name="interact_across_profiles_number_of_connected_apps" formatted="false" msgid="6991750455661974772">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> app er forbundet</item>
@@ -4568,9 +4563,9 @@
     <string name="disabled_by_policy_content_biometric_parental_consent" msgid="7124116806784305206">"Giv telefonen til din forælder for at starte konfigurationen af dette"</string>
     <string name="default_admin_support_msg" msgid="8338570262037182531">"Kontakt din it-administrator, hvis du har spørgsmål"</string>
     <string name="admin_support_more_info" msgid="8407433155725898290">"Mere info"</string>
-    <string name="admin_profile_owner_message" msgid="8860709969532649195">"Din administrator kan overvåge og administrere apps og data, der er knyttet til din arbejdsprofil, herunder indstillinger, tilladelser, virksomhedsadgang, netværksaktivitet og enhedens lokationsoplysninger."</string>
-    <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Din administrator kan overvåge og administrere apps og data, der er knyttet til denne bruger, herunder indstillinger, tilladelser, virksomhedsadgang, netværksaktivitet og enhedens lokationsoplysninger."</string>
-    <string name="admin_device_owner_message" msgid="5503131744126520590">"Din administrator kan overvåge og administrere apps og data, der er knyttet til denne enhed, herunder indstillinger, tilladelser, virksomhedsadgang, netværksaktivitet og enhedens lokationsoplysninger."</string>
+    <string name="admin_profile_owner_message" msgid="8860709969532649195">"Din administrator kan overvåge og administrere apps og data, der er knyttet til din arbejdsprofil, herunder indstillinger, tilladelser, virksomhedsadgang, netværksaktivitet og enhedens placeringsoplysninger."</string>
+    <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Din administrator kan overvåge og administrere apps og data, der er knyttet til denne bruger, herunder indstillinger, tilladelser, virksomhedsadgang, netværksaktivitet og enhedens placeringsoplysninger."</string>
+    <string name="admin_device_owner_message" msgid="5503131744126520590">"Din administrator kan overvåge og administrere apps og data, der er knyttet til denne enhed, herunder indstillinger, tilladelser, virksomhedsadgang, netværksaktivitet og enhedens placeringsoplysninger."</string>
     <string name="admin_financed_message" msgid="1156197630834947884">"Din enhedsadministrator kan muligvis administrere apps, få adgang til data, der er tilknyttet denne enhed, og ændre enhedens indstillinger."</string>
     <string name="condition_turn_off" msgid="402707350778441939">"Slå fra"</string>
     <string name="condition_turn_on" msgid="3911077299444314791">"Slå til"</string>
@@ -4921,7 +4916,7 @@
       <item quantity="one">Mindst <xliff:g id="COUNT_1">%d</xliff:g> app</item>
       <item quantity="other">Mindst <xliff:g id="COUNT_1">%d</xliff:g> apps</item>
     </plurals>
-    <string name="enterprise_privacy_location_access" msgid="8023838718108456971">"Adgangstilladelser til lokation"</string>
+    <string name="enterprise_privacy_location_access" msgid="8023838718108456971">"Adgangstilladelser til placering"</string>
     <string name="enterprise_privacy_microphone_access" msgid="7242958026470143653">"Adgangstilladelser til mikrofon"</string>
     <string name="enterprise_privacy_camera_access" msgid="7685460535880069016">"Adgangstilladelser til kamera"</string>
     <string name="enterprise_privacy_enterprise_set_default_apps" msgid="7498546659083996300">"Standardapps"</string>
@@ -5022,9 +5017,9 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Højeste antal synlige datasæt"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Nulstil til standardværdierne"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Udviklerindstillingerne for autofyld blev nulstillet"</string>
-    <string name="location_category" msgid="3496759112306219062">"Lokation"</string>
+    <string name="location_category" msgid="3496759112306219062">"Placering"</string>
     <string name="location_indicator_settings_title" msgid="6655916258720093451">"Placeringsindikator i statusbjælke"</string>
-    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Vis i forbindelse med alle lokationer, herunder netværk og forbindelse"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Vis i forbindelse med alle placeringer, herunder netværk og forbindelse"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Gennemtving fuld GNSS-måling"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Registrer alle GNSS-konstellationer og -frekvenser uden opgavegennemløb"</string>
     <string name="device_theme" msgid="5027604586494772471">"Enhedstema"</string>
@@ -5354,8 +5349,8 @@
     <string name="wfc_disclaimer_title_text" msgid="4617195934203523503">"Vigtige oplysninger"</string>
     <string name="wfc_disclaimer_agree_button_text" msgid="4082872292910770344">"FORTSÆT"</string>
     <string name="wfc_disclaimer_disagree_text" msgid="8424457394700137703">"NEJ TAK"</string>
-    <string name="wfc_disclaimer_location_title_text" msgid="7913919887475418423">"Lokation"</string>
-    <string name="wfc_disclaimer_location_desc_text" msgid="1417004513415772582">"Dit mobilselskab registrerer muligvis din lokation, når du bruger denne tjeneste til nødopkald.\n\nGå til dit mobilselskabs privatlivspolitik for at få flere oplysninger."</string>
+    <string name="wfc_disclaimer_location_title_text" msgid="7913919887475418423">"Placering"</string>
+    <string name="wfc_disclaimer_location_desc_text" msgid="1417004513415772582">"Dit mobilselskab registrerer muligvis din placering, når du bruger denne tjeneste til nødopkald.\n\nGå til dit mobilselskabs privatlivspolitik for at få flere oplysninger."</string>
     <string name="forget_passpoint_dialog_message" msgid="2433875063907365760">"Du kan miste adgangen til resterende tid eller data. Kontakt din udbyder, før du fjerner det."</string>
     <string name="keywords_content_capture" msgid="7802155522681936956">"indholdsregistrering, appindhold"</string>
     <string name="content_capture" msgid="868372905432812238">"Appindhold"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Aktivér Assistent ved at holde afbryderknappen nede"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Menu for afbryderknappen og menu for nødsituationer:\nTryk på afbryderknappen og knappen Lydstyrke op samtidig."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Deaktiver ringetoner:\nGenvejen findes i lydstyrkemenuen."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Tryklængde"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Juster følsomheden ved at vælge, hvor lang tid afbryderknappen skal holdes inde"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Kort"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Langt"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Vis Wallet"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Tillad adgang til Wallet fra låseskærmen og kvikmenuen"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Vis enhedsstyring"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Midlertidigt utilgængelig"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Intet SIM-kort"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Netværkspræferencer"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Opret forbindelse til offentlige netværk"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"netværksforbindelse, internet, trådløs, data, wifi, wi-fi, mobilnetværk, mobil, mobilselskab, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Aktivér Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Deaktiver Wi-Fi"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+-netværk"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"DOWNLOADEDE SIM-KORT"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"DOWNLOADEDE SIMKORT"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Aktiv"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Inaktiv"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Standard til <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"I alle apps og tjenester"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Spilindstillinger"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Aktivér genvejen til Spilpanel osv."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Forrige"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Næste"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Forhåndsvisning af farve"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Anmodning om adgang til SIM-kort"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"En enhed vil gerne have adgang til dit SIM-kort. Tryk for at få flere oplysninger."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Vil du give adgang til SIM-kortet?"</string>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index f47e2fb..2e869b7 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Im Cache gespeichert (Aktivitätsclient)"</item>
     <item msgid="8186970968968646288">"Im Cache gespeichert (leer)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Blaugrün"</item>
+    <item msgid="7216413848731287689">"Cyan"</item>
     <item msgid="5661027589207588703">"Blau"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Grün"</item>
     <item msgid="6331809026622602308">"Lila"</item>
     <item msgid="6390546163902724700">"Pink"</item>
-    <item msgid="6618900408138432102">"Rot"</item>
+    <item msgid="6500473130620545980">"Orange"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Nach 30 Tagen"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index a6fc794..399e7f1 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Noch mal"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Dem Fingerabdruck-Symbol folgen"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Lege den Finger immer wieder in leicht geänderter Position auf, bis der Abdruck vollständig erfasst ist."</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Leg deinen Finger jedes Mal für längere Zeit auf den Sensor, wenn sich das Fingerabdrucksymbol bewegt. Dadurch kann dein Fingerabdruck besser erfasst werden."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Leg deine Fingerkuppe auf den Sensor"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Roll den Finger zu beiden Seiten"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Halte nacheinander beide Seiten der Fingerkuppe auf den Sensor"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Dadurch kann dein Fingerabdruck besser erfasst werden"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Lege deinen Finger jedes Mal für längere Zeit auf den Sensor, wenn sich das Fingerabdrucksymbol bewegt. Hierdurch kann dein kompletter Fingerabdruck besser erfasst werden."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Hierdurch kann dein kompletter Fingerabdruck besser erfasst werden"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
@@ -2880,8 +2877,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Systemnutzung während der letzten 24 Stunden"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Systemnutzung im Zeitraum <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"App-Nutzung im Zeitraum <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"vormittags"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"nachmittags"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Gesamt: weniger als eine Minute"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Hintergrund: weniger als eine Minute"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Gesamt: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5403,6 +5398,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Halte die Ein-/Aus-Taste gedrückt, um Assistant zu aktivieren"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"„Ein-/Aus- und Notfall-Menü“:\nEin-/Aus-Taste und Lautertaste gleichzeitig drücken."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"„Klingeln verhindern“:\nVerknüpfung im Lautstärke-Menü verfügbar."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Dauer des Gedrückthaltens"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Stelle die Empfindlichkeit ein, indem du festlegst, wie lange du die Ein-/Aus-Taste gedrückt halten musst"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Kurz"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Lang"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Geldbörse anzeigen"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Zugriff auf Geldbörse aus Sperrbildschirm und Schnelleinstellungen erlauben"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Gerätesteuerung anzeigen"</string>
@@ -5448,7 +5447,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Momentan nicht verfügbar"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Keine SIM-Karte"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Netzwerkeinstellungen"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Mit öffentlichen Netzwerken verbinden"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"netzwerkverbindung, internet, kabellos, drahtlos, daten, wlan, w-lan, mobilfunk, mobil, mobilfunkanbieter, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"WLAN aktivieren"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"WLAN deaktivieren"</string>
@@ -5466,6 +5464,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+-Netzwerk"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"HERUNTERGELADENE SIM"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"HERUNTERGELADENE SIMs"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Aktiv"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Inaktiv"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Standard für <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5543,6 +5542,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Für alle Apps und Dienste"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Spieleinstellungen"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"„Dashboard für Spiele“-Schaltfläche aktivieren usw."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Zurück"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Weiter"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Farbvorschau"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Anfrage nach Zugriff auf SIM-Karte"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Ein Gerät möchte auf deine SIM-Karte zugreifen. Weitere Informationen."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Zugriff auf SIM-Karte erlauben?"</string>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 92e4697..725d8c2 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Αποθηκευμένο στην κρυφή μνήμη (δραστηριότητα πελάτη)"</item>
     <item msgid="8186970968968646288">"Αποθηκευμένο στην κρυφή μνήμη (κενό)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orangeΣ"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Γαλαζοπράσινο"</item>
+    <item msgid="7216413848731287689">"Κυανό"</item>
     <item msgid="5661027589207588703">"Μπλε"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Πράσινο"</item>
     <item msgid="6331809026622602308">"Μοβ"</item>
     <item msgid="6390546163902724700">"Ροζ"</item>
-    <item msgid="6618900408138432102">"Κόκκινο"</item>
+    <item msgid="6500473130620545980">"Πορτοκαλί"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Πάνω από 30 ημερών"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 81a7eb5..de84541 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Ακόμα μία φορά"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Ακολουθήστε το εικονίδιο δακτυλικού αποτυπώματος"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Συνεχίστε να ανασηκώνετε το δάχτυλό σας, για να προσθέσετε τα διάφορα τμήματα του δακτυλικού σας αποτυπώματος"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Αγγίζετε παρατεταμένα κάθε φορά που μετακινείται το εικονίδιο δακτυλικού αποτυπώματος. Με αυτόν τον τρόπο γίνεται καλύτερη λήψη του δακτυλικού σας αποτυπώματος."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Τοποθετήστε το ακροδάχτυλό σας στον αισθητήρα"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Τέλος, τοποθετήστε τα πλαϊνά σημεία του δαχτύλου σας"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Τοποθετήστε τη μία πλευρά του δακτυλικού σας αποτυπώματος στον αισθητήρα και αγγίξτε παρατεταμένα, μετά τοποθετήστε την άλλη πλευρά"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Με αυτόν τον τρόπο γίνεται καλύτερη λήψη του δακτυλικού σας αποτυπώματος"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Αγγίζετε παρατεταμένα κάθε φορά που μετακινείται το εικονίδιο δακτυλικού αποτυπώματος. Με αυτόν τον τρόπο διευκολύνεται η λήψη ολόκληρου του δακτυλικού σας αποτυπώματος."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Με αυτόν τον τρόπο διευκολύνεται η λήψη ολόκληρου του δακτυλικού σας αποτυπώματος"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Εγγραφή δακτυλικού αποτυπώματος <xliff:g id="PERCENTAGE">%d</xliff:g> τοις εκατό"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Προστέθηκε δακτυλ. αποτύπωμα"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Μπορείτε πλέον να χρησιμοποιείτε το δακτυλικό σας αποτύπωμα για να ξεκλειδώνετε το τηλέφωνό σας ή για να επαληθεύετε την ταυτότητά σας, όπως κατά τη σύνδεση σε εφαρμογές."</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Χρήση συστήματος για τις τελευταίες 24 ω."</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Χρήση συστήματος για <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Χρήση εφαρμογής για <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"π.μ."</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"μ.μ."</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Σύνολο: λιγότερο από ένα λεπτό"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Παρασκήνιο: λιγότερο από ένα λεπτό"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Σύνολο: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Ενεργοποιήστε τον Βοηθό πατώντας παρατεταμένα το κουμπί λειτουργίας"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Μενού λειτουργίας και έκτακτης ανάγκης:\nΠατήστε το κουμπί λειτουργίας και το κουμπί αύξησης έντασης ήχου ταυτόχρονα."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Αποτροπή ήχου κλήσης:\nΗ συντόμευση είναι διαθέσιμη στο μενού έντασης ήχου."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Διάρκεια παρατεταμένου πατήματος"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Προσαρμόστε την ευαισθησία επιλέγοντας πόση ώρα θα πρέπει να διαρκεί το παρατεταμένο πάτημα του κουμπιού λειτουργίας."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Μικρή"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Μεγάλη"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Εμφάνιση πορτοφολιού"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Επιτρέψτε την πρόσβαση στο πορτοφόλι από την οθόνη κλειδώματος και τις γρήγορες ρυθμίσεις"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Εμφάνιση στοιχείων ελέγχου συσκευής"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Προσωρινά μη διαθέσιμη"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Δεν υπάρχει SIM"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Προτιμήσεις δικτύου"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Σύνδεση σε δημόσια δίκτυα"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"σύνδεση δικτύου, διαδίκτυο, ασύρματο, δεδομένα, wifi, wi-fi, wi fi, δίκτυο κινητής τηλεφωνίας, κινητό, εταιρεία κινητής τηλεφωνίας, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Ενεργοποίηση Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Απενεργοποίηση Wi-Fi"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"Δίκτυο W+"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"ΛΗΦΘΕΙΣΑ SIM"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"ΛΗΦΘΕΙΣΕΣ SIM"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Ενεργή"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Ανενεργή"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Προεπιλογή για <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Για όλες τις εφαρμογές και τις υπηρεσίες"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Ρυθμίσεις παιχνιδιών"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Ενεργοποίηση συντόμευσης Πίνακα ελέγχου παιχνιδιού κ.λπ."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Προηγούμενο"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Επόμενο"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Προεπισκόπηση χρώματος"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Αίτημα πρόσβασης στην κάρτα SIM"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Μια συσκευή θέλει να αποκτήσει πρόσβαση στην κάρτα SIM. Πατήστε για λεπτομέρειες."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Να επιτρέπεται η πρόσβαση στην κάρτα SIM;"</string>
diff --git a/res/values-en-rAU/arrays.xml b/res/values-en-rAU/arrays.xml
index 8385162..d4852dd 100644
--- a/res/values-en-rAU/arrays.xml
+++ b/res/values-en-rAU/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Cached (activity client)"</item>
     <item msgid="8186970968968646288">"Cached (empty)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Teal"</item>
+    <item msgid="7216413848731287689">"Cyan"</item>
     <item msgid="5661027589207588703">"Blue"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Green"</item>
     <item msgid="6331809026622602308">"Purple"</item>
     <item msgid="6390546163902724700">"Pink"</item>
-    <item msgid="6618900408138432102">"Red"</item>
+    <item msgid="6500473130620545980">"Orange"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Over 30 days old"</item>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 77411b4..71df578 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"One more time"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Follow the fingerprint icon"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Keep lifting your finger to add the different parts of your fingerprint"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Touch &amp; hold each time the fingerprint icon moves. This helps capture more of your fingerprint."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Place the tip of your finger on the sensor"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Finally, place the edges of your finger"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Place the side of your fingerprint on the sensor and hold, then switch to the other side"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"This helps capture more of your fingerprint"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Touch &amp; hold each time the fingerprint icon moves. This helps to capture your full fingerprint."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"This helps to capture your full fingerprint"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Enrolling fingerprint <xliff:g id="PERCENTAGE">%d</xliff:g> per cent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingerprint added"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Now you can use your fingerprint to unlock your phone or verify that it’s you, like when you sign in to apps"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"System usage for past 24 hours"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"System usage for <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"App usage for <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"a.m."</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"p.m."</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: less than a min."</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Background: less than a min."</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Trigger Assistant by holding the power button"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Power &amp; emergency menu:\nPress power and volume up at the same time."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Prevent ringing:\nShortcut available in the volume menu."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Press &amp; hold duration"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Adjust sensitivity by choosing how long to press &amp; hold the power button"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Short"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Long"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Show wallet"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Allow access to wallet from lock screen and Quick Settings"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Show device controls"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Temporarily unavailable"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"No SIM"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Network preferences"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connect to public networks"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, mobile operator, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Turn on Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Turn off Wi‑Fi"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ network"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"DOWNLOADED SIM"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"DOWNLOADED SIMS"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Active"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Inactive"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Default for <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"For all apps and services"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Game settings"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Turn on Game Dashboard shortcut, etc."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Previous"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Next"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Colour preview"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM card access request"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"A device wants to access your SIM card. Tap for details."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Allow access to SIM card?"</string>
diff --git a/res/values-en-rCA/arrays.xml b/res/values-en-rCA/arrays.xml
index 682eaf0..3ce0de7 100644
--- a/res/values-en-rCA/arrays.xml
+++ b/res/values-en-rCA/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Cached (activity client)"</item>
     <item msgid="8186970968968646288">"Cached (empty)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Teal"</item>
+    <item msgid="7216413848731287689">"Cyan"</item>
     <item msgid="5661027589207588703">"Blue"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Green"</item>
     <item msgid="6331809026622602308">"Purple"</item>
     <item msgid="6390546163902724700">"Pink"</item>
-    <item msgid="6618900408138432102">"Red"</item>
+    <item msgid="6500473130620545980">"Orange"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Over 30 days old"</item>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index c4c14e7..d6ec678 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"One more time"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Follow the fingerprint icon"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Keep lifting your finger to add the different parts of your fingerprint"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Touch &amp; hold each time the fingerprint icon moves. This helps capture more of your fingerprint."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Place the tip of your finger on the sensor"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Finally, place the edges of your finger"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Place the side of your fingerprint on the sensor and hold, then switch to the other side"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"This helps capture more of your fingerprint"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Touch &amp; hold each time the fingerprint icon moves. This helps to capture your full fingerprint."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"This helps to capture your full fingerprint"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Enrolling fingerprint <xliff:g id="PERCENTAGE">%d</xliff:g> per cent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingerprint added"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Now you can use your fingerprint to unlock your phone or verify that it’s you, like when you sign in to apps"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"System usage for past 24 hours"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"System usage for <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"App usage for <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"a.m."</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"p.m."</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: less than a min."</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Background: less than a min."</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Trigger Assistant by holding the power button"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Power &amp; emergency menu:\nPress power and volume up at the same time."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Prevent ringing:\nShortcut available in the volume menu."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Press &amp; hold duration"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Adjust sensitivity by choosing how long to press &amp; hold the power button"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Short"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Long"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Show wallet"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Allow access to wallet from lock screen and Quick Settings"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Show device controls"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Temporarily unavailable"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"No SIM"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Network preferences"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connect to public networks"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, mobile operator, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Turn on Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Turn off Wi‑Fi"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ network"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"DOWNLOADED SIM"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"DOWNLOADED SIMS"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Active"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Inactive"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Default for <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"For all apps and services"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Game settings"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Turn on Game Dashboard shortcut, etc."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Previous"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Next"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Colour preview"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM card access request"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"A device wants to access your SIM card. Tap for details."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Allow access to SIM card?"</string>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 8385162..d4852dd 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Cached (activity client)"</item>
     <item msgid="8186970968968646288">"Cached (empty)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Teal"</item>
+    <item msgid="7216413848731287689">"Cyan"</item>
     <item msgid="5661027589207588703">"Blue"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Green"</item>
     <item msgid="6331809026622602308">"Purple"</item>
     <item msgid="6390546163902724700">"Pink"</item>
-    <item msgid="6618900408138432102">"Red"</item>
+    <item msgid="6500473130620545980">"Orange"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Over 30 days old"</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index fe2c922..8a85018 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"One more time"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Follow the fingerprint icon"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Keep lifting your finger to add the different parts of your fingerprint"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Touch &amp; hold each time the fingerprint icon moves. This helps capture more of your fingerprint."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Place the tip of your finger on the sensor"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Finally, place the edges of your finger"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Place the side of your fingerprint on the sensor and hold, then switch to the other side"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"This helps capture more of your fingerprint"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Touch &amp; hold each time the fingerprint icon moves. This helps to capture your full fingerprint."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"This helps to capture your full fingerprint"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Enrolling fingerprint <xliff:g id="PERCENTAGE">%d</xliff:g> per cent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingerprint added"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Now you can use your fingerprint to unlock your phone or verify that it’s you, like when you sign in to apps"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"System usage for past 24 hours"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"System usage for <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"App usage for <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"a.m."</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"p.m."</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: less than a min."</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Background: less than a min."</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Trigger Assistant by holding the power button"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Power &amp; emergency menu:\nPress power and volume up at the same time."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Prevent ringing:\nShortcut available in the volume menu."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Press &amp; hold duration"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Adjust sensitivity by choosing how long to press &amp; hold the power button"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Short"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Long"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Show wallet"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Allow access to wallet from lock screen and Quick Settings"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Show device controls"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Temporarily unavailable"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"No SIM"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Network preferences"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connect to public networks"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, mobile operator, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Turn on Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Turn off Wi‑Fi"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ network"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"DOWNLOADED SIM"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"DOWNLOADED SIMS"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Active"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Inactive"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Default for <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"For all apps and services"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Game settings"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Turn on Game Dashboard shortcut, etc."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Previous"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Next"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Colour preview"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM card access request"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"A device wants to access your SIM card. Tap for details."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Allow access to SIM card?"</string>
diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml
index 8385162..d4852dd 100644
--- a/res/values-en-rIN/arrays.xml
+++ b/res/values-en-rIN/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Cached (activity client)"</item>
     <item msgid="8186970968968646288">"Cached (empty)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Teal"</item>
+    <item msgid="7216413848731287689">"Cyan"</item>
     <item msgid="5661027589207588703">"Blue"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Green"</item>
     <item msgid="6331809026622602308">"Purple"</item>
     <item msgid="6390546163902724700">"Pink"</item>
-    <item msgid="6618900408138432102">"Red"</item>
+    <item msgid="6500473130620545980">"Orange"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Over 30 days old"</item>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 285f0b6..7bf19b1 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"One more time"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Follow the fingerprint icon"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Keep lifting your finger to add the different parts of your fingerprint"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Touch &amp; hold each time the fingerprint icon moves. This helps capture more of your fingerprint."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Place the tip of your finger on the sensor"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Finally, place the edges of your finger"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Place the side of your fingerprint on the sensor and hold, then switch to the other side"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"This helps capture more of your fingerprint"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Touch &amp; hold each time the fingerprint icon moves. This helps to capture your full fingerprint."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"This helps to capture your full fingerprint"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Enrolling fingerprint <xliff:g id="PERCENTAGE">%d</xliff:g> per cent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingerprint added"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Now you can use your fingerprint to unlock your phone or verify that it’s you, like when you sign in to apps"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"System usage for past 24 hours"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"System usage for <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"App usage for <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"a.m."</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"p.m."</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: less than a min."</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Background: less than a min."</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Trigger Assistant by holding the power button"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Power &amp; emergency menu:\nPress power and volume up at the same time."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Prevent ringing:\nShortcut available in the volume menu."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Press &amp; hold duration"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Adjust sensitivity by choosing how long to press &amp; hold the power button"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Short"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Long"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Show wallet"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Allow access to wallet from lock screen and Quick Settings"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Show device controls"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Temporarily unavailable"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"No SIM"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Network preferences"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connect to public networks"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, mobile operator, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Turn on Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Turn off Wi‑Fi"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ network"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"DOWNLOADED SIM"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"DOWNLOADED SIMS"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Active"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Inactive"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Default for <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"For all apps and services"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Game settings"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Turn on Game Dashboard shortcut, etc."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Previous"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Next"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Colour preview"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM card access request"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"A device wants to access your SIM card. Tap for details."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Allow access to SIM card?"</string>
diff --git a/res/values-en-rXC/arrays.xml b/res/values-en-rXC/arrays.xml
index 7c2da06..553f8e6 100644
--- a/res/values-en-rXC/arrays.xml
+++ b/res/values-en-rXC/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‎‏‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎‏‏‏‎‎Cached (activity client)‎‏‎‎‏‎"</item>
     <item msgid="8186970968968646288">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‎‎‎‏‎‎‎‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‎‎‎‎‎Cached (empty)‎‏‎‎‏‎"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‎‏‎‏‎‎‎‎‎‏‏‎‏‏‏‎‏‏‏‏‏‏‎@color/SIM_color_cyan‎‏‎‎‏‎"</item>
+    <item msgid="177868870612833388">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‎‏‏‏‎‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‏‏‏‎‏‎‎‎‎‏‎‏‏‏‏‎‏‎‎‏‎‏‎‏‎‎‎‏‏‎‏‏‎‎‎@color/SIM_color_blue800‎‏‎‎‏‎"</item>
+    <item msgid="1129898906008357171">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‎‏‎‏‎‎‎‏‎‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‎‏‏‎‎‏‏‎@color/SIM_color_green800‎‏‎‎‏‎"</item>
+    <item msgid="4206364087389793587">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‎‎‎‎‎‎‎‎‎‎‎‏‏‏‎‏‏‎‎‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‏‏‎‎‏‏‎@color/SIM_color_purple800‎‏‎‎‏‎"</item>
+    <item msgid="6728943460061940130">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎‎‎‎‎‏‎‎‏‏‎‏‏‎‎‏‏‏‎‏‎‏‎‏‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‏‎‏‎‎‎‏‎‎@color/SIM_color_pink800‎‏‎‎‏‎"</item>
+    <item msgid="968332068361935002">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‏‏‏‎‎‎‏‎‏‎‏‏‏‏‏‏‎‏‎‏‎‏‎‏‎‎‎‏‏‎‎‎‏‎‎‏‏‎‏‎‎@color/SIM_color_orange‎‏‎‎‏‎"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‏‏‎‏‏‎‎‏‎‏‎‏‏‏‎‎‎‏‏‎‎‎‏‏‏‎‏‏‎‎‎‏‎‎‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‏‏‎Teal‎‏‎‎‏‎"</item>
+    <item msgid="7216413848731287689">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎‏‏‏‎‏‏‎‏‎‎‎‏‎‏‎‎‏‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‏‎‎‎‏‎‎‏‎Cyan‎‏‎‎‏‎"</item>
     <item msgid="5661027589207588703">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‎‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‏‎‎‏‎‏‎‏‎‏‏‎‎‏‏‎‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎Blue‎‏‎‎‏‎"</item>
-    <item msgid="3795787248113275442">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‏‏‎‏‎‏‎‏‏‎‎‎‎‏‏‎‎‏‎‎‎‎‏‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‎‎‏‎‎Indigo‎‏‎‎‏‎"</item>
+    <item msgid="1219738214736244749">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‏‏‎‏‎‏‏‎‎‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‎‏‎‏‎‏‏‎‎‎‎‎‎‎‎‏‏‎‏‎Green‎‏‎‎‏‎"</item>
     <item msgid="6331809026622602308">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‏‎‏‎‏‏‎‎‎‎‏‏‎‎‏‎‏‎‎‏‎‏‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‏‎‎‎Purple‎‏‎‎‏‎"</item>
     <item msgid="6390546163902724700">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‏‎‎‎‎‏‎‏‎‎‎‎‎‏‏‏‎‏‎‎‏‎‏‏‏‎‎‎Pink‎‏‎‎‏‎"</item>
-    <item msgid="6618900408138432102">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‏‎‏‏‎‏‏‎‏‎‎‏‎‎‏‏‏‎‏‏‎‎‎‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‎Red‎‏‎‎‏‎"</item>
+    <item msgid="6500473130620545980">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‏‎‎‏‎‏‎‎‎‏‏‏‎‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‏‎‎‎Orange‎‏‎‎‏‎"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‎‎‏‏‏‎‏‎‏‎‎‏‏‎‏‎‏‎‏‏‏‎‎‏‏‏‎‏‎‎‎‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‎‏‎Over 30 days old‎‏‎‎‏‎"</item>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 5ab99a6..424460f 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‎‎‏‏‎‎‏‎‎‎‎‎‎‎‏‏‎‎‏‎‏‎‏‎‎One more time‎‏‎‎‏‎"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‏‎‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‎‏‏‏‏‎‎‎‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎Follow the fingerprint icon‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‎‎‎‎‏‏‏‎‎‏‎‎‏‏‎‎‏‎‏‎‎‏‎‎‎‎‎‏‏‎‏‎‏‎‎‎‎‏‎‎‏‎Keep lifting your finger to add the different parts of your fingerprint‎‏‎‎‏‎"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‎‎‏‎‎‏‎‎‎‏‎‎‎‏‏‎‎‎‏‎‎‎‏‎‎‏‎‎‎‏‏‎‎‏‎‎‎‎‎‎‎‏‎‏‏‎‎Touch &amp; hold each time the fingerprint icon moves. This helps capture more of your fingerprint.‎‏‎‎‏‎"</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‏‎‎‎‎‏‎‏‏‎‎‎‎‏‎‏‎‎‏‏‎‏‏‎‏‎‏‏‏‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‏‎‎‎Place the tip of your finger on the sensor‎‏‎‎‏‎"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‏‎‏‎‎‏‏‏‎‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎Finally, place the edges of your finger‎‏‎‎‏‎"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎‏‏‎‏‎‏‎‎‎‏‎‏‎‎‏‏‏‏‎‎‏‎‎‏‎‏‎‏‏‎‎Place the side of your fingerprint on the sensor and hold, then switch to the other side‎‏‎‎‏‎"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‏‎‏‎‎‎‎‏‎‎‎‏‏‎‎‎‎‎‎‎‎‎‏‎‏‎‏‎‎‎‏‎‏‎This helps capture more of your fingerprint‎‏‎‎‏‎"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‎‏‎‎‏‎‏‏‏‎‏‎‎‏‎‎‎‎‏‏‏‎‏‎‏‏‎‏‏‏‎‎‏‎‎‏‏‎‎‏‏‏‎‏‏‏‏‎‏‎Touch &amp; hold each time the fingerprint icon moves. This helps capture your full fingerprint.‎‏‎‎‏‎"</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‎‎‏‏‎‏‏‏‏‎‏‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎This helps capture your full fingerprint‎‏‎‎‏‎"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‎‎‎‎‎‏‎‏‎‏‎‎‎‏‏‎‏‏‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎‏‏‎‏‎‏‎‎‎‏‏‎Enrolling fingerprint ‎‏‎‎‏‏‎<xliff:g id="PERCENTAGE">%d</xliff:g>‎‏‎‎‏‏‏‎ percent‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‎‏‏‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‏‎‎‎‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‎‎‎‎‎‎‏‎‎‎‎‏‎Fingerprint added‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‎‎‏‎‏‎‏‎‎‎‏‎‎‎‎‏‎‎‎‏‏‎‎‎‏‎‏‎‎‏‏‏‎‎‏‏‎‎‎‎‎‎‏‎‎‏‎‏‏‏‏‏‏‎Now you can use your fingerprint to unlock your phone or verify it’s you, like when you sign in to apps‎‏‎‎‏‎"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‏‏‎‏‎‏‎‎‎‏‏‏‎‎‎‏‏‏‎System usage for past 24 hr‎‏‎‎‏‎"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‏‎‏‎‏‎‎‏‎‏‏‎‎‏‏‏‏‎‏‎‏‎‎‏‏‎‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‏‎‏‎‎‏‏‎‏‎‎‎System usage for ‎‏‎‎‏‏‎<xliff:g id="SLOT">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‎‎‏‎‎‎‎‎‎‎‏‏‏‎‎‏‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‎‏‎App usage for ‎‏‎‎‏‏‎<xliff:g id="SLOT">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‏‎‎‎‎‏‎‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‎‎‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‏‎‏‏‏‎am‎‏‎‎‏‎"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‎‏‏‏‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‏‏‎‏‎‎pm‎‏‎‎‏‎"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‎‏‎‏‎‏‏‎‎‎‏‏‎‎‏‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‎‎‏‎‎‎‎‏‎‏‎Total: less than a min‎‏‎‎‏‎"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‏‎‏‏‎‏‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‎‏‎‎‎‏‎‎‎‏‎‎‏‏‎‎‏‎‎‎‎‎‎‎‏‎‎‎‏‎‏‎‏‎Background: less than a min‎‏‎‎‏‎"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‏‎‏‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‏‏‏‎‎‎‏‏‏‏‏‎‎‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‎Total: ‎‏‎‎‏‏‎<xliff:g id="TIME">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‎‎‎‏‏‎‎‏‏‏‎‏‎‏‏‎‎‎‏‏‎‏‎‏‎‏‏‏‎‎‎‎Trigger the Assistant by holding the power button‎‏‎‎‏‎"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‎‎‏‏‎‏‎‎‎‎‏‎‎‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‎Power &amp; Emergency Menu:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Press Power and Volume up at the same time.‎‏‎‎‏‎"</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‎‏‏‎‏‏‏‎‎‎‎‏‎‎‏‏‏‎‎‏‎‏‎‏‎‏‏‎‎‎‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‏‏‎‎Prevent ringing:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Shortcut available in the volume menu.‎‏‎‎‏‎"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‎‎‏‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‎‏‎‎‏‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‎Press &amp; hold duration‎‏‎‎‏‎"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‎‏‏‏‏‎Adjust sensitivity by choosing how long to press &amp; hold the power button‎‏‎‎‏‎"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‏‎‏‎‎‎‏‎‏‎‎‏‏‏‎‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‎‏‎‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎Short‎‏‎‎‏‎"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎‎‎‏‏‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‏‎‎‏‎‎‎Long‎‏‎‎‏‎"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‎‎‎‏‎‏‏‎‏‎‏‎‏‏‎‎‏‏‏‎‎‏‎‎‏‏‏‏‎‎‎‎‎‎‎‎Show wallet‎‏‎‎‏‎"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‎‏‎‎‏‎‎‎‏‏‎‏‏‎‏‎‏‏‏‎‎‏‎‎‎‏‏‏‏‏‎‎‎‏‎‏‎‎‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎Allow access to wallet from lock screen and quick settings‎‏‎‎‏‎"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‎‎‎‎‎‏‎‎‏‏‎‏‎‎‏‏‏‏‎‏‎‎‎‎‏‎‎‎‏‎‎‎‎‏‎‏‎Show device controls‎‏‎‎‏‎"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‏‏‏‎‎‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‏‎‎‏‎‎‏‏‎‎‎‎‎Temporarily unavailable‎‏‎‎‏‎"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‏‏‎‎‎‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‏‏‎‎‏‏‏‎‎‎‎‎‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‎‎‏‏‎‎No SIM‎‏‎‎‏‎"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‏‏‎‎‎‎‏‎‏‎‎‏‏‏‎‎‏‎‏‏‎‎‎‎‎‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎Network preferences‎‏‎‎‏‎"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‏‎‏‎‎‎‏‏‏‎‎‎‏‏‎‏‏‏‏‎‎‏‏‎‎‏‎Connect to public networks‎‏‎‎‏‎"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‏‎‎network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, cell carrier, 4g, 3g, 2g, lte‎‏‎‎‏‎"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‎‏‎‏‏‎‏‏‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‎‏‏‎‎‏‎‏‎‎‎‏‏‎‎‏‎‎‎Turn on Wi‑Fi‎‏‎‎‏‎"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‎‎‏‏‏‏‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‏‏‎‎‎‎‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎Turn off Wi‑Fi‎‏‎‎‏‎"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‎‏‏‏‎‏‎‏‏‎‏‏‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‏‎‏‎‏‏‎‏‎‎W+ network‎‏‎‎‏‎"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‏‏‏‏‎‎‎‎‎‎‏‎‎‏‎‏‎‏‏‎‏‏‏‎‏‎‏‏‏‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‎‎‏‎‏‏‏‏‏‎SIM‎‏‎‎‏‎"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‏‏‎‏‎‎‎‎‎‏‏‎‏‎‏‎‏‎‎‏‏‎‏‎‏‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‎DOWNLOADED SIM‎‏‎‎‏‎"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‏‏‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‎‎‏‎‏‏‏‎‏‏‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‎‏‏‏‏‎‎‏‏‎DOWNLOADED SIMS‎‏‎‎‏‎"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‎‏‏‏‏‎‏‎‏‎‎‏‏‏‏‎‎‏‎‎‎‏‎‎‏‏‏‏‎‎‏‎‏‎‏‏‏‏‎‏‎‏‎‎‏‏‏‎‎‎‏‏‎‎‎Active‎‏‎‎‏‎"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‏‏‎‏‎‎‎‏‎‏‎‎‎‎‏‏‏‎‏‎‎‎‎‎‎‎‎‏‏‎‎‎‏‏‏‎‎‎‏‎‏‏‏‎‏‎‎‎‏‎Inactive‎‏‎‎‏‎"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" ‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‏‎‎‎‏‎‎‎‏‎‏‏‏‏‎‎‎‏‏‎‎‏‏‎‎‎‎‏‏‎‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‎‎‏‏‏‏‏‎ / Default for ‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‏‎‎‏‏‎‏‏‎‏‎‏‎‎‎‎‏‎‏‎‎‏‎‏‏‏‎‎‎‎‏‏‎‎‎‏‎‎‎‏‎‏‏‎‏‎‎‏‎‎‏‏‎For all apps and services‎‏‎‎‏‎"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‎‎‏‎‎‏‏‎‏‎‎‏‏‎‎‎‎‎‎‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‎‏‏‏‎‎‏‎‏‏‎‏‎‎‎‏‎‏‎‎Game settings‎‏‎‎‏‎"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎‎‏‎‎‏‏‏‎‎‏‎‎‎‎‏‎‏‏‏‏‎‎‎‏‏‎Turn on Game Dashboard shortcut, etc‎‏‎‎‏‎"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‏‎‎‏‎‏‏‎‏‎‎‎‏‏‏‎‎‎‎‏‎‎‎‎‎‎‏‎‏‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎Previous‎‏‎‎‏‎"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‏‏‏‏‏‎‎‎‎‏‎‏‎‎‏‏‎‎‎‏‎‎‎‎‎‎‏‎‎‏‎‏‏‎‎‎‏‏‎‏‎‏‏‎‎‏‏‎‎Next‎‏‎‎‏‎"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‎‎‏‏‏‎‎‎‎‎‎‎‏‏‏‏‏‎‎‎‎‏‏‎‏‏‎‏‎Color preview‎‏‎‎‏‎"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‎‎‏‏‎‏‎‏‎‎‏‎‎‎‏‎‎‎‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‏‎‎‎‎‏‎‎‎‎‏‎‎‎‏‏‏‏‎‎SIM card access request‎‏‎‎‏‎"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‏‎‎‎‎‏‎‏‏‎‎‎‏‎‏‎‏‏‏‎‎‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‎‏‎‏‏‏‏‏‎‎A device wants to access your SIM card. Tap for details.‎‏‎‎‏‎"</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎‎‎‏‏‎‏‎‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‏‎‎‏‎‏‏‏‎‎‏‎‏‏‎‎‏‎‎‎‏‏‏‏‏‎‎Allow access to SIM card?‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 8d4f681..74bb789 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"En caché (cliente de actividad)"</item>
     <item msgid="8186970968968646288">"En caché (vacío)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Verde azulado"</item>
+    <item msgid="7216413848731287689">"Cian"</item>
     <item msgid="5661027589207588703">"Azul"</item>
-    <item msgid="3795787248113275442">"Índigo"</item>
+    <item msgid="1219738214736244749">"Verde"</item>
     <item msgid="6331809026622602308">"Púrpura"</item>
     <item msgid="6390546163902724700">"Rosado"</item>
-    <item msgid="6618900408138432102">"Rojo"</item>
+    <item msgid="6500473130620545980">"Naranja"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Más de 30 días"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 8fc9152..e42f2ae 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Una vez más"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Sigue el ícono de huella dactilar"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Sigue levantando el dedo para agregar diferentes partes de la huella dactilar."</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Mantén presionado cada vez que ícono de huella dactilar se mueva. Esto permite capturar más superficie de tu huella dactilar."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Apoya la punta del dedo en el sensor"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Finalmente, apoya los bordes del dedo"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Apoya un lado de tu huella dactilar en el sensor y mantén presionado. Luego, cambia de lado."</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Esto permite capturar más superficie de tu huella dactilar"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Mantén presionado cada vez que ícono se mueva. Esto ayuda a capturar tu huella dactilar completa."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Esto ayuda a capturar tu huella dactilar completa"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
@@ -2879,8 +2876,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Uso del sistema en las últimas 24 h"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Uso del sistema de <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Uso de apps de <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"a.m."</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"p.m."</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: menos de un minuto"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"En segundo plano: menos de un minuto"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5402,6 +5397,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Mantén presionado el botón de encendido para activar Asistente"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Menú de encendido y emergencia:\nPresiona los botones de encendido y de subir volumen al mismo tiempo."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Impedir hacer sonar:\nEl acceso directo está disponible en el menú de volumen."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Duración de presión"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Elige durante cuánto tiempo quieres mantener presionado el botón de encendido para ajustar la sensibilidad"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Corta"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Larga"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Mostrar billetera"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Permite el acceso a la billetera desde la pantalla de bloqueo y la Configuración rápida"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Mostrar controles del dispositivo"</string>
@@ -5447,7 +5446,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"No disponible por el momento"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"No hay ninguna tarjeta SIM"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferencias de red"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectarse a redes públicas"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"conexión de red, internet, inalámbrico, datos, wifi, wi-fi, wi fi, datos móviles, móvil, proveedor de telefonía, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Activar Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Desactivar Wi-Fi"</string>
@@ -5465,6 +5463,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"Red W+"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"SIM DESCARGADA"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"TARJETAS SIM DESCARGADAS"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Activa"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Inactiva"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Configuración predeterminada para <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5542,6 +5541,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Para todas las apps y servicios"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Configuración de juegos"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Activa el acceso directo al Panel de juego, etc."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Anterior"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Siguiente"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Vista previa de color"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Solicitud de acceso a la tarjeta SIM"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Un dispositivo quiere acceder a tu tarjeta SIM. Presiona para ver más detalles."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"¿Permitir acceso a la tarjeta SIM?"</string>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index c03ffd6..9996c21 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"En caché (cliente de actividad)"</item>
     <item msgid="8186970968968646288">"En caché (vacío)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Verde azulado"</item>
+    <item msgid="7216413848731287689">"Cian"</item>
     <item msgid="5661027589207588703">"Azul"</item>
-    <item msgid="3795787248113275442">"Índigo"</item>
+    <item msgid="1219738214736244749">"Verde"</item>
     <item msgid="6331809026622602308">"Morado"</item>
     <item msgid="6390546163902724700">"Rosa"</item>
-    <item msgid="6618900408138432102">"Rojo"</item>
+    <item msgid="6500473130620545980">"Naranja"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"De más de 30 días de antigüedad"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 32533f5..ff3ccbe 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Otra vez"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Sigue el icono de la huella digital"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Sigue levantando el dedo para añadir diferentes partes de tu huella digital"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Mantén pulsado el icono de la huella digital siempre que se mueva para que capturemos de forma más completa tu huella digital"</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Coloca la punta del dedo en el sensor"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Por último, coloca los laterales de tu dedo"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Coloca el dedo de lado en el sensor, mantenlo pulsado y después gíralo para colocar el otro lado"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Así capturamos de forma más completa tu huella digital"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Mantén pulsado el icono de la huella digital siempre que se mueva. Así se podrá registrar toda tu huella digital."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Así se podrá registrar toda tu huella digital"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Registro de la huella digital al <xliff:g id="PERCENTAGE">%d</xliff:g> por ciento"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Huella digital añadida"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Ahora puedes usar tu huella digital para desbloquear el teléfono o verificar tu identidad (por ejemplo, al iniciar sesión en aplicaciones)."</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Uso del sistema durante las últimas 24 h"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Uso del sistema de <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Uso de aplicaciones de <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"h"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"h"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: menos de 1 minuto"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"En segundo plano: menos de 1 minuto"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Activa el Asistente manteniendo pulsado el botón de encendido"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Menú de encendido y de emergencias:\nPulsa las teclas de encendido y de subir volumen al mismo tiempo."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Evitar sonar:\nAcceso directo disponible en el menú de volumen."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Duración de mantener pulsado"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Ajusta la sensibilidad eligiendo durante cuánto tiempo hay que pulsar el botón de encendido"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Corta"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Larga"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Mostrar cartera"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Permite el acceso a la cartera desde la pantalla de bloqueo y los ajustes rápidos"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Mostrar controles del dispositivo"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"No disponible temporalmente"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Sin tarjeta SIM"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferencias de red"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conéctate a redes públicas"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"conexión de red, internet, inalámbrico, datos, wifi, wi-fi, wi fi, datos móviles, móvil, operador de telefonía, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Activar conexión Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Desactivar conexión Wi-Fi"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"Red de W+"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"SIM DESCARGADA"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"TARJETAS SIM DESCARGADAS"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Activa"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Inactiva"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Opción predeterminada para <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Para todas las aplicaciones y servicios"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Ajustes de juego"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Activa el acceso directo al Panel de juego, etc."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Anterior"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Siguiente"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Vista previa de color"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Solicitud de acceso a la tarjeta SIM"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Un dispositivo quiere acceder a la tarjeta SIM. Toca para consultar más información."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"¿Permitir acceso a la tarjeta SIM?"</string>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index 9d5e8ef..bcdb33d 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Vahemälus (tegevuse klient)"</item>
     <item msgid="8186970968968646288">"Vahemälus (tühi)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Sinakasroheline"</item>
+    <item msgid="7216413848731287689">"Tsüaan"</item>
     <item msgid="5661027589207588703">"Sinine"</item>
-    <item msgid="3795787248113275442">"Indigosinine"</item>
+    <item msgid="1219738214736244749">"Roheline"</item>
     <item msgid="6331809026622602308">"Lilla"</item>
     <item msgid="6390546163902724700">"Roosa"</item>
-    <item msgid="6618900408138432102">"Punane"</item>
+    <item msgid="6500473130620545980">"Oranž"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Üle 30 päeva vanad"</item>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 27b12b2..e5652f4 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Veel üks kord"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Järgige sõrmejälje ikooni"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Tõstke sõrme, et lisada sõrmejälje eri osad."</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Puudutage pikalt iga kord, kui sõrmejäljeikoon liigub. See aitab jäädvustada suurema osa teie sõrmejäljest."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Asetage oma sõrmeots andurile"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Lõpuks asetage andurile oma sõrme küljed"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Asetage oma sõrmejälje külg andurile ja hoidke all, seejärel asetage andurile sõrmejälje teine külg"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"See aitab jäädvustada suurema osa teie sõrmejäljest"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Puudutage pikalt iga kord, kui sõrmejäljeikoon liigub. See aitab jäädvustada teie täieliku sõrmejälje."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"See aitab jäädvustada teie täieliku sõrmejälje."</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
@@ -2879,8 +2876,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Süsteemi kasutus viimase 24 h jooksul"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Süsteemi kasutus: <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Rakenduse kasutus: <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"am"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"pm"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Kokku: vähem kui minut"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Taustal: vähem kui minut"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Kokku: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5402,6 +5397,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Assistent aktiveeritakse toitenupu allhoidmisel"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Menüüd Toide ja Hädaolukord:\nvajutage samal ajal toitenuppu ja helitugevuse suurendamise nuppu."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Helisemise vältimine:\notsetee asub helitugevuse menüüs."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Allhoidmise kestus"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Kohandage ühenduvust, valides, kui pikalt toitenuppu all hoida"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Lühike"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Pikk"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Kuva rahakott"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Rahakotile juurdepääsu lubamine lukustuskuvalt ja kiirseadetest"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Kuva seadmete juhtimisvidinad"</string>
@@ -5447,7 +5446,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Pole ajutiselt saadaval"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM-i pole"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Võrgueelistused"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Ühenda avalike võrkudega"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"võrguühendus, internet, juhtmeta, andmeside, wifi, wi-fi, wi fi, mobiilside, mobiilsideoperaator, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Lülita WiFi sisse"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Lülita WiFi välja"</string>
@@ -5465,6 +5463,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ võrk"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM-kaart"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"ALLALAADITUD SIM-KAART"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"ALLALAADITUD SIM-ID"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Aktiivne"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Mitteaktiivne"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Vaikimisi üksuse <xliff:g id="ID_1">%1$s</xliff:g> puhul"</string>
@@ -5542,6 +5541,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Kõikide rakenduste ja teenuste jaoks"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Mängude seaded"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Mängu juhtpaneeli otsetee sisselülitamine jm"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Eelmine"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Järgmine"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Värvi eelvaade"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM-kaardile juurdepääsu taotlus"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Seade soovib teie SIM-kaardile juurde pääseda. Puudutage üksikasjade nägemiseks."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Kas lubada juurdepääs SIM-kaardile?"</string>
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml
index f136638..63d45eb 100644
--- a/res/values-eu/arrays.xml
+++ b/res/values-eu/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Cachean gordetakoa (jardueren bezeroa)"</item>
     <item msgid="8186970968968646288">"Cachean gordetakoa (hutsik)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Anila"</item>
+    <item msgid="7216413848731287689">"Ziana"</item>
     <item msgid="5661027589207588703">"Urdina"</item>
-    <item msgid="3795787248113275442">"Indigoa"</item>
+    <item msgid="1219738214736244749">"Berdea"</item>
     <item msgid="6331809026622602308">"Morea"</item>
     <item msgid="6390546163902724700">"Arrosa"</item>
-    <item msgid="6618900408138432102">"Gorria"</item>
+    <item msgid="6500473130620545980">"Laranja"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 egunetik gorakoak"</item>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 4008fc2..d747700 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Beste behin"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Jarraitu hatz-marken ikonoari"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Jarraitu hatza jasotzen, hatz-markaren zati guztiak gehitzeko"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Hatz-markaren ikonoa mugitzen den bakoitzean, eduki sakatuta sentsorea. Horrela, hatz-markaren eremu zabalagoa hartzen da."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Jarri hatzaren punta sentsorearen gainean"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Amaitzeko, jarri hatzaren alboak"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Jarri hatz-markaren albo bat sentsorearen gainean eta eutsi horrela. Ondoren, egin gauza bera beste alboarekin."</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Horrela, hatz-markaren eremu zabalagoa hartzen da"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Eduki ukituta sentsorea hatz-markaren ikonoa mugitzen den bakoitzean. Horrela, hatz-marka osoa detektatuko da."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Horrela, hatz-marka osoa detektatuko da"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Hatz-markaren ehuneko <xliff:g id="PERCENTAGE">%d</xliff:g> erregistratu da"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Gehitu da hatz-marka"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Orain, hatz-marka erabil dezakezu telefonoa desblokeatzeko edo zeu zarela egiaztatzeko, hala nola aplikazioetan saioa hastean"</string>
@@ -1822,10 +1819,10 @@
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Laguntza"</string>
     <string name="network_settings_title" msgid="4663717899931613176">"Sare mugikorra"</string>
     <string name="manage_mobile_plan_title" msgid="5616930513733409064">"Mugikorraren plana"</string>
-    <string name="sms_application_title" msgid="4791107002724108809">"SMSetarako aplikazioa"</string>
-    <string name="sms_change_default_dialog_title" msgid="2343439998715457307">"SMSetarako aplikazioa aldatu nahi duzu?"</string>
-    <string name="sms_change_default_dialog_text" msgid="8777606240342982531">"<xliff:g id="NEW_APP">%1$s</xliff:g> aplikazioaren ordez, <xliff:g id="CURRENT_APP">%2$s</xliff:g> erabili nahi duzu SMSetarako aplikazio gisa?"</string>
-    <string name="sms_change_default_no_previous_dialog_text" msgid="6215622785087181275">"<xliff:g id="NEW_APP">%s</xliff:g> erabili nahi duzu SMSetarako aplikazio gisa?"</string>
+    <string name="sms_application_title" msgid="4791107002724108809">"SMSak"</string>
+    <string name="sms_change_default_dialog_title" msgid="2343439998715457307">"SMS mezuetarako aplikazioa aldatu?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8777606240342982531">"<xliff:g id="NEW_APP">%1$s</xliff:g> aplikazioaren ordez, <xliff:g id="CURRENT_APP">%2$s</xliff:g> aplikazioa erabili SMS mezuetarako?"</string>
+    <string name="sms_change_default_no_previous_dialog_text" msgid="6215622785087181275">"Erabili <xliff:g id="NEW_APP">%s</xliff:g> SMS mezuetarako aplikazio gisa?"</string>
     <string name="network_scorer_picker_title" msgid="2022922801936206195">"Sare-balorazioen hornitzailea"</string>
     <string name="network_scorer_picker_none_preference" msgid="8894034333043177807">"Bat ere ez"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="7005220310238618141">"Wifi-laguntzailea aldatu nahi duzu?"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Sistemak erabilitakoa azken 24 orduetan"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Sistemak erabilitakoa: <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Aplikazioek erabilitakoa: <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"AM"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"PM"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Guztira: minutu bat baino gutxiago"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Atzeko planoa: minutu bat baino gutxiago"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Guztira: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4326,8 +4321,8 @@
     <string name="domain_urls_summary_some" msgid="1197692164421314523">"Ireki <xliff:g id="DOMAIN">%s</xliff:g> eta beste URL batzuk"</string>
     <string name="domain_urls_apps_summary_off" msgid="2534980824850890416">"Ez dago esteka bateragarriak ireki ditzakeen aplikaziorik"</string>
     <plurals name="domain_urls_apps_summary_on" formatted="false" msgid="7864816862441985323">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikaziok ireki ditzakete esteka bateragarriak</item>
-      <item quantity="one">Aplikazio batek ireki ditzake esteka bateragarriak</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikaziok ireki ditzakete onartutako estekak</item>
+      <item quantity="one">Aplikazio batek ireki ditzake onartutako estekak</item>
     </plurals>
     <string name="app_link_open_always" msgid="9167065494930657503">"Eman esteka bateragarriak irekitzeko baimena aplikazioari"</string>
     <string name="app_link_open_ask" msgid="2422450109908936371">"Galdetu beti"</string>
@@ -5270,7 +5265,7 @@
     <string name="sim_action_continue" msgid="1688813133152389943">"Egin aurrera"</string>
     <string name="sim_action_yes" msgid="8076556020131395515">"Bai"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Berrabiarazi"</string>
-    <string name="sim_action_no_thanks" msgid="435717748384544195">"Ez, eskerrik asko"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Ez"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Aldatu"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Ezin da aktibatu SIM txartela"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Kendu SIM txartela eta sar ezazu berriro. Arazoak badirau, berrabiarazi gailua."</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Abiarazi Laguntzailea etengailua sakatuta edukiz"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Itzaltzeko eta larrialdietarako menua:\nSakatu etengailua eta bolumena igotzeko tekla aldi berean."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Saihestu tonua jotzea:\nBolumenaren menuan dago lasterbidea."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Zenbat denboraz edukiko duzu sakatuta etengailua?"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Sentikortasuna doitzeko, aukeratu zenbat denboraz edukitzen duzun sakatuta etengailua"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Laburra"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Luzea"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Erakutsi diru-zorroa"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Eman diru-zorroa atzitzeko baimena pantaila blokeatuan eta ezarpen bizkorretan"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Erakutsi gailuak kontrolatzeko widgetak"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Ez dago erabilgarri aldi baterako"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Ez dago SIMik"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Sarearen hobespenak"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Konektatu sare publikoetara"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"sareko konexioa, internet, hari gabeko konexioak, datuak, wifia, mugikorra, telefono mugikorra, operadorea, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Aktibatu wifia"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Desaktibatu wifia"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ sarea"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIMa"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"DESKARGATUTAKO SIMa"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"DESKARGATUTAKO SIMAK"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Aktibo"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Inaktibo"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / <xliff:g id="ID_1">%1$s</xliff:g> aukera lehenetsia"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Aplikazio eta zerbitzu guztietarako"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Jokoen ezarpenak"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Aktibatu joko-paneleko lasterbidea, etab."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Aurrekoa"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Hurrengoa"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Kolorearen aurrebista"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM txartela atzitzeko eskaera"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Gailu bat SIM txartela atzitu nahian dabil. Sakatu hau xehetasunak ikusteko."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"SIM txartela atzitzeko baimena eman nahi duzu?"</string>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index f622e95..b8b0b0d 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"قرار داده شده در حافظه پنهان (کلاینت فعالیت)"</item>
     <item msgid="8186970968968646288">"قرار داده شده در حافظه پنهان (خالی)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"‎@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"‎@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"‎@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"‎@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"‎@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"‎@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"فیروزه‌ای"</item>
+    <item msgid="7216413848731287689">"سبزآبی"</item>
     <item msgid="5661027589207588703">"آبی"</item>
-    <item msgid="3795787248113275442">"نیلی"</item>
+    <item msgid="1219738214736244749">"سبز"</item>
     <item msgid="6331809026622602308">"بنفش"</item>
     <item msgid="6390546163902724700">"صورتی"</item>
-    <item msgid="6618900408138432102">"قرمز"</item>
+    <item msgid="6500473130620545980">"نارنجی"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"بیش از ۳۰ روز پیش"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index d6781ee..566eb6d 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"یک‌بار دیگر"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"دنبال کردن نماد اثر انگشت"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"مدام انگشتتان را جابه‌جا کنید تا بخش‌های مختلف اثر انگشتتان را اضافه کنید"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"هر بار که نماد اثر انگشت حرکت می‌کند، لمس کنید و نگه دارید. این کار کمک می‌کند بخش بیشتری از اثر انگشتتان ثبت شود."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"نوک انگشتتان را روی حسگر قرار دهید"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"در نهایت، گوشه‌های انگشتتان را روی حسگر قرار دهید"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"یک سمت انگشتتان را روی حسگر اثر انگشت قرار دهید و نگه دارید، سپس این کار را با سمت دیگر تکرار کنید"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"این کار کمک می‌کند بخش بیشتری از اثر انگشتتان ثبت شود"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"هر بار که نماد اثر انگشت حرکت می‌کند، لمس کنید و نگه دارید. این کار کمک می‌کند اثر انگشتتان به‌طور کامل ثبت شود."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"این کار کمک می‌کند اثر انگشتتان به‌طور کامل ثبت شود"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"درحال ثبت اثر انگشت: <xliff:g id="PERCENTAGE">%d</xliff:g> درصد"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"اثر انگشت اضافه شد"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"اکنون می‌توانید از اثر انگشتتان برای باز کردن قفل تلفن یا به‌تأیید رساندن هویتتان (مثلاً وقتی به سیستم برنامه‌ها وارد می‌شوید) استفاده کنید"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"استفاده از سیستم در ۲۴ ساعت گذشته"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"استفاده از سیستم برای <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"استفاده از برنامه برای <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"ق.ظ"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"ب.ظ"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"مجموع: کمتر از یک دقیقه"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"پس‌زمینه: کمتر از یک دقیقه"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"مجموع: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"راه‌اندازی «دستیار»‌با نگه داشتن دکمه روشن/خاموش"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"منوی روشن/خاموش و اضطراری:\nدکمه روشن/خاموش و افزایش صدا را هم‌زمان فشار دهید."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"جلوگیری از زنگ زدن:\nمیان‌بر در منوی میزان صدا دردسترس است."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"مدت فشار دادن و نگه داشتن"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"با انتخاب مدت زمان فشار دادن و نگه داشتن دکمه روشن/ خاموش، میزان حساسیت را تنظیم کنید"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"کوتاه"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"طولانی"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"نمایش کیف پول"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"مجاز کردن دسترسی به کیف پول از صفحه قفل و تنظیمات فوری"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"نمایش کنترل‌های دستگاه"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"موقتاً دردسترس نیست"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"سیم‌کارتی وجود ندارد"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"اولویت‌های شبکه"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"اتصال به شبکه‌های عمومی"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"‏اتصال شبکه، اینترنت، بی‌سیم، داده، wifi،‏ wi-fi، ‏wi fi، شبکه تلفن همراه، تلفن همراه، شرکت مخابراتی تلفن همراه، 4g،‏ 3g،‏ 2g،‏ lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"‏روشن کردن Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"‏خاموش کردن Wi-Fi"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"‏شبکه W+‎"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"سیم‌کارت"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"سیم‌کارت بارگیری‌شده"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"سیم‌کارت‌های بارگیری‌شده"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"فعال"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"غیرفعال"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / پیش‌فرض برای <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"برای همه برنامه‌ها و سرویس‌ها"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"تنظیمات بازی"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"روشن کردن میان‌بر «داشبورد بازی‌ها» و غیره"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"قبلی"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"بعدی"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"پیش‌دید رنگ"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"درخواست دسترسی به سیم‌کارت"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"دستگاهی می‌خواهد به سیم‌کارتتان دسترسی داشته باشد. برای دیدن جزئیات، ضربه بزنید."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"دسترسی به سیم‌کارت مجاز شود؟"</string>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index f6b375a..4c39095 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Välimuistissa (toiminnan suorittaja)"</item>
     <item msgid="8186970968968646288">"Välimuistissa (tyhjä)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Sinivihreä"</item>
+    <item msgid="7216413848731287689">"Syaani"</item>
     <item msgid="5661027589207588703">"Sininen"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Vihreä"</item>
     <item msgid="6331809026622602308">"Violetti"</item>
     <item msgid="6390546163902724700">"Pinkki"</item>
-    <item msgid="6618900408138432102">"Punainen"</item>
+    <item msgid="6500473130620545980">"Oranssi"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Yli 30 päivää vanhat"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 8819bf8..6a7aabe 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Vielä kerran"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Seuraa sormenjälkikuvaketta"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Kosketa tunnistinta toistuvasti, niin sormenjäljen eri osat lisätään"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Kosketa tunnistinta pitkään aina kun sormenjälkikuvake liikkuu. Tämä auttaa tallentamaan suuremman osan sormenjäljestäsi."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Aseta sormenpää tunnistimen päälle"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Tallenna lopuksi sormen sivut"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Aseta sormenjäljen reuna tunnistimen päälle ja pidä se siinä, ja tee sitten sama toiselle reunalle"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Tämä auttaa tallentamaan suuremman osan sormenjäljestäsi"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Kosketa tunnistinta pitkään, aina kun sormenjälkikuvake liikkuu. Tämä auttaa tallentamaan koko sormenjäljen."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Tämä auttaa tallentamaan koko sormenjäljen"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Sormenjäljen käyttöönotosta <xliff:g id="PERCENTAGE">%d</xliff:g> prosenttia valmiina"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Sormenjälki lisätty"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Voit nyt käyttää sormenjälkeäsi puhelimen lukituksen avaamiseen tai henkilöllisyyden todentamiseen esim. kirjautuessasi sovelluksiin"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Järjestelmän käyttö 24 viime tunnin sisällä"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Järjestelmän käyttö: <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Sovelluksen käyttö: <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"ap"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"ip"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Yhteensä: alle minuutti"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Taustalla: alle minuutti"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Yhteensä: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Käynnistä Assistant painamalla virtapainiketta pitkään"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Virta‑ ja Hätätilannevalikko:\nPaina virta‑ ja äänenvoimakkuuspainiketta yhtä aikaa."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Soittamisen esto:\nPikanäppäin näkyy äänenvoimakkuusvalikossa."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Valitse kesto painamalla pitkään"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Säädä herkkyyttä valitsemalla, kauanko virtapainiketta täytyy painaa"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Lyhyen ajan"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Pitkään"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Näytä Wallet"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Salli Walletin käyttö lukitusnäytöltä ja pika-asetuksista"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Näytä laitteiden hallinta"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Tilapäisesti poissa käytöstä"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Ei SIM-korttia"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Verkkoasetukset"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Yhdistä julkisiin verkkoihin"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"verkkoyhteys, internet, langaton, data, langaton yhteys, Wi-Fi, Wi Fi, datayhteys, mobiili, puhelinoperaattori, 4g, 3g, 2g, LTE"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Laita Wi-Fi päälle"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Laita Wi-Fi pois päältä"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ ‑verkko"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM-kortti"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"LADATTU SIM-KORTTI"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"LADATUT SIM-kortit"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Aktiivinen"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Ei aktiivinen"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Oletus: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Kaikki sovellukset ja palvelut"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Peliasetukset"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Laita päälle esim. Pelipaneelin pikakuvake"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Edellinen"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Seuraava"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Värin esikatselu"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM-kortin pääsyoikeuspyyntö"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Laite haluaa pääsyn SIM-korttiisi. Katso lisätietoja napauttamalla."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Sallitaanko pääsy SIM-korttiin?"</string>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index 8ac074a..ab61755 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Mise en cache (client d\'activité)"</item>
     <item msgid="8186970968968646288">"Mise en cache (vide)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Turquoise"</item>
+    <item msgid="7216413848731287689">"Cyan"</item>
     <item msgid="5661027589207588703">"Bleu"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Vert"</item>
     <item msgid="6331809026622602308">"Mauve"</item>
     <item msgid="6390546163902724700">"Rose"</item>
-    <item msgid="6618900408138432102">"Rouge"</item>
+    <item msgid="6500473130620545980">"Orange"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Depuis plus de 30 jours"</item>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 951ae72..42aea33 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -53,7 +53,7 @@
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Rapetisser"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Agrandir"</string>
     <string name="auto_rotate_settings_primary_switch_title" msgid="3151963020165952847">"Utiliser la rotation automatique"</string>
-    <string name="smart_rotate_text_headline" msgid="436277795183609578">"La technologie de détection des visages utilise l\'appareil photo avant pour améliorer la précision de la rotation automatique. Les images sont jamais stockées ni envoyées à Google."</string>
+    <string name="smart_rotate_text_headline" msgid="436277795183609578">"La technologie de détection du visage utilise l\'appareil photo avant pour améliorer la précision de la rotation automatique. Les images sont jamais stockées ni envoyées à Google."</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Exemple de texte"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Le Magicien d\'Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Chapitre 11 : La merveilleuse cité d\'émeraude d\'Oz"</string>
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Encore une fois."</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Suivez l\'icône d\'empreinte digitale"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Déplacez légèrement votre doigt lorsque vous le relevez pour ajouter toutes les parties de votre empreinte digitale."</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Maintenez le doigt sur le capteur chaque fois que l\'icône de l\'empreinte digitale bouge. Cela aide à capter une plus grande partie de votre empreinte digitale."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Placer le bout de votre doigt sur le capteur"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Finalement, placer les bords de votre doigt"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Placez le côté de votre doigt sur le capteur et maintenez-le en place, puis passez à l\'autre côté"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Ce geste aide à capter une plus grande partie de votre empreinte digitale"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Maintenez le doigt sur le capteur chaque fois que l\'icône de l\'empreinte digitale bouge. Cette action permet de capturer l\'intégralité de votre empreinte digitale."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Cette action permet de capturer l\'intégralité de votre empreinte digitale"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Inscription de l\'empreinte digitale : <xliff:g id="PERCENTAGE">%d</xliff:g> pour cent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Empreinte digitale ajoutée"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Vous pouvez maintenant utiliser votre empreinte digitale pour déverrouiller votre téléphone ou vérifier qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applications"</string>
@@ -615,7 +612,7 @@
     <string name="suggested_fingerprint_lock_settings_summary" product="device" msgid="1040265358906410746"></string>
     <string name="suggested_fingerprint_lock_settings_summary" product="default" msgid="1040265358906410746"></string>
     <string name="lock_settings_picker_title" msgid="9219376327364915334">"Verrouillage de l\'écran"</string>
-    <string name="lock_settings_picker_new_lock_title" msgid="3113042086804290919">"Choisir un verrouillage d\'écran"</string>
+    <string name="lock_settings_picker_new_lock_title" msgid="3113042086804290919">"Choisissez un verrouillage d\'écran"</string>
     <string name="lock_settings_picker_update_lock_title" msgid="536853138943415927">"Choisissez nouv. verr. écran"</string>
     <string name="lock_settings_picker_new_profile_lock_title" msgid="2270462215256413800">"Choisir verrouillage pour applis pro"</string>
     <string name="lock_settings_picker_update_profile_lock_title" msgid="5929068163516308927">"Choisir nouveau verrouillage prof."</string>
@@ -1353,9 +1350,9 @@
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Activer la fonctionnalité d\'écran attentif"</string>
     <string name="adaptive_sleep_contextual_slice_summary" msgid="2993867044745446094">"Empêchez l\'écran de s\'éteindre pendant que vous le regardez"</string>
     <string name="auto_rotate_camera_lock_title" msgid="5369003176695105872">"L\'appareil photo est verrouillé"</string>
-    <string name="auto_rotate_camera_lock_summary" msgid="5699491516271544672">"L\'appareil photo doit être déverrouillé pour utiliser la détection des visages"</string>
+    <string name="auto_rotate_camera_lock_summary" msgid="5699491516271544672">"L\'appareil photo doit être déverrouillé pour utiliser la détection du visage"</string>
     <string name="adaptive_sleep_camera_lock_summary" msgid="8417541183603618098">"L\'appareil photo doit être déverrouillé pour utiliser la fonctionnalité d\'écran attentif"</string>
-    <string name="auto_rotate_summary_no_permission" msgid="1025061139746254554">"L\'accès à l\'appareil photo est nécessaire pour utiliser la détection des visages. Touchez pour gérer les services de personnalisation de l\'appareil"</string>
+    <string name="auto_rotate_summary_no_permission" msgid="1025061139746254554">"L\'accès à l\'appareil photo est nécessaire pour utiliser la détection du visage. Touchez pour gérer les services de personnalisation de l\'appareil"</string>
     <string name="auto_rotate_manage_permission_button" msgid="2591146085906382385">"Gérer les autorisations"</string>
     <string name="night_display_title" msgid="8532432776487216581">"Éclairage nocturne"</string>
     <string name="night_display_text" msgid="4789324042428095383">"Le mode Éclairage nocturne donne une teinte ambre à votre écran. Cela vous permet de le regarder plus facilement lorsque l\'éclairage est faible et peut vous aider à vous endormir plus facilement."</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Utilisation par le système, dernières 24 h"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Utilisation par le système : <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Utilisation par l\'application : <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"am"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"pm"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total : moins d\'une minute"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Arrière-plan : moins d\'une minute"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total : <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Activez l\'Assistant en maintenant l\'interrupteur enfoncé"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Menu d\'alimentation et d\'urgence :\nAppuyez simultanément sur l\'interrupteur et le bouton d\'augmentation du volume."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Bloquer la sonnerie :\nRaccourci proposé dans le menu du volume."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Durée de maintien du doigt"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Réglez la sensibilité en choisissant la durée de maintien du doigt sur l\'interrupteur"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Court"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Long"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Afficher le portefeuille"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Autorisez l\'accès au portefeuille à partir de l\'écran de verrouillage et du menu Paramètres rapides"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Afficher les commandes des appareils"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Momentanément inaccessible"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Aucune carte SIM"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Préférences réseau"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Se connecter aux réseaux publics"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"connexion réseau, internet, sans fil, données, wifi, wi-fi, wi fi, cellulaire, mobile, fournisseur cellulaire, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Activer le Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Désactiver le Wi-Fi"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"Réseau W+"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"SIM TÉLÉCHARGÉE"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"CARTES SIM TÉLÉCHARGÉES"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Active"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Inactive"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Configuration par défaut pour <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Toutes les applications et tous les services"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Paramètres de jeu"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Activer le raccourci vers le tableau de bord de jeu, etc."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Précédent"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Suivant"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Aperçu de la couleur"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Demande d\'accès à la carte SIM"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Un appareil veut accéder à votre carte SIM. Touchez l\'écran pour en savoir plus."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Autoriser l\'accès à la carte SIM?"</string>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 4b844b8..87bb6e7 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Mise en cache (client d\'activité)"</item>
     <item msgid="8186970968968646288">"Mise en cache (vide)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Turquoise"</item>
+    <item msgid="7216413848731287689">"Cyan"</item>
     <item msgid="5661027589207588703">"Bleu"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Vert"</item>
     <item msgid="6331809026622602308">"Violet"</item>
     <item msgid="6390546163902724700">"Rose"</item>
-    <item msgid="6618900408138432102">"Rouge"</item>
+    <item msgid="6500473130620545980">"Orange"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Depuis plus de 30 jours"</item>
@@ -509,7 +517,7 @@
   <string-array name="wifi_metered_entries">
     <item msgid="3237321077949659241">"Détecter automatiquement"</item>
     <item msgid="3779092145391320375">"Considérer comme facturé à l\'usage"</item>
-    <item msgid="2047166446768045816">"Traiter comme sans compteur"</item>
+    <item msgid="2047166446768045816">"Considérer comme non facturé à l\'usage"</item>
   </string-array>
   <string-array name="wifi_privacy_entries">
     <item msgid="3485945604919292489">"Utiliser MAC aléatoire (par défaut)"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 89c0ebf..0e1c330 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -322,7 +322,7 @@
     <string name="security_status_title" msgid="6958004275337618656">"État de la sécurité"</string>
     <string name="security_dashboard_summary" msgid="7571035662779425918">"Verrouillage de l\'écran, Localiser mon appareil, sécurité des applications"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Visage ajouté"</string>
-    <string name="security_settings_face_preference_summary_none" msgid="5952752252122581846">"Appuyer pour configurer un visage"</string>
+    <string name="security_settings_face_preference_summary_none" msgid="5952752252122581846">"Appuyez pour configurer un visage"</string>
     <string name="security_settings_face_preference_title" msgid="2126625155005348417">"Déverrouillage facial"</string>
     <string name="security_settings_face_profile_preference_title" msgid="7519527436266375005">"Déverrouillage facial pour le travail"</string>
     <string name="security_settings_face_enroll_education_title" msgid="6448806884597691208">"Configurer le déverrouillage facial"</string>
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Encore une fois"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Suivre l\'icône de l\'empreinte digitale"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Continuez jusqu\'à ce que toutes les parties de votre empreinte soient lues"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Appuyez de manière prolongée chaque fois que l\'icône de l\'empreinte bouge. Cela permet de mieux capturer votre empreinte."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Placez le bout de votre doigt sur le capteur"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Pour finir, placez les bords de votre doigt"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Placez le côté de votre empreinte sur le capteur, maintenez-le, puis passez à l\'autre côté"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Cela permet de mieux capturer votre empreinte"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Appuyez de manière prolongée chaque fois que l\'icône de l\'empreinte bouge. Cela permet de capturer votre empreinte digitale complète."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Cela permet de capturer votre empreinte digitale complète"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Enregistrement de l\'empreinte digitale à <xliff:g id="PERCENTAGE">%d</xliff:g> pour cent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Empreinte digitale ajoutée"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Vous pouvez désormais utiliser votre empreinte digitale pour déverrouiller votre téléphone ou confirmer votre identité, par exemple pour vous connecter à des applis"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Utilisation du système - Dernières 24 h"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Utilisation par le système pour <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Utilisation par l\'appli pour <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"a.m."</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"p.m."</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total : moins d\'une min"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Arrière-plan : moins d\'une min"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total : <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Appuyer de manière prolongée sur le bouton Marche/Arrêt pour déclencher l\'Assistant"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Menu Marche/Arrêt et d\'urgence :\nAppuyez simultanément sur Marche/Arrêt et Volume+."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Bloquer la sonnerie :\nRaccourci disponible dans le menu du volume."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Durée de l\'appui prolongé"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Ajustez la sensibilité en choisissant combien de temps appuyer de manière prolongée sur le bouton Marche/Arrêt"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Court"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Long"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Afficher le portefeuille"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Autoriser l\'accès au portefeuille depuis l\'écran de verrouillage et les Réglages rapides"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Afficher les commandes de contrôle des appareils"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Momentanément indisponible"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Aucune carte SIM"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Préférences réseau"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Se connecter aux réseaux publics"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"connexion réseau, internet, sans fil, données, wifi, wi-fi, wi fi, cellulaire, mobile, opérateur mobile, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Activer le Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Désactiver le Wi-Fi"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"Réseau W+"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"TÉLÉCHARGÉS"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"SIM TÉLÉCHARGÉ(E)S"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Actif"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Inactif"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" - Valeur par défaut pour <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Pour tous les services et applis"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Paramètres de jeu"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Activer le raccourci Tableau de bord Jeux, etc."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Précédent"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Suivant"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Aperçu de la couleur"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Demande d\'accès à la carte SIM"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Un appareil souhaite accéder à votre carte SIM. Appuyez ici pour plus de détails."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Autoriser l\'accès à la carte SIM ?"</string>
diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml
index 0480290..2ae1b1e 100644
--- a/res/values-gl/arrays.xml
+++ b/res/values-gl/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Na caché (cliente de actividade)"</item>
     <item msgid="8186970968968646288">"Na caché (en branco)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Verde azulado"</item>
+    <item msgid="7216413848731287689">"Ciano"</item>
     <item msgid="5661027589207588703">"Azul"</item>
-    <item msgid="3795787248113275442">"Índigo"</item>
+    <item msgid="1219738214736244749">"Verde"</item>
     <item msgid="6331809026622602308">"Violeta"</item>
     <item msgid="6390546163902724700">"Rosa"</item>
-    <item msgid="6618900408138432102">"Vermello"</item>
+    <item msgid="6500473130620545980">"Laranxa"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"De máis de 30 días"</item>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 0886618..e427c6c 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Unha vez máis"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Sigue a icona da impresión dixital"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Continúa levantando o dedo para engadir as diferentes partes da túa impresión dixital"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Mantén o sensor premido cada vez que se mova a icona da impresión dixital. Ao facelo, axudas a capturar unha parte máis ampla da túa impresión dixital."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Coloca a punta do dedo no sensor"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Por último, coloca os bordos do dedo"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Mantén a parte lateral da túa impresión dixital no sensor e, despois, cambia ao outro lado"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Ao facelo, axudas a capturar unha parte máis ampla da túa impresión dixital"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Mantén o sensor premido cada vez que se mova a icona da impresión dixital. Esta acción axuda a rexistrar toda a impresión dixital."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Esta acción axuda a rexistrar toda a impresión dixital"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Rexistrando impresión dixital (<xliff:g id="PERCENTAGE">%d</xliff:g> por cento)"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Engadiuse a impresión dixital"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Xa podes utilizar a impresión dixital para desbloquear o teléfono ou verificar a túa identidade (por exemplo, cando queiras iniciar sesión nunha aplicación)"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Uso do sistema durante as últimas 24 horas"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Uso do sistema durante <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Uso das aplicacións durante <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"a. m."</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"p. m."</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: menos dun minuto"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"En segundo plano: menos dun minuto"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Activa o Asistente ao manter premido o botón de acendido"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Menú de acendido e emerxencia:\nPreme as teclas de acendido e de subir volume ao mesmo tempo."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Evitar que soe:\nAtallo dispoñible no menú de volume."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Duración da presión no botón"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Para axustar a sensibilidade, escolle durante canto tempo debe manterse premido o botón de acendido"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Curta"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Longa"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Mostrar moedeiro"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Permite o acceso ao moedeiro desde a pantalla de bloqueo e o menú Configuración rápida"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Mostrar control de dispositivos"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Non dispoñible temporalmente"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Non hai SIM"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferencias de rede"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectarse a redes públicas"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"conexión de rede, Internet, sen fíos, datos, wifi, móbil, operador, 4G, 3G, 2G, LTE"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Activar a wifi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Desactivar a wifi"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"Rede W+"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"SIM DESCARGADAS"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"SIM DESCARGADAS"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Activa"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Inactiva"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Configuración predeterminada para <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Para todas as aplicacións e servizos"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Configuración para xogos"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Activa o atallo ao panel de xogo etc."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Anterior"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Seguinte"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Vista previa da cor"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Solicitude de acceso á tarxeta SIM"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Un dispositivo quere acceder á túa tarxeta SIM. Toca para obter información."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Queres permitir o acceso á tarxeta SIM?"</string>
diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml
index 11f66a4..75e2e7f 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"કેશ્ડ (પ્રવૃત્તિ ક્લાઇન્ટ)"</item>
     <item msgid="8186970968968646288">"કેશ્ડ (ખાલી)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"મોરપીછ"</item>
+    <item msgid="7216413848731287689">"સાઍન"</item>
     <item msgid="5661027589207588703">"વાદળી"</item>
-    <item msgid="3795787248113275442">"ઘેરો વાદળી રંગ"</item>
+    <item msgid="1219738214736244749">"લીલો"</item>
     <item msgid="6331809026622602308">"જાંબલી"</item>
     <item msgid="6390546163902724700">"ગુલાબી"</item>
-    <item msgid="6618900408138432102">"લાલ"</item>
+    <item msgid="6500473130620545980">"નારંગી"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 દિવસથી વધુ જૂના"</item>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 101338e..ca5aedb 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"ફરી એક વાર કરો"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"ફિંગરપ્રિન્ટના આઇકનને ફૉલો કરો"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"તમારી ફિંગરપ્રિન્ટના વિવિધ ભાગ ઉમેરવા માટે તમારી આંગળી ઉપાડતા રહો"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"જ્યારે પણ ફિંગરપ્રિન્ટ આઇકન ખસે ત્યારે દરેક વખતે ટચ કરીને થોડીવાર દબાવી રાખો. આમ કરવાથી, તમારી ફિંગરપ્રિન્ટને બહેતર રીતે કૅપ્ચર કરવામાં સહાય મળે છે."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"તમારી આંગળીની ટોચને સેન્સર પર મૂકો"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"છેલ્લે, તમારી આંગળીની કિનારીઓને સેન્સર પર મૂકો"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"તમારી આંગળીને સેન્સર પર મૂકો અને દબાવી રાખો, પછી આંગળીના બીજા ભાગોને સેન્સર પર મૂકો"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"આમ કરવાથી, તમારી ફિંગરપ્રિન્ટને બહેતર રીતે કૅપ્ચર કરવામાં સહાય મળે છે"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"જ્યારે પણ ફિંગરપ્રિન્ટ આઇકન ખસે ત્યારે દરેક વખતે ટચ કરીને થોડીવાર દબાવી રાખો. આ તમારી આખી ફિંગરપ્રિન્ટ કૅપ્ચર કરવામાં સહાય કરે છે."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"આ તમારી આખી ફિંગરપ્રિન્ટ કૅપ્ચર કરવામાં સહાય કરે છે"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"ફિંગરપ્રિન્ટની નોંધણી કરવાની પ્રક્રિયા <xliff:g id="PERCENTAGE">%d</xliff:g> ટકા પૂર્ણ થઈ છે"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"ફિંગરપ્રિન્ટ ઉમેરી"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"તમારો ફોન અનલૉક કરવા અથવા જ્યારે તમે ઍપમાં સાઇન ઇન કરો ત્યારે એ તમે જ છો તેની ચકાસણી કરવા માટે, હવે તમે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરી શકો છો"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"છેલ્લા 24 કલાકમાં સિસ્ટમનો વપરાશ"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"<xliff:g id="SLOT">%s</xliff:g> માટે સિસ્ટમનો વપરાશ"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"<xliff:g id="SLOT">%s</xliff:g> માટે ઍપનો વપરાશ"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"am"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"pm"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"કુલ: એક મિનિટ કરતાં ઓછો સમય"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"બૅકગ્રાઉન્ડ: એક મિનિટ કરતાં ઓછો સમય"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"કુલ: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4966,7 +4961,7 @@
       <item quantity="one">કૅમેરા ઍપ્લિકેશનો</item>
       <item quantity="other">કૅમેરા ઍપ્લિકેશનો</item>
     </plurals>
-    <string name="default_calendar_app_title" msgid="1870095225089706093">"Calendar ઍપ"</string>
+    <string name="default_calendar_app_title" msgid="1870095225089706093">"કૅલેન્ડર ઍપ્લિકેશન"</string>
     <string name="default_contacts_app_title" msgid="7740028900741944569">"સંપર્ક ઍપ્લિકેશન"</string>
     <plurals name="default_email_app_title" formatted="false" msgid="8338194872609410234">
       <item quantity="one">ઇમેઇલ ક્લાઇન્ટ ઍપ્લિકેશનો</item>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"પાવર બટનને દબાવી રાખીને Assistantનો ઉપયોગ કરો"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"પાવર અને ઇમર્જન્સી મેનૂ:\nએક જ સમયે અને વૉલ્યૂમ વધારવાનું બટન દબાવો."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"રિંગ વાગતી અટકાવો:\nવૉલ્યૂમ મેનૂમાં શૉર્ટકટ ઉપલબ્ધ છે."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"દબાવી રાખવાનો સમયગાળો"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"પાવર બટનને કેટલા સમય સુધી દબાવી રાખવું તે પસંદ કરીને સંવેદિતાની ગોઠવણ કરો"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"નાનો"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"લાંબો"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"વૉલેટ બતાવો"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"લૉક સ્ક્રીન અને ઝડપી સેટિંગથી વૉલેટ ઍક્સેસ કરવાની મંજૂરી આપો"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"ડિવાઇસનાં નિયંત્રણો બતાવો"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"હંગામી રૂપે અનુપલબ્ધ"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"કોઈ સિમ કાર્ડ નથી"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"નેટવર્કની પસંદગીઓ"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"સાર્વજનિક નેટવર્ક સાથે કનેક્ટ કરો"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"નેટવર્ક કનેક્શન, ઇન્ટરનેટ, વાયરલેસ, ડેટા, વાઇ-ફાઇ, સેલ્યુલર, મોબાઇલ, સેલ, મોબાઇલ ઑપરેટર, 4G, 3G, 2G, LTE"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"વાઇ-ફાઇ ચાલુ કરો"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"વાઇ-ફાઇ બંધ કરો"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ નેટવર્ક"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"સિમ"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"ડાઉનલોડ કરેલું સિમ"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"ડાઉનલોડ કરેલા SIMS"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"સક્રિય"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"નિષ્ક્રિય"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / <xliff:g id="ID_1">%1$s</xliff:g> માટે ડિફૉલ્ટ"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"બધી ઍપ અને સેવાઓ માટે"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"ગેમ સેટિંગ"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"ગેમ ડૅશબોર્ડનો શૉર્ટકટ, વગેરે ચાલુ કરો"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"પાછળ"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"આગળ"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"રંગનો પ્રીવ્યૂ"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"સિમ કાર્ડને ઍક્સેસ કરવાની વિનંતી"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"કોઈ ડિવાઇસ તમારા સિમ કાર્ડને ઍક્સેસ કરવા માગે છે. વિગતો માટે ટૅપ કરો."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"સિમ કાર્ડના ઍક્સેસની મંજૂરી આપીએ?"</string>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index ef27022..3b3d8fb 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"संचित (गतिविधि क्लाइंट)"</item>
     <item msgid="8186970968968646288">"संचित (खाली)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"हरा-नीला"</item>
+    <item msgid="7216413848731287689">"स्यान"</item>
     <item msgid="5661027589207588703">"नीला"</item>
-    <item msgid="3795787248113275442">"गहरा नीला"</item>
+    <item msgid="1219738214736244749">"हरा"</item>
     <item msgid="6331809026622602308">"बैंगनी"</item>
     <item msgid="6390546163902724700">"गुलाबी"</item>
-    <item msgid="6618900408138432102">"लाल"</item>
+    <item msgid="6500473130620545980">"नारंगी"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 दिन से ज़्यादा पुराने"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index daa1f08..ccf8c11 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"एक बार और छुएं"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"फ़िंगरप्रिंट आइकॉन को दबाते रहें"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"अपने फ़िंगरप्रिंट के अलग-अलग हिस्सों को जोड़ने के लिए अपनी उंगली को हटाते रहें"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"हर बार फ़िंगरप्रिंट आइकॉन में हलचल होने पर, उसे दबाकर रखें. ऐसा करके, आपके फ़िंगरप्रिंट को बेहतर तरीके से कैप्चर किया जा सकता है."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"अपनी उंगली के सबसे ऊपरी हिस्से को सेंसर पर रखें"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"आखिर में, अपनी उंगली के दोनों किनारों को बारी-बारी से सेंसर पर रखें"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"पहले अपनी उंगली के एक किनारे को सेंसर पर कुछ देर के लिए रखें और फिर दूसरी तरफ़ से भी ऐसा करें"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"ऐसा करके, आपके फ़िंगरप्रिंट को बेहतर तरीके से कैप्चर किया जा सकता है"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"हर बार फ़िंगरप्रिंट आइकॉन में हलचल होने पर, उसे दबाकर रखें. इससे, पूरा फ़िंगरप्रिंट कैप्चर करने में मदद मिलती है."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"इससे, पूरा फ़िंगरप्रिंट कैप्चर करने में मदद मिलती है"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"फ़िंगरप्रिंट सेट अप करने की प्रक्रिया <xliff:g id="PERCENTAGE">%d</xliff:g> प्रतिशत तक पूरी हो चुकी है"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"फ़िंगरप्रिंट जोड़ा गया"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"अब आप अपना फ़ोन अनलॉक करने के लिए, अपने फ़िंगरप्रिंट का इस्तेमाल कर सकते हैं. इसके अलावा, किसी ऐप्लिकेशन में साइन इन करने या ऐसे और काम करने के दौरान, अपनी पहचान की पुष्टि करने के लिए भी आप अपने फ़िंगरप्रिंट का इस्तेमाल कर सकते हैं"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"पिछले 24 घंटों में सिस्टम के इस्तेमाल की जानकारी"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"<xliff:g id="SLOT">%s</xliff:g> के लिए सिस्टम के इस्तेमाल की जानकारी"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"<xliff:g id="SLOT">%s</xliff:g> के लिए ऐप्लिकेशन के इस्तेमाल की जानकारी"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"am"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"pm"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"इस्तेमाल का कुल समय: एक मिनट से कम"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"बैकग्राउंड में इस्तेमाल होने का समय: एक मिनट से कम"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"इस्तेमाल का कुल समय: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"पावर बटन को कुछ देर तक दबाकर, Assistant का इस्तेमाल करें"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"पावर &amp; आपातकालीन मेन्यू:\nपावर बटन और आवाज़ तेज़ करने वाले बटन को एक साथ दबाएं."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"घंटी बजने से रोकना:\nइसका शॉर्टकट, वॉल्यूम मेन्यू में मौजूद है."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"बटन को दबाकर रखने का समय"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"पावर बटन को दबाकर रखने का समय चुनकर, संवेदनशीलता में बदलाव करें"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"कम समय के लिए"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"ज़्यादा समय के लिए"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"वॉलेट दिखाएं"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"लॉक स्क्रीन और फटाफट सेटिंग से वॉलेट ऐक्सेस करने की अनुमति दें"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"डिवाइस कंट्रोल दिखाएं"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"फ़िलहाल, उपलब्ध नहीं है"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"कोई सिम कार्ड नहीं लगाया गया है"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"नेटवर्क की सेटिंग"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"सार्वजनिक नेटवर्क से कनेक्ट करता है"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"नेटवर्क कनेक्शन, इंटरनेट, वायरलेस, डेटा, वाईफ़ाई, सेल्युलर, मोबाइल, मोबाइल और इंटरनेट सेवा देने वाली कंपनी, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"वाई-फ़ाई चालू करें"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"वाई-फ़ाई बंद करें"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"वाइ-फ़ाई नेटवर्क"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"सिम"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"डाउनलोड किया गया सिम"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"डाउनलोड किए गए सिम"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"चालू है"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"बंद है"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / <xliff:g id="ID_1">%1$s</xliff:g> के लिए डिफ़ॉल्ट कॉन्फ़िगरेशन"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"सभी ऐप्लिकेशन और सेवाओं के लिए"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"गेम की सेटिंग"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"गेम डैशबोर्ड का शॉर्टकट और दूसरी सुविधाएं चालू करें"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"पीछे जाएं"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"आगे बढ़ें"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"रंग की झलक"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"सिम कार्ड को ऐक्सेस करने का अनुरोध"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"डिवाइस आपके सिम कार्ड को ऐक्सेस करना चाहता है. जानकारी पाने के लिए टैप करें."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"क्या आप सिम कार्ड का ऐक्सेस देना चाहते हैं?"</string>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index dbe69b1..7932577 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Predmemorija (klijent aktivnosti)"</item>
     <item msgid="8186970968968646288">"Predmemorija (prazna)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@boja/SIM_boja_cijan"</item>
+    <item msgid="177868870612833388">"@boja/SIM_boja_plava800"</item>
+    <item msgid="1129898906008357171">"@boja/SIM_boja_zelena800"</item>
+    <item msgid="4206364087389793587">"@boja/SIM_boja_ljubičasta800"</item>
+    <item msgid="6728943460061940130">"@boja/SIM_boja_ružičasta800"</item>
+    <item msgid="968332068361935002">"@boja/SIM_boja_narančasta"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Tirkiznoplava"</item>
+    <item msgid="7216413848731287689">"Cijan"</item>
     <item msgid="5661027589207588703">"Plava"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Zelena"</item>
     <item msgid="6331809026622602308">"Ljubičasta"</item>
     <item msgid="6390546163902724700">"Ružičasta"</item>
-    <item msgid="6618900408138432102">"Crvena"</item>
+    <item msgid="6500473130620545980">"Narančasta"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Starije od 30 dana"</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 24beed2..0c1f154 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -488,11 +488,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Još jednom"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Slijedite ikonu otiska prsta"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Nastavite podizati prst da biste dodali različite dijelove otiska prsta"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Dodirnite i zadržite svaki put kada se ikona otiska prsta pomakne. To pomaže da ste snimi veći dio otiska prsta."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Postavite vrh prsta na senzor"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Na kraju postavite rubove prsta"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Postavite rub prsta na senzor i zadržite ga, a zatim prijeđite na drugu stranu"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"To pomaže da ste snimi veći dio otiska prsta"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Dodirnite i zadržite svaki put kada se ikona otiska prsta pomakne. To pomaže da se snimi cijeli otisak prsta."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"To pomaže da se snimi cijeli otisak prsta"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
@@ -2917,8 +2914,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Upotreba sustava u posljednja 24 sata"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Upotreba sustava za <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Upotreba aplikacije za <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"prijepodne"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"popodne"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Ukupno: manje od minute"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"U pozadini: manje od minute"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Ukupno: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5491,6 +5486,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Pokrenite Asistenta zadržavajući tipku za uključivanje/isključivanje"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Izbornik tipke za uključivanje i hitnih službi:\nistovremeno pritisnite tipku za uključivanje/isključivanje i tipku za glasnoću."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Sprječavanje zvonjenja:\nprečac je dostupan u izborniku glasnoće."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Trajanje pritiska i zadržavanja tipke"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Prilagodite osjetljivost tako što ćete odabrati duljinu pritiska i zadržavanja tipke za uključivanje/isključivanje"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Kratko"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Dugo"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Prikaži novčanik"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Omogućite pristup novčaniku sa zaključanog zaslona i iz brzih postavki"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Prikaži kontrole uređaja"</string>
@@ -5536,7 +5535,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Privremeno nedostupno"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nema SIM kartice"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Postavke mreže"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Poveži se s javnim mrežama"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"mrežna veza, internet, bežično, podaci, wifi, wi-fi, wi fi, mobilno, mobilni uređaj, mobilni operater, 4 g, 3 g, 2 g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Uključite Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Isključite Wi-Fi"</string>
@@ -5554,6 +5552,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ mreža"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"PREUZETI SIM"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"PREUZETI SIM-ovi"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Aktivno"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Neaktivno"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Zadano za <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5631,6 +5630,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Za sve aplikacije i usluge"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Postavke igara"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Uključite prečac za nadzornu ploču igre itd."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Prethodno"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Dalje"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Pregled boje"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Zahtjev za pristup SIM kartici"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Uređaj želi pristupiti vašoj SIM kartici. Dodirnite da biste vidjeli pojedinosti."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Želite li dopustiti pristup SIM kartici?"</string>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index b7c89b0..13ab2f4 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Gyorsítótárazott (tevékenységkliens)"</item>
     <item msgid="8186970968968646288">"Gyorsítótárazott (üres)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Pávakék"</item>
+    <item msgid="7216413848731287689">"Ciánkék"</item>
     <item msgid="5661027589207588703">"Kék"</item>
-    <item msgid="3795787248113275442">"Indigókék"</item>
+    <item msgid="1219738214736244749">"Zöld"</item>
     <item msgid="6331809026622602308">"Lila"</item>
     <item msgid="6390546163902724700">"Rózsaszín"</item>
-    <item msgid="6618900408138432102">"Piros"</item>
+    <item msgid="6500473130620545980">"Narancssárga"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Több mint 30 napos"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 12db278..71813d3 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Még egyszer"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Kövesse az ujjlenyomat ikont"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Emelgesse az ujját az ujjlenyomat különböző részeinek hozzáadásához"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Érintse meg az ikont, és tartsa rajta az ujját. Ismételje meg ezt mindig, amikor az ikon áthelyeződik. Így az ujjlenyomata nagyobb részét rögzítheti a rendszer."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Helyezze az ujja hegyét az érzékelőre"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Végül az ujja széleit helyezze az érzékelőre"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Helyezze az ujja oldalsó részét az érzékelőre, és tartsa lenyomva, majd helyezze az érzékelőre az ujja másik oldalát."</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Így az ujjlenyomata nagyobb részét tudja rögzíteni a rendszer."</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Érintse meg az ikont, és tartsa rajta az ujját. Ismételje meg ezt minden alkalommal, amikor az ujjlenyomat-ikon áthelyeződik. Ez segít a teljes ujjlenyomat rögzítésében."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Ez segít a teljes ujjlenyomat rögzítésében"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Ujjlenyomat regisztrálása folyamatban – <xliff:g id="PERCENTAGE">%d</xliff:g> százalék"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Ujjlenyomat hozzáadva"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Mostantól használhatja ujjlenyomatát telefonja zárolásának feloldásához vagy személyazonossága igazolásához (például amikor alkalmazásokba jelentkezik be)."</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Rendszerhasználat – legutóbbi 24 óra"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Rendszer használata erre: <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Alkalmazás használata erre: <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"de."</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"du."</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Összesen: kevesebb mint egy perc"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Háttér: kevesebb mint egy perc"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Összesen: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"A bekapcsológombot lenyomva tartva aktiválhatja a Segédet"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Bekapcsológombhoz és vészhelyzethez tartozó menü:\nNyomja le egyszerre a bekapcsológombot és a hangerő növelése gombot."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Csörgés megakadályozása:\nA gyorsparancs a hangerő menüben áll rendelkezésre."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Nyomva tartás időtartama"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Az érzékenység módosításához válassza ki, hogy mennyi ideig kelljen nyomva tartani a bekapcsológombot"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Rövid"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Hosszú"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Tárca mutatása"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Hozzáférés a tárcához a lezárási képernyőről és a Gyorsbeállításokból"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Eszközvezérlők megjelenítése"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Átmenetileg nem áll rendelkezésre"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM-kártya nélkül"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Hálózati beállítások"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Csatlakozás nyilvános hálózatokhoz"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"hálózati kapcsolat, internet, vezeték nélküli, mobiladat, adat, wifi, wi-fi, mobil, mobiltelefon, szolgáltató, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Wi-Fi bekapcsolása"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"A Wi-Fi kikapcsolása"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+-hálózat"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"LETÖLTÖTT SIM"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"LETÖLTÖTT SIM-EK"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Aktív"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Inaktív"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Alapértelmezett a következőhöz: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Minden alkalmazásnál és szolgáltatásnál"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Játékbeállítások"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Játékok irányítópultja-gyorsparancs bekapcsolása stb."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Előző"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Következő"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Szín előnézete"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM-kártyához való hozzáférés kérése"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Egy eszköz szeretne hozzáférni a SIM-kártyájához. Koppintson a részletekért."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Engedélyezi a SIM-kártyához való hozzáférést?"</string>
diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml
index ea01146..d84bb54 100644
--- a/res/values-hy/arrays.xml
+++ b/res/values-hy/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Քեշավորված (սպասառուի գործողությունը)"</item>
     <item msgid="8186970968968646288">"Քեշավորված (դատարկ)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Փիրուզագույն"</item>
+    <item msgid="7216413848731287689">"Երկնագույն"</item>
     <item msgid="5661027589207588703">"Կապույտ"</item>
-    <item msgid="3795787248113275442">"Ինդիգո"</item>
+    <item msgid="1219738214736244749">"Կանաչ"</item>
     <item msgid="6331809026622602308">"Մանուշակագույն"</item>
     <item msgid="6390546163902724700">"Վարդագույն"</item>
-    <item msgid="6618900408138432102">"Կարմիր"</item>
+    <item msgid="6500473130620545980">"Նարնջագույն"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 օրից հին"</item>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index eac0ede..eb7fd16 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Եվս մեկ անգամ"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Հետևեք ձեր մատնահետքի պատկերակին"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Փոքր-ինչ տեղաշարժեք մատը՝ մատնահետքի տարբեր հատվածներ ավելացնելու համար"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Հպեք մատնահետքի պատկերակին և պահեք ամեն անգամ, երբ այն տեղաշարժվում է։ Այդպես տվիչն ավելի մեծ մակերեսով կնկարի ձեր մատնահետքը։"</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Մատի ծայրը դրեք տվիչի վրա"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Այժմ դրեք մատի եզրերը"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Մատի մի կողմը դրեք տվիչի վրա և պահեք, ապա նույնն արեք մյուս կողմով"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Այդպես տվիչն ավելի մեծ մակերեսով կնկարի ձեր մատնահետքը"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Հպեք մատնահետքի պատկերակին և պահեք ամեն անգամ, երբ այն տեղաշարժվում է։ Սա կօգնի գրանցել ձեր ամբողջական մատնահետքը։"</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Սա կօգնի գրանցել ձեր ամբողջական մատնահետքը"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Մատնահետքը գրանցվել է <xliff:g id="PERCENTAGE">%d</xliff:g> տոկոսով"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Մատնահետքն ավելացվեց"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Այժմ կարող եք օգտագործել ձեր մատնահետքը՝ հեռախոսն ապակողպելու կամ հավելվածներում ձեր ինքնությունը հաստատելու համար (օր․՝ մուտք գործելիս)։"</string>
@@ -1605,8 +1602,8 @@
     <string name="storage_external_title" msgid="8984075540312137135">"Դյուրակիր հիշողություն"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Օգտագործված է <xliff:g id="TOTAL">%1$s</xliff:g>-ից"</string>
-    <string name="storage_mount_success" msgid="393972242641313135">"<xliff:g id="NAME">%1$s</xliff:g> պահոցը միացվեց"</string>
-    <string name="storage_mount_failure" msgid="3667915814876418011">"Չհաջողվեց միացնել <xliff:g id="NAME">%1$s</xliff:g> պահոցը"</string>
+    <string name="storage_mount_success" msgid="393972242641313135">"<xliff:g id="NAME">%1$s</xliff:g> պահեստը միացվեց"</string>
+    <string name="storage_mount_failure" msgid="3667915814876418011">"Չհաջողվեց միացնել <xliff:g id="NAME">%1$s</xliff:g> պահեստը"</string>
     <string name="storage_unmount_success" msgid="6406298575402936148">"<xliff:g id="NAME">%1$s</xliff:g> կրիչն անվնաս անջատվեց"</string>
     <string name="storage_unmount_failure" msgid="3796912279003790607">"Չհաջողվեց անվնաս անջատել <xliff:g id="NAME">%1$s</xliff:g> կրիչը"</string>
     <string name="storage_format_success" msgid="3028114521294256851">"<xliff:g id="NAME">%1$s</xliff:g> կրիչի ձևաչափումը հաջողվեց"</string>
@@ -1616,7 +1613,7 @@
     <string name="storage_dialog_unmountable" msgid="1761107904296941687">"Այս <xliff:g id="NAME_0">^1</xliff:g> վնասված է: \n\nԱյս <xliff:g id="NAME_1">^1</xliff:g> օգտագործելու համար անհրաժեշտ է նախ կարգավորել այն:"</string>
     <string name="storage_internal_format_details" msgid="8922023528848861812">"Ձևաչափումից հետո այս <xliff:g id="NAME_0">^1</xliff:g>-ը կարող եք օգտագործել այլ սարքերում: \n\nԱյս <xliff:g id="NAME_1">^1</xliff:g>-ի վրայի բոլոր տվյալները կջնջվեն: Ուստի, չմոռանաք նախ պահուստավորել: \n\n"<b>"Պահուստավորեք լուսանկարներն ու այլ մեդիա ֆայլերը"</b>" \nՏեղափոխեք մեդիա ֆայլերը այս սարքի մեկ այլ պահեստ կամ որևէ համակարգիչ USB մալուխի միջոցով: \n\n"<b>"Պահուստավորեք հավելվածները"</b>" \nԱյս <xliff:g id="NAME_6">^1</xliff:g>-ի վրայի բոլոր հավելվածները ապատեղադրվելու են, իսկ նրանց տվյալները ջնջվելու են: Հավելվածները պահպանելու համար տեղափոխեք դրանք այս սարքի մեկ այլ պահեստ:"</string>
     <string name="storage_internal_unmount_details" msgid="487689543322907311"><b>"Եթե հանեք այս <xliff:g id="NAME_0">^1</xliff:g>-ը, նրա վրա պահեստավորված հավելվածներն այլևս չեն աշխատի, իսկ մեդիա ֆայլերը հասանելի չեն լինի մինչև նորից չզետեղեք այն:"</b>" \n\nԱյս <xliff:g id="NAME_1">^1</xliff:g>-ը ձևաչափված է միայն այս սարքի վրա աշխատելու համար: Այն չի աշխատի այլ սարքերի վրա:"</string>
-    <string name="storage_internal_forget_details" msgid="5606507270046186691">"Այս <xliff:g id="NAME">^1</xliff:g>-ում առկա հավելվածները, լուսանկարները կամ տվյալները օգտագործելու համար հանեք և նորից զետեղեք այն: \n\nԻնչպես նաև, կարող եք հեռացնել այս պահոցը, եթե սարքն անհասանելի է: \n\nԵթե նախընտրեք հեռացնել այն, սարքի վրայի բոլոր տվյալները մշտապես կկորչեն: \n\nԿարող եք հետագայում նորից տեղադրել հավելվածները, բայց այս սարքի վրա պահեստավորված նրանց տվյալները կկորչեն:"</string>
+    <string name="storage_internal_forget_details" msgid="5606507270046186691">"Այս <xliff:g id="NAME">^1</xliff:g>-ում առկա հավելվածները, լուսանկարները կամ տվյալները օգտագործելու համար հանեք և նորից զետեղեք այն: \n\nԻնչպես նաև, կարող եք հեռացնել այս պահեստը, եթե սարքն անհասանելի է: \n\nԵթե նախընտրեք հեռացնել այն, սարքի վրայի բոլոր տվյալները մշտապես կկորչեն: \n\nԿարող եք հետագայում նորից տեղադրել հավելվածները, բայց այս սարքի վրա պահեստավորված նրանց տվյալները կկորչեն:"</string>
     <string name="storage_internal_forget_confirm_title" msgid="379238668153099015">"Մոռանա՞լ <xliff:g id="NAME">^1</xliff:g> սարքը:"</string>
     <string name="storage_internal_forget_confirm" msgid="5752634604952674123">"Այս <xliff:g id="NAME">^1</xliff:g> սարքում պահվող բոլոր հավելվածները, լուսանկարները և տվյալները ընդմիշտ ջնջվելու են:"</string>
     <string name="storage_detail_dialog_system" msgid="7461009051858709479">"Համակարգը ներառում է ֆայլեր, որոնք անհրաժեշտ են Android-ի <xliff:g id="VERSION">%s</xliff:g> տարբերակի աշխատանքի համար"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Համակարգի կողմից մարտկոցի օգտագործումը վերջին 24 ժամվա ընթացքում"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Համակարգի կողմից մարտկոցի օգտագործումը (<xliff:g id="SLOT">%s</xliff:g>)"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Հավելվածների կողմից մարտկոցի օգտագործումը (<xliff:g id="SLOT">%s</xliff:g>)"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"AM"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"PM"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Ընդամենը՝ մեկ րոպեից պակաս"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Ֆոնային՝ մեկ րոպեից պակաս"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Ընդամենը՝ <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Ակտիվացրեք Օգնականը՝ երկար սեղմած պահելով սնուցման կոճակը"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Սնուցման կոճակի և արտակարգ իրավիճակների տեղեկությունների ընտրացանկ\nՄիաժամանակ սեղմեք սնուցման և ձայնի բարձրացման կոճակները։"</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Զանգի ձայնի անջատում\nԴյուրանցումը հասանելի է ձայնի ուժգնության ընտրացանկում։"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Սեղմելու և պահելու տևողությունը"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Կարգավորեք զգայունությունը՝ նշելով, թե որքան երկար է անհրաժեշտ սեղմել և պահել սնուցման կոճակը։"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Կարճ"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Երկար"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Ցուցադրել դրամապանակը"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Հասանելի դարձնել դրամապանակը կողպէկրանին և արագ կարգավորումներում"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Ցուցադրել սարքերի կառավարման տարրերը"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Ժամանակավորապես անհասանելի է"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM քարտ չկա"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Ցանցի կարգավորումներ"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Միանալ հանրային ցանցերի"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"կապ, համացանց, անլար, ինտերնետ, wifi, wi-fi, wi fi, բջջային, շարժական, բջջային օպերատոր, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Միացրեք Wi-Fi-ը"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Անջատել Wi-Fi-ը"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ ցանց"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM քարտ"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"ՆԵՐԲԵՌՆՎԱԾ SIM ՔԱՐՏ"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"ՆԵՐԲԵՌՆՎԱԾ SIM ՔԱՐՏԵՐ"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Ակտիվ"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Ոչ ակտիվ"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Կանխադրված՝ «<xliff:g id="ID_1">%1$s</xliff:g>» կատեգորիայի համար"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Բոլոր հավելվածների և ծառայությունների համար"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Խաղերի կարգավորումներ"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Խաղային վահանակի դյուրանցման և այլ գործառույթների ակտիվացում"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Հետ"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Առաջ"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Գույնի նախադիտում"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM քարտի հասանելիության հարցում"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Սարքն ուզում է հասանելիություն ստանալ ձեր SIM քարտին։ Հպեք՝ ավելին իմանալու համար։"</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Հասանելի դարձնե՞լ SIM քարտը"</string>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 4fe59a0..f1c9c10 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Disimpan dalam cache (klien aktivitas)"</item>
     <item msgid="8186970968968646288">"Disimpan dalam cache (kosong)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Hijau kebiruan"</item>
+    <item msgid="7216413848731287689">"Sian"</item>
     <item msgid="5661027589207588703">"Biru"</item>
-    <item msgid="3795787248113275442">"Nila"</item>
+    <item msgid="1219738214736244749">"Hijau"</item>
     <item msgid="6331809026622602308">"Ungu"</item>
     <item msgid="6390546163902724700">"Merah Muda"</item>
-    <item msgid="6618900408138432102">"Merah"</item>
+    <item msgid="6500473130620545980">"Oranye"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Lebih dari 30 hari"</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 495e35c..94e9f20 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Sekali lagi"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Ikuti ikon sidik jari"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Angkat dan sentuhkan jari secara berulang untuk menambahkan bagian lain dari sidik jari Anda"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Sentuh lama setiap kali ikon sidik jari berpindah. Tindakan ini membantu mengambil sidik jari Anda secara lebih menyeluruh."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Posisikan ujung jari Anda pada sensor"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Terakhir, posisikan tepi jari Anda pada sensor"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Posisikan sisi sidik jari Anda pada sensor, kemudian tahan, lalu beralihlah ke sisi lainnya"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Tindakan ini membantu mengambil sidik jari Anda secara lebih menyeluruh"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Sentuh lama setiap kali ikon sidik jari berpindah. Tindakan ini membantu merekam sidik jari Anda secara penuh."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Tindakan ini membantu merekam sidik jari Anda secara penuh"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Mendaftarkan sidik jari <xliff:g id="PERCENTAGE">%d</xliff:g> persen"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Sidik jari ditambahkan"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Kini Anda dapat menggunakan sidik jari untuk membuka kunci ponsel atau memverifikasi diri Anda, seperti saat login ke aplikasi"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Penggunaan sistem selama 24 jam terakhir"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Penggunaan sistem untuk <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Penggunaan aplikasi untuk <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"am"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"pm"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: kurang dari satu menit"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Latar belakang: kurang dari satu menit"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Picu Asisten dengan menekan lama tombol daya"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Menu Daya &amp; Darurat:\nTekan tombol Daya dan Naikkan volume bersamaan."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Cegah berdering:\nPintasan tersedia di menu volume."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Durasi tekan &amp; tahan"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Sesuaikan sensitivitas dengan memilih durasi menekan &amp; menahan tombol daya"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Singkat"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Lama"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Tampilkan dompet"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Izinkan akses ke dompet dari layar kunci dan setelan cepat"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Tampilkan kontrol perangkat"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Tidak tersedia untuk sementara"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Tidak ada SIM"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferensi jaringan"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Hubungkan ke jaringan publik"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"koneksi jaringan, internet, nirkabel, data, wifi, wi-fi, wi fi, seluler, (perangkat) seluler, operator seluler, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Aktifkan Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Nonaktifkan Wi-Fi"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"Jaringan W+"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"SIM YANG DIDOWNLOAD"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"SIM YANG DIDOWNLOAD"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Aktif"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Tidak aktif"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Default untuk <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Untuk semua aplikasi dan layanan"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Setelan game"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Aktifkan pintasan Dasbor Game, dsb."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Sebelumnya"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Berikutnya"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Pratinjau warna"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Permintaan akses kartu SIM"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Sebuah perangkat ingin mengakses kartu SIM Anda. Ketuk untuk melihat detailnya."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Izinkan akses ke kartu SIM?"</string>
diff --git a/res/values-is/arrays.xml b/res/values-is/arrays.xml
index 790d361..89e2f18 100644
--- a/res/values-is/arrays.xml
+++ b/res/values-is/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Í skyndiminni (virknibiðlari)"</item>
     <item msgid="8186970968968646288">"Í skyndiminni (autt)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Blágrænn"</item>
+    <item msgid="7216413848731287689">"Ljósblár"</item>
     <item msgid="5661027589207588703">"Blár"</item>
-    <item msgid="3795787248113275442">"Dimmfjólublár"</item>
+    <item msgid="1219738214736244749">"Grænn"</item>
     <item msgid="6331809026622602308">"Fjólublár"</item>
     <item msgid="6390546163902724700">"Bleikur"</item>
-    <item msgid="6618900408138432102">"Rauður"</item>
+    <item msgid="6500473130620545980">"Appelsínugulur"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Eldri en 30 daga"</item>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index acb6156..0ba7b83 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Einu sinni enn"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Fylgdu fingrafarstákninu"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Lyftu fingrinum endurtekið til að bæta við mismunandi hlutum fingrafarsins"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Haltu inni í hvert sinn sem fingrafarstáknið hreyfist. Þannig er hægt að mynda fingrafarið þitt betur."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Settu fingurgóminn á lesarann"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Að lokum skaltu skrá hliðar fingursins"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Settu hlið fingrafarsins á fingrafaralesarann og haltu fingrinum þar. Skiptu svo yfir á hina hliðina"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Þannig er hægt að mynda fingrafarið þitt betur"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Haltu inni í hvert sinn sem fingrafarstáknið hreyfist. Þetta auðveldar þér að mynda allt fingrafarið."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Þetta auðveldar þér að mynda allt fingrafarið"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Skráir fingrafar <xliff:g id="PERCENTAGE">%d</xliff:g> prósent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingrafari bætt við"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Nú geturðu notað fingrafarið þitt til að opna símann eða til að staðfesta hver þú ert, t.d. við innskráningu í forrit"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Kerfisnotkun síðasta sólarhringinn"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Notkun kerfis: <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Notkun forrits: <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"f.h."</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"e.h."</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Alls: innan við mínúta"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Í bakgrunni: innan við mínúta"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Samtals: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Ræstu Hjálparann með því að halda aflrofanum inni"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Aflrofa- og neyðarvalmynd:\nÝttu samtímis á aflrofann og hnappinn til að hækka hljóðstyrk."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Koma í veg fyrir hringingu:\nFlýtileið í boði á hljóðvalmyndinni."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Hversu lengi á að halda inni"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Stilltu næmi með því að velja í hversu langan tíma á að halda aflrofanum inni"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Stutt"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Lengi"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Sýna veski"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Leyfa aðgang að veski af lásskjá og úr flýtistillingum"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Sýna tækjastjórnun"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Ekki tiltækt í augnablikinu"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Ekkert SIM-kort"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Netstillingar"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Tengjast opnum netum"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"nettenging, internetið, þráðlaust, gögn, wifi, wi-fi, wi fi, farsímakerfi, farsími, símafyrirtæki, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Kveikja á Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Slökkva á Wi-Fi"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ net"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"SÓTT SIM-KORT"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"SIM SEM VAR HLAÐIÐ NIÐUR"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Virkt"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Óvirkt"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Sjálfgefið fyrir <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Fyrir öll forrit og þjónustur"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Leikjastillingar"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Kveikja á leikjastjórnborðsflýtileið o.s.frv."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Til baka"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Áfram"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Forskoðun litar"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Beiðni um aðgang að SIM-korti"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Tæki vill fá aðgang að SIM-kortinu þínu. Ýttu til að fá frekari upplýsingar."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Leyfa aðgang að SIM-korti?"</string>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 7b3b500..287eec6 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Memorizzata nella cache (client attività)"</item>
     <item msgid="8186970968968646288">"Memorizzata nella cache (vuoto)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Verde acqua"</item>
+    <item msgid="7216413848731287689">"Ciano"</item>
     <item msgid="5661027589207588703">"Blu"</item>
-    <item msgid="3795787248113275442">"Indaco"</item>
+    <item msgid="1219738214736244749">"Verde"</item>
     <item msgid="6331809026622602308">"Viola"</item>
     <item msgid="6390546163902724700">"Rosa"</item>
-    <item msgid="6618900408138432102">"Rosso"</item>
+    <item msgid="6500473130620545980">"Arancione"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Più vecchi di 30 giorni"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index cfdb1f4..b4ff877 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Ancora una volta"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Segui l\'icona dell\'impronta"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Solleva ripetutamente il dito per aggiungere le varie parti dell\'impronta."</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Tocca e tieni premuto ogni volta che l\'icona dell\'impronta si sposta. In questo modo è più facile acquisire più parti dell\'impronta."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Appoggia la punta del dito sul sensore"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Infine, appoggia i lati del dito"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Appoggia un lato del dito sul sensore e tieni premuto, quindi passa all\'altro lato"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"In questo modo è più facile acquisire più parti dell\'impronta"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Tocca e tieni premuto ogni volta che l\'icona dell\'impronta si sposta. Questa operazione consente di acquisire la tua impronta completa."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Questa operazione consente di acquisire la tua impronta completa"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Registrazione dell\'impronta al <xliff:g id="PERCENTAGE">%d</xliff:g> percento"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Impronta aggiunta"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Ora puoi usare l\'impronta per sbloccare il telefono o per verificare la tua identità, ad esempio per accedere alle app"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Utilizzo da parte del sistema nelle ultime 24 ore"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Utilizzo da parte del sistema per <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Utilizzo da parte delle app per <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"AM"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"PM"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Totale: meno di un minuto"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Background: meno di un minuto"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Totale: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Attiva l\'assistente tenendo premuto il tasto di accensione"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Menu accensione ed emergenze:\npremi contemporaneamente il tasto di accensione e il tasto alza il volume"</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Disattiva suoneria:\nscorciatoia disponibile nel menu del volume."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Durata pressione"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Regola la sensibilità scegliendo la durata della pressione del tasto di accensione"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Breve"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Lunga"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Mostra portafoglio"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Consenti l\'accesso al portafoglio dalla schermata di blocco e dalle impostazioni rapide"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Mostra controlli dei dispositivi"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Momentaneamente non disponibile"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nessuna SIM rilevata"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferenze di rete"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connetti a reti pubbliche"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"connessione rete, internet, wireless, dati, wifi, wi-fi, wi fi, cellulare, dispositivo mobile, operatore cellulare, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Attiva Wi‑Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Disattiva il Wi-Fi"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"Rete W+"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"SIM SCARICATA"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"SIM SCARICATE"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Attiva"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Non attiva"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" /Predefinita per: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Per tutte le app e tutti i servizi"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Impostazioni di gioco"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Viene attivata la scorciatoia del Pannello di gioco e non solo"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Indietro"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Avanti"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Anteprima colore"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Richiesta di accesso alla scheda SIM"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Un dispositivo vuole accedere alla tua scheda SIM. Tocca per conoscere i dettagli."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Consentire l\'accesso alla scheda SIM?"</string>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 22554f0..31a8fd3 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"בקובץ שמור (לקוח פעילות)"</item>
     <item msgid="8186970968968646288">"בקובץ שמור (ריק)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"‎@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"‎@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"‎@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"‎@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"‎@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"‎@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"כחול-ירקרק"</item>
+    <item msgid="7216413848731287689">"ציאן"</item>
     <item msgid="5661027589207588703">"כחול"</item>
-    <item msgid="3795787248113275442">"כחול כהה"</item>
+    <item msgid="1219738214736244749">"ירוק"</item>
     <item msgid="6331809026622602308">"סגול"</item>
     <item msgid="6390546163902724700">"ורוד"</item>
-    <item msgid="6618900408138432102">"אדום"</item>
+    <item msgid="6500473130620545980">"כתום"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"בני למעלה מ-30 ימים"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 4a29799..71a2d40 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -492,11 +492,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"ושוב…"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"עוקבים אחר הסמל של טביעת האצבע"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"יש להרים את האצבע ולגעת בחיישן עם חלקים שונים של האצבע לקבלת טביעת אצבע מלאה"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"לוחצים לחיצה ארוכה בכל פעם שסמל טביעת האצבע זז. כך יתועד חלק גדול יותר מהאצבע."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"מניחים את קצה האצבע על החיישן"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"בסוף מניחים את קצוות האצבע"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"מניחים צד אחד של האצבע על החיישן ומחזיקים. אחר כך עוברים לצד השני"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"כך יתועד חלק גדול יותר מהאצבע"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"לוחצים לחיצה ארוכה בכל פעם שסמל טביעת האצבע זז. כך טביעת האצבע תצולם במלואה."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"כך טביעת האצבע תצולם במלואה"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
@@ -2955,8 +2952,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"צריכת הסוללה של המערכת ב-24 השעות האחרונות"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"צריכת הסוללה על ידי המערכת במשך <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"צריכת הסוללה על ידי האפליקציה במשך <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"AM"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"PM"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"סה\"כ: פחות מדקה"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"ברקע: פחות מדקה"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"סה\"כ: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5580,6 +5575,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"‏כדי להפעיל את Assistant, לוחצים לחיצה ארוכה על לחצן ההפעלה"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"תפריט הפעלה וחירום:\nלוחצים על לחצן ההפעלה ועל הלחצן להגברת עוצמת הקול בו-זמנית."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"מניעת השמעה של צלצול:\nקיצור דרך זמין בתפריט עוצמת הקול."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"משך הלחיצה"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"כדי להתאים את מידת הרגישות, צריך לבחור את משך הלחיצה על לחצן ההפעלה."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"לחיצה קצרה"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"לחיצה ארוכה"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"הצגת הארנק"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"אישור גישה אל הארנק ממסך הנעילה ומההגדרות המהירות"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"הצגת פקדי המכשיר"</string>
@@ -5625,7 +5624,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"לא זמין באופן זמני"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"‏אין כרטיס SIM"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"העדפות רשת"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"חיבור לרשתות ציבוריות"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"‏חיבור לרשת, אינטרנט, אלחוטי, נתונים, Wi-Fi, wi-fi, wi fi, סלולרי, נייד, ספק סלולרי, 4g,‏ 3g,‏ 2g,‏ lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"‏הפעלת Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"‏כיבוי ה-Wi-Fi"</string>
@@ -5643,6 +5641,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"‏רשת +‏W"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"‏SIM שהורד"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"‏כרטיסי SIM שהורדת"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"פעיל"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"לא פעיל"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / ברירת המחדל של <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5720,6 +5719,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"לכל האפליקציות והשירותים"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"הגדרות משחקים"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"הפעלת הלחצן המהיר למרכז בקרת המשחקים, וכו\'"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"הקודם"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"הבא"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"תצוגה מקדימה של הצבע"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"‏בקשת גישה לכרטיס ה-SIM"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"‏מכשיר מבקש גישה לכרטיס SIM שלך. יש להקיש לקבלת פרטים."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"‏להעניק גישה לכרטיס ה-SIM?"</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 6184680..5120065 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"キャッシュ済み（アクティビティクライアント）"</item>
     <item msgid="8186970968968646288">"キャッシュ済み（空）"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"ティール"</item>
+    <item msgid="7216413848731287689">"シアン"</item>
     <item msgid="5661027589207588703">"ブルー"</item>
-    <item msgid="3795787248113275442">"インディゴ"</item>
+    <item msgid="1219738214736244749">"グリーン"</item>
     <item msgid="6331809026622602308">"パープル"</item>
     <item msgid="6390546163902724700">"ピンク"</item>
-    <item msgid="6618900408138432102">"レッド"</item>
+    <item msgid="6500473130620545980">"オレンジ"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 日以上経過"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index f0ff72e..162e880 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"もう一度"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"指紋アイコンに合わせて操作"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"指を何度か離して、あらゆる角度から指紋を登録します。"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"指紋アイコンの動きに合わせて長押ししてください。これで指紋を正しく登録できるようになります。"</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"指先をセンサーに当ててください"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"最後に指の縁の部分を当ててください"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"指紋をセンサーに当てて長押しし、指を離してから別の部分を当ててください"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"これで指紋を正しく登録できるようになります。"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"指紋アイコンの動きに合わせて長押ししてください。指紋全体を登録します。"</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"指紋全体を登録しています"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"指紋の登録中: <xliff:g id="PERCENTAGE">%d</xliff:g> パーセント"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"指紋の登録完了"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"指紋を使って、スマートフォンのロック解除や本人確認（アプリへのログインなど）を行えるようになりました"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"過去 24 時間のシステムのバッテリー使用量"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"<xliff:g id="SLOT">%s</xliff:g>のシステムのバッテリー使用量"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"<xliff:g id="SLOT">%s</xliff:g>のアプリのバッテリー使用量"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"午前"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"午後"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"合計: 1 分未満"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"バックグラウンド: 1 分未満"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"合計: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"電源ボタンを長押ししてアシスタントを呼び出します"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"電源ボタンと緊急通報のメニュー:\n電源ボタンと音量大ボタンを同時に押してください。"</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"着信音のミュート:\n音量メニューでショートカットを利用できます。"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"長押しの長さ"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"長さを選択して感度を調整し、電源ボタンを長押しします。"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"短い"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"長い"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"ウォレットを表示"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"ロック画面とクイック設定からウォレットへのアクセスを許可します"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"デバイス コントロールを表示"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"一時的に利用できません"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM なし"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"ネットワーク設定"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"パブリック ネットワークに接続する"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ネットワーク接続, インターネット, ワイヤレス, データ, wifi, Wi-Fi, ワイファイ, 携帯, モバイル, 携帯通信会社, 4G, 3G, 2G, LTE"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Wi-Fi を ON にする"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Wi-Fi を OFF にする"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ ネットワーク"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"ダウンロード型 SIM"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"ダウンロード型 SIM"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"有効"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"無効"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / <xliff:g id="ID_1">%1$s</xliff:g>のデフォルト"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"すべてのアプリとサービスにアクセスを許可する"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"ゲームの設定"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"ゲーム ダッシュボード ショートカットやその他の機能を有効にします"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"前へ"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"次へ"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"色のプレビュー"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM カードへのアクセスのリクエスト"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"デバイスが SIM カードにアクセスしようとしています。タップして詳細をご確認ください。"</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"SIM カードへのアクセスを許可しますか？"</string>
diff --git a/res/values-ka/arrays.xml b/res/values-ka/arrays.xml
index e8c0ee0..2f983af 100644
--- a/res/values-ka/arrays.xml
+++ b/res/values-ka/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"ქეშირებულია (აქტივობის კლიენტი)"</item>
     <item msgid="8186970968968646288">"ქეშირებული (ცარიელი)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"ზურმუხტისფერი"</item>
+    <item msgid="7216413848731287689">"ციანი"</item>
     <item msgid="5661027589207588703">"ლურჯი"</item>
-    <item msgid="3795787248113275442">"მუქი ლურჯი"</item>
+    <item msgid="1219738214736244749">"მწვანე"</item>
     <item msgid="6331809026622602308">"მეწამული"</item>
     <item msgid="6390546163902724700">"ვარდისფერი"</item>
-    <item msgid="6618900408138432102">"წითელი"</item>
+    <item msgid="6500473130620545980">"ნარინჯისფერი"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 დღეზე ძველი"</item>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 16adeab..7b5b607 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"კიდევ ერთხელ"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"მიჰყევით თითის ანაბეჭდის ხატულას"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"რამდენჯერმე აიღეთ და ისევ შეახეთ თითი სენსორს, რათა თქვენი თითის ანაბეჭდის ყველა ნაწილის დამატება შეძლოთ"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"ხანგრძლივად შეეხეთ ყოველ ჯერზე, როცა თითის ანაბეჭდის ხატულა ამოძრავდება. ეს ხელს შეუწყობს სრულყოფილი თითის ანაბეჭდის შექმნას."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"თითის წვერი დაადეთ სენსორს"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"ბოლოს, დაადეთ თითის კიდეები"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"დაადეთ თითის ერთი მხარე სენსორს და გააჩერეთ ცოტა ხნით, შემდეგ კი დაადეთ მეორე მხარე"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"ეს ხელს შეუწყობს სრულყოფილი თითის ანაბეჭდის შექმნას"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"ხანგრძლივად შეეხეთ ყოველ ჯერზე, როცა თითის ანაბეჭდის ხატულა ამოძრავდება. ეს თითის ანაბეჭდის სრულად აღბეჭდვაში დაგეხმარებათ."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"ეს დაგეხმარებათ თქვენი სრული თითის ანაბეჭდის აღბეჭდვაში"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"მიმდინარეობს თითის ანაბეჭდის რეგისტრაცია, <xliff:g id="PERCENTAGE">%d</xliff:g> პროცენტი"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"თითის ანაბეჭდი დამატებულია"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"ახლა უკვე შეგიძლიათ თითის ანაბეჭდით ტელეფონის განბლოკვა ან ვინაობის დადასტურება, როცა აპებში შედიხართ"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"სისტემის გამოყენება ბოლო 24 საათის მანძილზე"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"სისტემის გამოყენება შემდეგისთვის: <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"აპის გამოყენება შემდეგისთვის: <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"am"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"pm"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"სულ: წუთზე ნაკლები"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"ფონი: წუთზე ნაკლები"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"სულ: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"ასისტენტის გაშვება ჩართვის ღილაკზე ხანგრძლივად დაჭერით"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"ჩართვის და საგანგებო მენიუ:\nერთდროულად დააჭირეთ ჩართვას და ხმის აწევას."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"დარეკვის თავიდან აცილება:\nმალსახმობი ხმის სიმძლავრის მენიუშია."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"დაჭერის ხანგრძლივობა"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"დაარეგულირეთ მგრძნობიარობა იმის არჩევით, თუ რამდენი ხნით უნდა გეჭიროთ ჩართვის ღილაკი"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"ხანმოკლე"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"ხანგრძლივი"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"საფულის ჩვენება"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"დაუშვით საფულეზე წვდომა ჩაკეტილი ეკრანიდან და სწრაფი პარამეტრებიდან"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"მოწყობილობის მართვის საშუალებების ჩვენება"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"დროებით მიუწვდომელია"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM არ არის"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"ქსელის პარამეტრები"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"საჯარო ქსელებთან დაკავშირება"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ქსელთან კავშირი, ინტერნეტი, უსადენო, მონაცემები, wifi, wi-fi, wi fi, ფიჭური, მობილური, ფიჭური ოპერატორი, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Wi‑Fi-ს ჩართვა"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Wi-Fi-ს გამორთვა"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ ქსელი"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"ჩამოტვირთული SIM"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"ჩამოტვირთული SIM-ები"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"აქტიური"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"არააქტიური"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / ნაგულისხმევი <xliff:g id="ID_1">%1$s</xliff:g>-თვის"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"ყველა აპისა და სერვისისთვის"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"თამაშის პარამეტრები"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"თამაშების დაფის მალსახმობის ჩართვა და სხვა"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"წინა"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"შემდეგი"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"ფერის გადახედვა"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM ბარათზე წვდომის მოთხოვნა"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"მოწყობილობას სურს წვდომა თქვენს SIM ბარათზე. შეეხეთ დეტალების სანახავად."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"დაუშვებთ SIM ბარათზე წვდომას?"</string>
diff --git a/res/values-kk/arrays.xml b/res/values-kk/arrays.xml
index 5de2e8f..8097032 100644
--- a/res/values-kk/arrays.xml
+++ b/res/values-kk/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Кэштелген (белсенділік клиенті)"</item>
     <item msgid="8186970968968646288">"Кэштелген (бос)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Көкшіл жасыл"</item>
+    <item msgid="7216413848731287689">"Көк"</item>
     <item msgid="5661027589207588703">"Көк"</item>
-    <item msgid="3795787248113275442">"Индиго түсі"</item>
+    <item msgid="1219738214736244749">"Жасыл"</item>
     <item msgid="6331809026622602308">"Күлгін"</item>
     <item msgid="6390546163902724700">"Қызғылт"</item>
-    <item msgid="6618900408138432102">"Қызыл"</item>
+    <item msgid="6500473130620545980">"Қызғылт сары"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 күннен артық сақталған"</item>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index f3cbc38..aed276e 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -73,7 +73,7 @@
     <string name="bluetooth_device_name" msgid="1294669733490268384">"Құрылғы атауы"</string>
     <string name="bluetooth_device_details" msgid="630702184344217832">"Құрылғы параметрлері"</string>
     <string name="bluetooth_profile_details" msgid="1269419918127093325">"Профайл параметрлері"</string>
-    <string name="bluetooth_name_not_set" msgid="4654357917928126208">"Атау реттелмеген, аккаунт атауын қолдануда"</string>
+    <string name="bluetooth_name_not_set" msgid="4654357917928126208">"Атау реттелмеген, есептік жазба атауын қолдануда"</string>
     <string name="bluetooth_scan_for_devices" msgid="8143654526358934069">"Құрылғыларды скандау"</string>
     <string name="bluetooth_rename_device" msgid="4219655243836021443">"Осы құрылғының атауын өзгерту"</string>
     <string name="bluetooth_rename_button" msgid="9162500408570289545">"Атын өзгерту"</string>
@@ -165,7 +165,7 @@
     <string name="intent_sender_action_label" msgid="257853357827275530">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
     <string name="intent_sender_startactivity_text" msgid="519934560779343541">"<xliff:g id="ACTIVITY">activity</xliff:g> бастау"</string>
     <string name="intent_sender_resource_label" msgid="5087385727740280207">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
-    <string name="intent_sender_account_label" msgid="36614006839665458">"Аккаунт:"</string>
+    <string name="intent_sender_account_label" msgid="36614006839665458">"Есептік жазба:"</string>
     <string name="proxy_settings_title" msgid="4201866858226087066">"Прокси"</string>
     <string name="proxy_clear_text" msgid="6529658759984031149">"Өшіру"</string>
     <string name="proxy_port_label" msgid="4647357286461712574">"Прокси порты"</string>
@@ -294,7 +294,7 @@
     <string name="owner_info_settings_status" msgid="7488764871758677862">"<xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="owner_info_settings_edit_text_hint" msgid="841926875876050274">"Мысалы, Джоның Android құрылғысы."</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Бекіту экранында профайл ақпаратын көрсету"</string>
-    <string name="Accounts_settings_title" msgid="8434263183710375412">"Аккаунттар"</string>
+    <string name="Accounts_settings_title" msgid="8434263183710375412">"Есептік жазбалар"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Локация"</string>
     <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Локацияны пайдалану"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Өшірулі"</string>
@@ -306,7 +306,7 @@
     <string name="location_settings_footer_general" msgid="1040507068701188821">"Маңайдағы құрылғыларды пайдалану рұқсаты бар қолданбалар телефонға жалғанған құрылғылардың тиісті орнын анықтай алады."</string>
     <string name="location_settings_footer_location_off" msgid="8568995909147566720">"Қолданбалар мен қызметтер үшін локацияны пайдалану рұқсаты өшірулі. Сіз құтқару қызметінің нөміріне қоңырау шалған немесе мәтіндік хабар жіберген кезде, құрылғыңыздың локациясы бұрынғысынша құтқару қызметтеріне жіберілуі мүмкін."</string>
     <string name="location_settings_footer_learn_more_content_description" msgid="5329024810729665156">"Локация параметрлері туралы толығырақ ақпарат алыңыз."</string>
-    <string name="account_settings_title" msgid="9138880127246241885">"Аккаунттар"</string>
+    <string name="account_settings_title" msgid="9138880127246241885">"Есептік жазбалар"</string>
     <string name="security_settings_title" msgid="6710768415432791970">"Қауіпсіздік"</string>
     <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Шифрлау және тіркелу деректері"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Телефон шифрланған"</string>
@@ -389,8 +389,8 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="3498729789625461914">"Қолданбаларда бет тану функциясын пайдаланғанда, үнемі растау қадамын сұрау"</string>
     <string name="security_settings_face_settings_remove_face_model" msgid="812920481303980846">"Бет үлгісін жою"</string>
     <string name="security_settings_face_settings_enroll" msgid="3726313826693825029">"Бет тану функциясын реттеу"</string>
-    <string name="security_settings_face_settings_footer" msgid="625696606490947189">"Телефон құлпын ашу немесе қолданбаларда аутентификациядан өту (мысалы, аккаунтқа кіру немесе сатып алу транзакциясын растау кезінде) үшін бет үлгісін пайдаланыңыз.\n\nЕсіңізде болсын:\nбір уақытта тек бір бет үлгісін реттей аласыз. Басқа бет үлгісін қосу үшін сақталып тұрғанын жойыңыз.\n\nӘдейі істемесеңіз де, телефонға қараған кезде, оның құлпы ашылуы мүмкін.\n\nБасқа біреу телефоныңызды бетіңізге жақындатып ұстап тұрып та, оның құлпын аша алады.\n\nТелефон құлпын өзіңізге ұқсайтын біреу, мысалы, егіз бауырыңыз ашып алуы мүмкін."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="2071065435536235622">"Телефон құлпын ашу немесе қолданбаларда аутентификациядан өту (мысалы, аккаунтқа кіру немесе сатып алу транзакциясын растау кезінде) үшін бет үлгісін пайдаланыңыз.\n\nЕсіңізде болсын:\nбір уақытта тек бір бет үлгісін реттей аласыз. Басқа бет үлгісін қосу үшін сақталып тұрғанын жойыңыз.\n\nӘдейі істемесеңіз де, телефонға қараған кезде, оның құлпы ашылуы мүмкін.\n\nБасқа біреу телефоныңызды бетіңізге жақындатып ұстап тұрып та, оның құлпын аша алады (көзіңізді жұмып тұрсаңыз да).\n\nТелефон құлпын өзіңізге ұқсайтын біреу, мысалы, егіз бауырыңыз ашып алуы мүмкін."</string>
+    <string name="security_settings_face_settings_footer" msgid="625696606490947189">"Телефон құлпын ашу немесе қолданбаларда аутентификациядан өту (мысалы, есептік жазбаға кіру немесе сатып алу транзакциясын растау кезінде) үшін бет үлгісін пайдаланыңыз.\n\nЕсіңізде болсын:\nбір уақытта тек бір бет үлгісін реттей аласыз. Басқа бет үлгісін қосу үшін сақталып тұрғанын жойыңыз.\n\nӘдейі істемесеңіз де, телефонға қараған кезде, оның құлпы ашылуы мүмкін.\n\nБасқа біреу телефоныңызды бетіңізге жақындатып ұстап тұрып та, оның құлпын аша алады.\n\nТелефон құлпын өзіңізге ұқсайтын біреу, мысалы, егіз бауырыңыз ашып алуы мүмкін."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="2071065435536235622">"Телефон құлпын ашу немесе қолданбаларда аутентификациядан өту (мысалы, есептік жазбаға кіру немесе сатып алу транзакциясын растау кезінде) үшін бет үлгісін пайдаланыңыз.\n\nЕсіңізде болсын:\nбір уақытта тек бір бет үлгісін реттей аласыз. Басқа бет үлгісін қосу үшін сақталып тұрғанын жойыңыз.\n\nӘдейі істемесеңіз де, телефонға қараған кезде, оның құлпы ашылуы мүмкін.\n\nБасқа біреу телефоныңызды бетіңізге жақындатып ұстап тұрып та, оның құлпын аша алады (көзіңізді жұмып тұрсаңыз да).\n\nТелефон құлпын өзіңізге ұқсайтын біреу, мысалы, егіз бауырыңыз ашып алуы мүмкін."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2899669764446232715">"Бет үлгісін жою керек пе?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3268144215619385299">"Бет үлгіңіз біржола әрі қауіпсіз жойылады. Оны жойған соң, телефон құлпын ашу немесе қолданбаларда аутентификациялану үшін PIN кодын, өрнекті немесе құпия сөзді пайдалану керек болады."</string>
     <string name="security_settings_face_settings_remove_model_dialog_title" msgid="7175068449513875691">"Бет үлгісін жою керек пе?"</string>
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Тағы бір рет"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Саусақ ізі белгішесімен жұмыс істеу"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Саусақ ізінің басқа бөліктерін енгізу үшін саусағыңызды бір тигізіп, бір көтеріп тұрыңыз."</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Саусақ ізі белгішесі жылжыған кезде, оны түртіп ұстап тұрыңыз. Осы арқылы саусағыңыздың көп бөлігін қамтуға болады."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Саусағыңыздың ұшын датчикке қойыңыз"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Енді саусағыңыздың шеттерін тигізіңіз"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Саусақ ізінің бір жағын датчикке қойыңыз, сосын екінші жағына ауысыңыз."</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Осы арқылы саусағыңыздың көп бөлігін қамтуға болады."</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Саусақ ізі белгішесі жылжыған кезде, оны басып тұрыңыз. Бұл әрекет саусақ ізін толық суретке түсіруге көмектеседі."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Бұл әрекет саусақ ізін толық суретке түсіруге көмектеседі."</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Саусақ ізі тіркелуде: <xliff:g id="PERCENTAGE">%d</xliff:g> пайыз."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Саусақ ізі енгізілді"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Енді телефон құлпын ашу немесе жеке басыңызды растау үшін (мысалы, қолданбаларға кіргенде) саусақ ізін пайдалана аласыз."</string>
@@ -579,8 +576,8 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Планшетті кодтау"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Телефонды шифрлау"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Шифрланды"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Аккаунттарды, параметрлерді, жүктелген қолданбаларды және олардың деректерін, мультимедиа және басқа файлдарды шифрлауға болады. Планшетті шифрлағаннан кейін, экран құлпын (яғни өрнек немесе сандық PIN коды, я болмаса құпия сөз) орнатқан болсаңыз, қуатын қосқан сайын планшетті шифрлаудан шығару үшін экран құлпын ашу керек болады. Шифрлаудан шығарудың тағы бір жалғыз жолы – зауыттық деректерді қалпына келтіріп, бүкіл деректерді өшіру.\n\nШифрлауға бір сағат немесе одан көп уақыт кетеді. Зарядталған батареямен бастап, бүкіл процесте планшетті розеткаға қосулы ұстау керек. Процесті үзсеңіз, деректердің кейбір бөлігін немесе барлығын жоғалтасыз."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Аккаунттарды, параметрлерді, жүктелген қолданбаларды және олардың деректерін, мультимедиа және басқа файлдарды шифрлауға болады. Телефонды шифрлағаннан кейін, экран құлпын (яғни өрнек немесе сандық PIN коды, я болмаса құпия сөз) орнатқан болсаңыз, қуатын қосқан сайын телефонды шифрлаудан шығару үшін экран құлпын ашу керек болады. Шифрлаудан шығарудың тағы бір жалғыз жолы – зауыттық деректерді қалпына келтіріп, бүкіл деректерді өшіру.\n\nШифрлауға бір сағат немесе одан көп уақыт кетеді. Зарядталған батареямен бастап, бүкіл процесте телефонды розеткаға қосулы ұстау керек. Процесті үзсеңіз, деректердің кейбір бөлігін немесе барлығын жоғалтасыз."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Есептік жазбаларды, параметрлерді, жүктелген қолданбаларды және олардың деректерін, мультимедиа және басқа файлдарды шифрлауға болады. Планшетті шифрлағаннан кейін, экран құлпын (яғни өрнек немесе сандық PIN коды, я болмаса құпия сөз) орнатқан болсаңыз, қуатын қосқан сайын планшетті шифрлаудан шығару үшін экран құлпын ашу керек болады. Шифрлаудан шығарудың тағы бір жалғыз жолы – зауыттық деректерді қалпына келтіріп, бүкіл деректерді өшіру.\n\nШифрлауға бір сағат немесе одан көп уақыт кетеді. Зарядталған батареямен бастап, бүкіл процесте планшетті розеткаға қосулы ұстау керек. Процесті үзсеңіз, деректердің кейбір бөлігін немесе барлығын жоғалтасыз."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Есептік жазбаларды, параметрлерді, жүктелген қолданбаларды және олардың деректерін, мультимедиа және басқа файлдарды шифрлауға болады. Телефонды шифрлағаннан кейін, экран құлпын (яғни өрнек немесе сандық PIN коды, я болмаса құпия сөз) орнатқан болсаңыз, қуатын қосқан сайын телефонды шифрлаудан шығару үшін экран құлпын ашу керек болады. Шифрлаудан шығарудың тағы бір жалғыз жолы – зауыттық деректерді қалпына келтіріп, бүкіл деректерді өшіру.\n\nШифрлауға бір сағат немесе одан көп уақыт кетеді. Зарядталған батареямен бастап, бүкіл процесте телефонды розеткаға қосулы ұстау керек. Процесті үзсеңіз, деректердің кейбір бөлігін немесе барлығын жоғалтасыз."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Планшетті кодтау"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Телефонды шифрлау"</string>
     <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Батареяны зарядтап, қайта әрекеттеніңіз."</string>
@@ -864,7 +861,7 @@
     <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="3428463407231980054">"Планшет пен <xliff:g id="DEVICE_NAME">%1$s</xliff:g> байланысы ажырайды."</string>
     <string name="bluetooth_unpair_dialog_body" product="device" msgid="5117397433721336918">"Құрылғы мен <xliff:g id="DEVICE_NAME">%1$s</xliff:g> байланысы ажырайды."</string>
     <string name="bluetooth_companion_app_body" msgid="8442643629075687761">"<xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасы бұдан былай <xliff:g id="DEVICE_NAME">%2$s</xliff:g> құрылғысына жалғанбайды."</string>
-    <string name="bluetooth_untethered_unpair_dialog_body" msgid="1938465582242297905">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысы енді осы аккаунтқа байланыстырылған ешбір құрылғымен жұптаспайды."</string>
+    <string name="bluetooth_untethered_unpair_dialog_body" msgid="1938465582242297905">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысы енді осы есептік жазбаға байланыстырылған ешбір құрылғымен жұптаспайды."</string>
     <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="9184489424930549015">"Құрылғыны ұмыту"</string>
     <string name="bluetooth_companion_app_remove_association_confirm_button" msgid="76323555527926915">"Қолданбаны ажырату"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="1323072239637864488">"…қосылу"</string>
@@ -1290,11 +1287,11 @@
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8121670617316301768">"Телефонды қондырғыға енгізгенде немесе шығарғанда дыбысын ойнату"</string>
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="7833926726878567889">"Планшетті қондырғыға жалғағанда немесе алғанда дыбысын қосуға болмайды"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="5560601997128422001">"Телефонды қондырғыға енгізгенде немесе шығарғанда дыбысын ойнатпау"</string>
-    <string name="account_settings" msgid="255404935489127404">"Аккаунттар"</string>
+    <string name="account_settings" msgid="255404935489127404">"Есептік жазбалар"</string>
     <string name="accessibility_category_work" msgid="5133894487353964944">"Жұмыс профилінің есептік жазбалары - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="2228088849803484780">"Жеке профиль есептік жазбалары"</string>
     <string name="accessibility_work_account_title" msgid="7622485151217943839">"Жұмыс есептік жазбасы - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
-    <string name="accessibility_personal_account_title" msgid="8535265881509557013">"Жеке аккаунт - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
+    <string name="accessibility_personal_account_title" msgid="8535265881509557013">"Жеке есептік жазба - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="search_settings" msgid="7573686516434589771">"Іздеу"</string>
     <string name="display_settings" msgid="7197750639709493852">"Дисплей"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Экранды автоматты бұру"</string>
@@ -1750,7 +1747,7 @@
     <string name="main_clear_short_title" msgid="4752094765533020696">"Барлық деректерді өшіру (зауыттық параметрлерді қайтару)"</string>
     <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Планшетіңіздің "<b>"ішкі жадынан"</b>" барлық дерек өшеді, соның ішінде:\n\n"<li>"Google есептік жазбаңыз;"</li>\n<li>"жүйе мен қолданба деректері және параметрлері;"</li>\n<li>"жүктеп алынған қолданбалар."</li></string>
     <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Телефонның "<b>"ішкі жадынан"</b>" барлық дерек өшеді, соның ішінде:\n\n"<li>"Google есептік жазбаңыз;"</li>\n<li>"жүйе мен қолданба деректері және параметрлері;"</li>\n<li>"жүктеп алынған қолданбалар."</li></string>
-    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Сіз келесі аккаунттарға кірдіңіз:\n"</string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Сіз келесі есептік жазбаларға кірдіңіз:\n"</string>
     <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Бұл құрылғыны басқа да пайдаланушылар қолдана алады.\n"</string>
     <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"музыка;"</li>\n<li>"фотосуреттер;"</li>\n<li>"пайдаланушының басқа деректері."</li></string>
     <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM карталары"</li></string>
@@ -2092,7 +2089,7 @@
     <string name="internal_storage" msgid="999496851424448809">"Ішкі жад"</string>
     <string name="recompute_size" msgid="1098091228370999128">"Өлшемін қайта есептеуде…"</string>
     <string name="clear_data_dlg_title" msgid="180446967743732410">"Қолданба деректері жойылсын ба?"</string>
-    <string name="clear_data_dlg_text" msgid="7870723948123690332">"Бұл қолданбаның барлық дерегі біржола жойылады. Бұған барлық файл, параметр, аккаунт, дерекқор және т.б. кіреді."</string>
+    <string name="clear_data_dlg_text" msgid="7870723948123690332">"Бұл қолданбаның барлық дерегі біржола жойылады. Бұған барлық файл, параметр, есептік жазба, дерекқор және т.б. кіреді."</string>
     <string name="dlg_ok" msgid="1421350367857960997">"Жарайды"</string>
     <string name="dlg_cancel" msgid="5164705061530774899">"Бас тарту"</string>
     <string name="app_not_found_dlg_title" msgid="7122106240981109930"></string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Жүйенің соңғы 24 сағатта батарея зарядын пайдалануы"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Жүйенің <xliff:g id="SLOT">%s</xliff:g> пайдалануы"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Қолданбаның <xliff:g id="SLOT">%s</xliff:g> пайдалануы"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"түске дейін"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"түстен кейін"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Барлығы: бір минуттан аз"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Фондық режимде: бір минуттан аз"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Барлығы: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -2999,13 +2994,13 @@
     <string name="personal_data_section_title" msgid="6368610168625722682">"Жеке деректер"</string>
     <string name="backup_data_title" msgid="507663517227498525">"Деректердің сақтық көшірмесін жасау"</string>
     <string name="backup_data_summary" msgid="8054551085241427531">"Қолданба дерекқоры, Wi‑Fi кілтсөздері және басқа параметрлердің сақтық көшірмесін Google серверлеріне сақтаңыз"</string>
-    <string name="backup_configure_account_title" msgid="8574055186903658842">"Сақтық аккаунт"</string>
-    <string name="backup_data_management_title" msgid="6596830198441939702">"Сақтық көшірмеге арналған аккаунтты басқару"</string>
+    <string name="backup_configure_account_title" msgid="8574055186903658842">"Сақтық есептік жазба"</string>
+    <string name="backup_data_management_title" msgid="6596830198441939702">"Сақтық көшірмеге арналған есептік жазбаны басқару"</string>
     <string name="include_app_data_title" msgid="2969603876620594523">"Қолданба деректерін қамту"</string>
     <string name="auto_restore_title" msgid="4124345897936637561">"Aвтоматты қалпына келтіру"</string>
     <string name="auto_restore_summary" msgid="6830198851045584001">"Қолданбаны қайта орнатқанда, параметрлер және деректердің сақтық көшірмесін қалпына келтіру"</string>
     <string name="backup_inactive_title" msgid="6753265378043349277">"Сақтық көшірме жасау қызметі қосылмаған"</string>
-    <string name="backup_configure_account_default_summary" msgid="5323225330966306690">"Ешқандай аккаунт қазір сақтық көшірмесі жасалған деректерді сақтап жатқан жоқ"</string>
+    <string name="backup_configure_account_default_summary" msgid="5323225330966306690">"Ешқандай есептік жазба қазір сақтық көшірмесі жасалған деректерді сақтап жатқан жоқ"</string>
     <string name="backup_erase_dialog_title" msgid="5892431263348766484"></string>
     <string name="backup_erase_dialog_message" msgid="2250872501409574331">"Wi‑Fi құпия сөздері, бетбелгілер, басқа параметрлер мен қолданба деректерінің сақтық көшірмесін жасау процесі тоқтатылып, Google серверлеріндегі көшірмелер жойылсын ба?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"Құрылғы деректерінің (мысалы, Wi-Fi құпия сөзі және қоңырау журналы) және қолданба деректерінің (мысалы, қолданбалар сақтаған параметрлер мен файлдар) сақтық көшірмесін жасап, қашықтағы серверлерден барлық көшірмелерді өшіру керек пе?"</string>
@@ -3048,7 +3043,7 @@
     <string name="sync_active" msgid="5787407579281739975">"Синхрондау қосылған"</string>
     <string name="account_sync_settings_title" msgid="2684888109902800966">"Синхрондау"</string>
     <string name="sync_is_failing" msgid="6738004111400633331">"Синх мәселесі орын алуда. Біраз уақыттан кейін оралады."</string>
-    <string name="add_account_label" msgid="7134707140831385869">"Аккаунт қосу"</string>
+    <string name="add_account_label" msgid="7134707140831385869">"Есептік жазба қосу"</string>
     <string name="managed_profile_not_available_label" msgid="7500578232182547365">"Жұмыс профилі әлі қол жетімді емес"</string>
     <string name="work_mode_label" msgid="1001415270126064436">"Жұмыс профилі"</string>
     <string name="work_mode_on_summary" msgid="2042885311126239961">"Ұйым арқылы басқарылады"</string>
@@ -3077,13 +3072,13 @@
     <string name="header_application_sync_settings" msgid="7427706834875419243">"Қолданбаларды синхрондау параметрлері"</string>
     <string name="header_data_and_synchronization" msgid="453920312552838939">"Дерекқор және синхрондау"</string>
     <string name="preference_change_password_title" msgid="5465821666939825972">"Кілтсөзді өзгерту"</string>
-    <string name="header_account_settings" msgid="1189339410278750008">"Аккаунт параметрлері"</string>
-    <string name="remove_account_label" msgid="4169490568375358010">"Аккаунтты жою"</string>
-    <string name="header_add_an_account" msgid="3919151542338822661">"Аккаунт қосу"</string>
-    <string name="really_remove_account_title" msgid="253097435885652310">"Аккаунт жойылсын ба?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="8893801622174947887">"Бұл аккаунтты алып тастау нәтижесінде оның хабарлары, контактілері және басқа планшет деректері жойылады!"</string>
-    <string name="really_remove_account_message" product="default" msgid="1217810840427479274">"Бұл аккаунт жойылса, телефоннан барлық хабарлар, контактілер мен басқа деректер өшіріледі!"</string>
-    <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"Бұл аккаунт жойылса, құрылғыдағы барлық хабарлар, контактілер және басқа деректер қоса жойылады!"</string>
+    <string name="header_account_settings" msgid="1189339410278750008">"Есептік жазба параметрлері"</string>
+    <string name="remove_account_label" msgid="4169490568375358010">"Есептік жазбаны жою"</string>
+    <string name="header_add_an_account" msgid="3919151542338822661">"Есептік жазба қосу"</string>
+    <string name="really_remove_account_title" msgid="253097435885652310">"Есептік жазба жойылсын ба?"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="8893801622174947887">"Бұл есептік жазбаны алып тастау нәтижесінде оның хабарлары, контактілері және басқа планшет деректері жойылады!"</string>
+    <string name="really_remove_account_message" product="default" msgid="1217810840427479274">"Бұл есептік жазба жойылса, телефоннан барлық хабарлар, контактілер мен басқа деректер өшіріледі!"</string>
+    <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"Бұл есептік жазба жойылса, құрылғыдағы барлық хабарлар, контактілер және басқа деректер қоса жойылады!"</string>
     <string name="remove_account_failed" msgid="3709502163548900644">"Әкімші бұл өзгертуге рұқсат бермеген"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Қолмен синхрондау мүмкін болмады"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Бұл нысан үшін синхрондау уақытша өшірілген. Бұл параметрді өзгерту үшін артқы шеп деректері мен автоматты сихнрондауды уақытша қосыңыз."</string>
@@ -3156,10 +3151,10 @@
     <string name="data_usage_app_restrict_dialog" msgid="5534272311979978297">"Ұял желілер ғана қол жетімді болғанда бұл функция жалпы ақпаратқа тәуелді қолданбалардың жұмысын тоқтатады.\n\nДерекқорды дұрыс қолдануды басқарудың басқа мүмкіндіктерін қолданбаның параметрлері арқылы табуға болады."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="8599940395497268584">"Мобильдік деректер шегі белгіленген кезде ғана фондық деректерді шектеуге болады."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2048411447974361181">"Автосихрондау қосылсын ба?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="6387714350903085918">"Cіз интернетте аккаунттарыңызға енгізген кез келген өзгертулер планшетіңізге автоматты түрде көшіріледі.\n\nСондай-ақ, кейбір аккаунттар сіз планшетте енгізген кез келген өзгертулерді интернетке көшіре алады. Google есептік жазбасы осылай жұмыс істейді."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="6457107552266187107">"Cіз интернетте аккаунттарыңызға енгізген кез келген өзгертулер телефоныңызға автоматты түрде көшіріледі.\n\nСондай-ақ, кейбір аккаунттар сіз телефонда енгізген кез келген өзгертулерді интернетке көшіре алады. Google есептік жазбасы осылай жұмыс істейді."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="6387714350903085918">"Cіз интернетте есептік жазбаларыңызға енгізген кез келген өзгертулер планшетіңізге автоматты түрде көшіріледі.\n\nСондай-ақ, кейбір есептік жазбалар сіз планшетте енгізген кез келген өзгертулерді интернетке көшіре алады. Google есептік жазбасы осылай жұмыс істейді."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="6457107552266187107">"Cіз интернетте есептік жазбаларыңызға енгізген кез келген өзгертулер телефоныңызға автоматты түрде көшіріледі.\n\nСондай-ақ, кейбір есептік жазбалар сіз телефонда енгізген кез келген өзгертулерді интернетке көшіре алады. Google есептік жазбасы осылай жұмыс істейді."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="1783917145440587470">"Автосинхрондау өшірілсін бе?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="6523112583569674837">"Бұл трафик пен батарея зарядын үнемдейді, бірақ соңғы ақпаратты жинау үшін әр аккаунтты қолмен синхрондау қажет болады. Сондай-ақ жаңартулар шыққанда, хабарландыру жіберілмейді."</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="6523112583569674837">"Бұл трафик пен батарея зарядын үнемдейді, бірақ соңғы ақпаратты жинау үшін әр есептік жазбаны қолмен синхрондау қажет болады. Сондай-ақ жаңартулар шыққанда, хабарландыру жіберілмейді."</string>
     <string name="data_usage_cycle_editor_title" msgid="2019035830921480941">"Статистиканы жаңадан бастау күні"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="1026234456777365545">"Әр айдың күні:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="6110165528024717527">"Орнату"</string>
@@ -3208,7 +3203,7 @@
     <string name="vpn_routes" msgid="1218707725375594862">"Басқалай жіберу жолдары (мысалы, 10.0.0.0/8)"</string>
     <string name="vpn_username" msgid="8671768183475960068">"Пайдаланушы аты"</string>
     <string name="vpn_password" msgid="1183746907642628127">"Құпия сөз"</string>
-    <string name="vpn_save_login" msgid="5986762519977472618">"Аккаунт ақпаратын сақтау"</string>
+    <string name="vpn_save_login" msgid="5986762519977472618">"Есептік жазба ақпаратын сақтау"</string>
     <string name="vpn_not_used" msgid="7229312881336083354">"(қолданылмайды)"</string>
     <string name="vpn_no_ca_cert" msgid="3687379414088677735">"(серверді растамау)"</string>
     <string name="vpn_no_server_cert" msgid="8106540968643125407">"(серверден алынды)"</string>
@@ -3303,8 +3298,8 @@
       <item quantity="one">Сертификатқа құлбелгі қою</item>
     </plurals>
     <string name="user_settings_title" msgid="6550866465409807877">"Бірнеше пайдаланушы"</string>
-    <string name="user_settings_footer_text" product="device" msgid="7523914344521302179">"Жаңа пайдаланушыларды енгізу арқылы құрылғыны ортақ пайдаланыңыз. Әр пайдаланушының құрылғыда арнаулы негізгі экрандар, аккаунттар, қолданбалар, параметрлер, т.б. үшін жеке профилі болады."</string>
-    <string name="user_settings_footer_text" product="tablet" msgid="3730074318510244552">"Жаңа пайдаланушыларды енгізу арқылы планшетті ортақ пайдаланыңыз. Әр пайдаланушының планшетте арнаулы негізгі экрандар, аккаунттар, қолданбалар, параметрлер, т.б. үшін жеке профилі болады."</string>
+    <string name="user_settings_footer_text" product="device" msgid="7523914344521302179">"Жаңа пайдаланушыларды енгізу арқылы құрылғыны ортақ пайдаланыңыз. Әр пайдаланушының құрылғыда арнаулы негізгі экрандар, есептік жазбалар, қолданбалар, параметрлер, т.б. үшін жеке профилі болады."</string>
+    <string name="user_settings_footer_text" product="tablet" msgid="3730074318510244552">"Жаңа пайдаланушыларды енгізу арқылы планшетті ортақ пайдаланыңыз. Әр пайдаланушының планшетте арнаулы негізгі экрандар, есептік жазбалар, қолданбалар, параметрлер, т.б. үшін жеке профилі болады."</string>
     <string name="user_settings_footer_text" product="default" msgid="4420915712050349125">"Басқа пайдаланушыларды қосу арқылы телефонды бөлісіп пайдалануға болады. Әр пайдаланушының өз негізгі экраны, есептік жазбалары, қолданбалары, параметрлері, т.б. үшін жеке профилі болады."</string>
     <string name="user_list_title" msgid="1387379079186123404">"Пайдаланушылар мен профайлдар"</string>
     <string name="user_add_user_or_profile_menu" msgid="305851380425838287">"Пайдаланушы немесе профиль қосу"</string>
@@ -3318,7 +3313,7 @@
     <string name="user_add_max_count" msgid="5739771048517070983">"<xliff:g id="USER_COUNT">%1$d</xliff:g> пайдаланушыға дейін қоса аласыз"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Планшет иесі ғана пайдаланушыларды басқара алады."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Телефон иесі ғана пайдаланушыларды басқара алады."</string>
-    <string name="user_cannot_add_accounts_message" msgid="2351326078338805337">"Шектелген профайлдардың аккаунт қосу мүмкіндігі жоқ"</string>
+    <string name="user_cannot_add_accounts_message" msgid="2351326078338805337">"Шектелген профайлдардың есептік жазба қосу мүмкіндігі жоқ"</string>
     <string name="user_remove_user_menu" msgid="2183714948094429367">"<xliff:g id="USER_NAME">%1$s</xliff:g> осы құралдан жою"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Құлып экранының параметрлері"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Құлыптаулы экраннан пайдаланушыларды қосу"</string>
@@ -3378,7 +3373,7 @@
     <string name="restriction_menu_change_pin" msgid="2505923323199003718">"PIN кодты өзгерту"</string>
     <string name="help_label" msgid="2896538416436125883">"Анықтама және пікір"</string>
     <string name="support_summary" msgid="6137136608018134563">"Анықтамалық мақалалар, телефон және чат"</string>
-    <string name="user_account_title" msgid="6389636876210834864">"Мазмұнға арналған аккаунт"</string>
+    <string name="user_account_title" msgid="6389636876210834864">"Мазмұнға арналған есептік жазба"</string>
     <string name="user_picture_title" msgid="7176437495107563321">"Фотосуретті ЖА"</string>
     <string name="extreme_threats_title" msgid="1098958631519213856">"Үлкен қауіптер"</string>
     <string name="extreme_threats_summary" msgid="3560742429496902008">"Өмірге және мүлікке төнген үлкен қауіптер туралы дабылдар алу"</string>
@@ -3499,8 +3494,8 @@
     <string name="app_and_notification_dashboard_title" msgid="2861781687031832943">"Қолданбалар мен хабарландырулар"</string>
     <string name="app_and_notification_dashboard_summary" msgid="8047683010984186106">"Соңғы қолданбалар, әдепкі қолданбалар"</string>
     <string name="notification_settings_work_profile" msgid="6076211850526353975">"Жұмыс профиліндегі қолданбалар үшін хабарландырулар қолжетімді емес."</string>
-    <string name="account_dashboard_title" msgid="8228773251948253914">"Құпия сөздер және аккаунттар"</string>
-    <string name="account_dashboard_default_summary" msgid="1730719656099599488">"Сақталған құпия сөздер, автотолтыру, синхрондалған аккаунттар"</string>
+    <string name="account_dashboard_title" msgid="8228773251948253914">"Құпия сөздер және есептік жазбалар"</string>
+    <string name="account_dashboard_default_summary" msgid="1730719656099599488">"Сақталған құпия сөздер, автотолтыру, синхрондалған есептік жазбалар"</string>
     <string name="app_default_dashboard_title" msgid="4071015747629103216">"Әдепкі қолданбалар"</string>
     <string name="system_dashboard_summary" msgid="7400745270362833832">"Тілдер, қимылдар, уақыт, cақтық көшірмелер"</string>
     <string name="search_results_title" msgid="3360639917793022533">"Параметрлер"</string>
@@ -3540,7 +3535,7 @@
     <string name="keywords_sounds_and_notifications_interruptions" msgid="1500312884808362467">"мазаламау үзу, үзу, үзіліс"</string>
     <string name="keywords_app" msgid="7983814237980258061">"ЖЖҚ"</string>
     <string name="keywords_location" msgid="8016374808099706213">"маңай, орын, тарих, есеп жіберу, GPS"</string>
-    <string name="keywords_accounts" msgid="3482052586502133909">"аккаунт, аккаунтны енгізу, жұмыс профилі, аккаунтны енгізу"</string>
+    <string name="keywords_accounts" msgid="3482052586502133909">"есептік жазба, есептік жазбаны енгізу, жұмыс профилі, есептік жазбаны енгізу"</string>
     <string name="keywords_users" msgid="3497517660077620843">"шектеу, шектелген"</string>
     <string name="keywords_keyboard_and_ime" msgid="4741098648730042570">"мәтінді түзету, түзету, дыбыс, дірілдету, авто, тіл, қимыл, ұсыну, ұсыныс, тақырып, тіл тигізетін, сөз, түрі, эмоджи, халықаралық"</string>
     <string name="keywords_reset_apps" msgid="8254315757754930862">"ысыру, параметрлер, әдепкі"</string>
@@ -4897,7 +4892,7 @@
     <string name="auto_sync_personal_account_title" msgid="3544275021920818595">"Жеке деректерді автоматты түрде синхрондау"</string>
     <string name="auto_sync_work_account_title" msgid="6060310415978781885">"Жұмыс деректерін автоматты түрде синхрондау"</string>
     <string name="auto_sync_account_summary" msgid="7580352130028957346">"Қолданбалардың деректерді автоматты жаңартуына рұқсат беру"</string>
-    <string name="account_sync_title" msgid="7036067017433297574">"Аккаунтты синхрондау"</string>
+    <string name="account_sync_title" msgid="7036067017433297574">"Есептік жазбаны синхрондау"</string>
     <string name="account_sync_summary_some_on" msgid="911460286297968724">"<xliff:g id="ID_2">%2$d</xliff:g> / <xliff:g id="ID_1">%1$d</xliff:g> элемент үшін синхрондау қосулы"</string>
     <string name="account_sync_summary_all_on" msgid="2953682111836599841">"Барлық элемент үшін синхрондау қосулы"</string>
     <string name="account_sync_summary_all_off" msgid="6378301874540507884">"Барлық элемент үшін синхрондау өшірулі"</string>
@@ -5076,7 +5071,7 @@
     <string name="disabled_for_user_setting_summary" msgid="9096036019081828639">"Бұл пайдаланушы параметрді өзгерте алмайды"</string>
     <string name="disabled_dependent_setting_summary" msgid="4508635725315852504">"Басқа параметрге тәуелді"</string>
     <string name="unknown_unavailability_setting_summary" msgid="9060213910510360231">"Параметр қолжетімді емес"</string>
-    <string name="my_device_info_account_preference_title" msgid="9197139254007133175">"Аккаунт"</string>
+    <string name="my_device_info_account_preference_title" msgid="9197139254007133175">"Есептік жазба"</string>
     <string name="my_device_info_device_name_preference_title" msgid="8053298498727237971">"Құрылғы атауы"</string>
     <string name="my_device_info_basic_info_category_title" msgid="381963187269356548">"Негізгі ақпарат"</string>
     <string name="my_device_info_legal_category_title" msgid="7732792841537995127">"Құқық және ережелер туралы ақпарат"</string>
@@ -5324,7 +5319,7 @@
     <string name="hwui_force_dark_title" msgid="4256904905631994219">"Қараңғылауға жол бермеу"</string>
     <string name="hwui_force_dark_summary" msgid="6515748781487952769">"Қараңғы тақырыпты мәжбүрлеп қойғанда, \"Әрдайым қосулы\" мәніне өзгертеді."</string>
     <string name="privacy_dashboard_title" msgid="6845403825611829558">"Құпиялылық"</string>
-    <string name="privacy_dashboard_summary" msgid="5775090172422786808">"Рұқсаттар, аккаунт әрекеттері, жеке деректер"</string>
+    <string name="privacy_dashboard_summary" msgid="5775090172422786808">"Рұқсаттар, есептік жазба әрекеттері, жеке деректер"</string>
     <string name="contextual_card_dismiss_remove" msgid="8636557343011606722">"Өшіру"</string>
     <string name="contextual_card_dismiss_keep" msgid="440516181066490747">"Сақтау"</string>
     <string name="contextual_card_dismiss_confirm_message" msgid="6434344989238055188">"Ұсыныс өшірілсін бе?"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Assistant-ті қуат түймесін басып тұру арқылы іске қосыңыз."</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Қуат және төтенше жағдай мәзірі:\nҚуат түймесі мен дыбысты арттыру түймесін бір уақытта басыңыз."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Қоңырау дыбысын өшіру:\nДыбыс деңгейі мәзірінде таңбаша бар."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Басып тұру ұзақтығы"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Қуат түймесін қаншалықты ұзақ басып тұру қажеттігін таңдау арқылы сезгіштікті реттеңіз."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Қысқа"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Ұзақ"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Әмиянды көрсету"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Құлыптаулы экран мен жылдам параметрлерден әмиянды пайдалануға рұқсат беру"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Құрылғыны басқару элементтерін көрсету"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Уақытша қолжетімді емес"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM картасы жоқ"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Желі параметрлері"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Қоғамдық жерлердегі желілерге қосылу"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"желі байланысы, интернет, сымсыз байланыс, деректер, wifi, Wi-Fi, Wi Fi, ұялы, мобильдік, ұялы байланыс операторы, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Wi‑Fi желісін қосу"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Wi-Fi желісін өшіру"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ желісі"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"ЖҮКТЕП АЛЫНҒАН SIM"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"ЖҮКТЕП АЛЫНҒАН SIM КАРТАЛАРЫ"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Қосулы"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Өшірулі"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" /<xliff:g id="ID_1">%1$s</xliff:g> үшін әдепкі"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Барлық қолданба мен қызмет үшін"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Ойын параметрлері"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Ойын тақтасының таңбашасын қосу және т.б."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Алдыңғы"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Келесі"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Түсті алдын ала қарау"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM картасын пайдалануға рұқсат сұрау"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Құрылғы SIM картаңызды пайдалануға рұқсат сұрайды. Толық мәлімет алу үшін түртіңіз."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"SIM картасын пайдалануға рұқсат берілсін бе?"</string>
diff --git a/res/values-km/arrays.xml b/res/values-km/arrays.xml
index e8f4e4a..0dbb161 100644
--- a/res/values-km/arrays.xml
+++ b/res/values-km/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"ទុក​ក្នុង​ឃ្លាំង​សម្ងាត់ (ម៉ាស៊ីន​​កូន​សកម្មភាព​)"</item>
     <item msgid="8186970968968646288">"ទុក​ក្នុង​ឃ្លាំង​សម្ងាត់ (ទទេ​)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"បៃតង​​ចាស់"</item>
+    <item msgid="7216413848731287689">"ស៊ីលៀប"</item>
     <item msgid="5661027589207588703">"ពណ៌ខៀវ"</item>
-    <item msgid="3795787248113275442">"ទឹកប៊ិក"</item>
+    <item msgid="1219738214736244749">"បៃតង"</item>
     <item msgid="6331809026622602308">"ពណ៍ស្វាយ"</item>
     <item msgid="6390546163902724700">"ផ្កាឈូក"</item>
-    <item msgid="6618900408138432102">"ពណ៌ក្រហម"</item>
+    <item msgid="6500473130620545980">"ទឹកក្រូច"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"លើសពី 30 ថ្ងៃ"</item>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 51b8136..e273c84 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"ម្ដងទៀត"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"ដាក់ម្រាមដៃលើ​រូបស្នាមម្រាមដៃ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"បន្តលើកម្រាមដៃឡើង ដើម្បីបញ្ចូលផ្នែកផ្សេងទៀតនៃស្នាមម្រាមដៃរបស់អ្នក"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"ចុចឱ្យជាប់ រាល់ពេលដែល​រូបស្នាមម្រាមដៃ​មានចលនា។ ការធ្វើបែបនេះ​ជួយថតស្នាមម្រាមដៃ​របស់អ្នក​បានកាន់តែច្រើន។"</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"ដាក់ចុងម្រាមដៃ​របស់អ្នក​នៅលើឧបករណ៍​ចាប់សញ្ញា"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"ជាចុងក្រោយ ដាក់គែម​ម្រាមដៃ​របស់អ្នក"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"ដាក់​ផ្នែកចំហៀង​នៃស្នាមម្រាមដៃ​របស់អ្នក​នៅលើ​ឧបករណ៍​ចាប់សញ្ញា​ឱ្យជាប់ រួចប្ដូរទៅ​ផ្នែកម្ខាងទៀត"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"ការធ្វើបែបនេះ​ជួយថតស្នាមម្រាមដៃ​របស់អ្នក​បានកាន់តែច្រើន"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"ចុចឱ្យជាប់​រាល់ពេលដែល​រូបស្នាមម្រាមដៃ​ផ្លាស់ទី។ ការធ្វើបែបនេះ​ជួយថតស្នាមម្រាមដៃ​របស់អ្នក​ពេញលេញ។"</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"ការធ្វើបែបនេះជួយថតស្នាមម្រាមដៃរបស់អ្នកពេញលេញ"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"កំពុងចុះឈ្មោះ​ស្នាមម្រាមដៃ <xliff:g id="PERCENTAGE">%d</xliff:g> ភាគរយ"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"បានបញ្ចូល​ស្នាមម្រាមដៃ​រួចហើយ"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"ឥឡូវនេះ អ្នកអាចប្រើ​ស្នាមម្រាមដៃ​របស់អ្នក ដើម្បីដោះសោ​ទូរសព្ទរបស់អ្នក ឬផ្ទៀងផ្ទាត់ថាជាអ្នកដូចជា នៅពេលអ្នក​ចូលកម្មវិធីជាដើម"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"ការប្រើប្រាស់ប្រព័ន្ធក្នុងរយៈពេល 24 ម៉ោងចុងក្រោយ"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"ការប្រើប្រាស់កម្មវិធីក្នុងរយៈពេល <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"ការប្រើប្រាស់កម្មវិធីក្នុងរយៈពេល <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"am"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"pm"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"សរុប៖ តិចជាងមួយនាទី"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"ផ្ទៃខាងក្រោយ៖ តិចជាងមួយនាទី"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"សរុប៖ <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"បើកដំណើរការ​ជំនួយការ​ដោយចុច​ប៊ូតុងថាមពលឱ្យជាប់"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"ម៉ឺនុយថាមពល និងពេលមានអាសន្ន៖\nចុចប៊ូតុងថាមពល និងដំឡើងកម្រិត​សំឡេងក្នុងពេលតែមួយ។"</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"ទប់ស្កាត់ការរោទ៍៖\nអាចប្រើផ្លូវកាត់បាន​នៅក្នុងម៉ឺនុយ​កម្រិតសំឡេង។"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"រយៈពេល​ចុចឱ្យជាប់"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"កែតម្រូវកម្រិតពន្លឺ​ដោយជ្រើសរើស​រយៈពេលដែលត្រូវ​ចុចប៊ូតុងថាមពលឱ្យជាប់"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"ខ្លី"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"វែង"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"បង្ហាញកាបូប"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"អនុញ្ញាតឱ្យចូលប្រើ​កាបូបពីអេក្រង់​ចាក់សោ និងការកំណត់រហ័ស"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"បង្ហាញ​ផ្ទាំងគ្រប់គ្រង​ឧបករណ៍"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"មិន​អាច​ប្រើ​បាន​ជា​បណ្ដោះអាសន្ន​"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"មិនមានស៊ីមទេ"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"ចំណូលចិត្ត​បណ្តាញ"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ភ្ជាប់ជាមួយ​បណ្ដាញសាធារណៈ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ការតភ្ជាប់បណ្ដាញ, អ៊ីនធឺណិត, ឥតខ្សែ, ទិន្នន័យ, wifi, wi-fi, wi fi, បណ្ដាញចល័ត, ឧបករណ៍​ចល័ត, ក្រុមហ៊ុន​សេវាទូរសព្ទចល័ត, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"បើក Wi‑Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"បិទ Wi-Fi"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"បណ្ដាញ W+"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"ស៊ីម"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"ស៊ីម​ដែលបានទាញយក"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"ស៊ីមដែលបានទាញយក"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"សកម្ម"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"អសកម្ម​"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / លំនាំដើម​សម្រាប់ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"សម្រាប់កម្មវិធី និងសេវាកម្មទាំងអស់"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"ការកំណត់​ហ្គេម"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"បើក​ផ្លូវកាត់ផ្ទាំងគ្រប់គ្រងហ្គេម ។ល។"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"មុន"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"បន្ទាប់"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"ការមើល​ពណ៌សាកល្បង"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"សំណើ​ចូលប្រើ​ស៊ីមកាត"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"មានឧបករណ៍មួយចង់​ចូលប្រើ​ស៊ីមកាត​របស់អ្នក។ សូមចុច ដើម្បី​មើល​ព័ត៌មាន​លម្អិត។"</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"អនុញ្ញាតឱ្យ​ចូលប្រើ​ស៊ីមកាតឬ?"</string>
diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml
index 335084b..31c4b4d 100644
--- a/res/values-kn/arrays.xml
+++ b/res/values-kn/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"ಕ್ಯಾಶ್ ಮಾಡಲಾದ (ಚಟುವಟಿಕೆ ಕ್ಲೈಂಟ್)"</item>
     <item msgid="8186970968968646288">"ಕ್ಯಾಶ್ ಮಾಡಲಾಗಿದೆ (ಖಾಲಿ)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"ಗಾಢ ಹಸಿರು-ನೀಲಿ"</item>
+    <item msgid="7216413848731287689">"ಸಯನ್"</item>
     <item msgid="5661027589207588703">"ನೀಲಿ"</item>
-    <item msgid="3795787248113275442">"ಊದಾ"</item>
+    <item msgid="1219738214736244749">"ಹಸಿರು"</item>
     <item msgid="6331809026622602308">"ನೇರಳೆ"</item>
     <item msgid="6390546163902724700">"ಗುಲಾಬಿ ಬಣ್ಣ"</item>
-    <item msgid="6618900408138432102">"ಕೆಂಪು"</item>
+    <item msgid="6500473130620545980">"ಕಿತ್ತಳೆ"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 ದಿನಗಳಿಗಿಂತಲೂ ಹಳೆಯದು"</item>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 3e7dd23..c86b38a 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"ಮತ್ತೊಂದು ಬಾರಿ ಹೇಳಿ"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"ಫಿಂಗರ್‌ ಪ್ರಿಂಟ್ ಐಕಾನ್ ಅನ್ನು ಫಾಲೋ ಮಾಡಿ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ನ ವಿವಿಧ ಭಾಗಗಳನ್ನು ಸೇರಿಸಲು ನಿಮ್ಮ ಬೆರಳನ್ನು ಎತ್ತುತ್ತಲಿರಿ"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"ಫಿಂಗರ್‌ ಪ್ರಿಂಟ್ ಐಕಾನ್ ಸರಿಸಿದ ಪ್ರತಿಬಾರಿಯೂ ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಹಿಡಿದುಕೊಳ್ಳಿ. ಇದು ನಿಮ್ಮ ಫಿಂಗರ್‌ ಪ್ರಿಂಟ್ ಕುರಿತು ಇನ್ನಷ್ಟು ಮಾಹಿತಿಯನ್ನು ಕ್ಯಾಪ್ಚರ್ ಮಾಡಲು ಸಹಾಯ ಮಾಡುತ್ತದೆ."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"ಸೆನ್ಸರ್ ಮೇಲೆ ನಿಮ್ಮ ಬೆರಳ ತುದಿಯನ್ನು ಇರಿಸಿ"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"ಅಂತಿಮವಾಗಿ, ನಿಮ್ಮ ಬೆರಳ ತುದಿಗಳನ್ನು ಇರಿಸಿ"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"ಸೆನ್ಸರ್ ಮೇಲೆ ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ನ ಒಂದು ಬದಿಯನ್ನು ಇರಿಸಿ ಮತ್ತು ಹಿಡಿದುಕೊಳ್ಳಿ, ನಂತರ ಇನ್ನೊಂದು ಬದಿಗೆ ಬದಲಿಸಿ"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"ಇದು ನಿಮ್ಮ ಫಿಂಗರ್‌ ಪ್ರಿಂಟ್ ಕುರಿತು ಇನ್ನಷ್ಟು ಮಾಹಿತಿಯನ್ನು ಕ್ಯಾಪ್ಚರ್ ಮಾಡಲು ಸಹಾಯ ಮಾಡುತ್ತದೆ"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"ಫಿಂಗರ್‌ ಪ್ರಿಂಟ್ ಐಕಾನ್ ಸರಿಸಿದ ಪ್ರತಿಬಾರಿಯೂ ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಹಿಡಿದುಕೊಳ್ಳಿ. ಇದು ನಿಮ್ಮ ಪೂರ್ಣ ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಅನ್ನು ಕ್ಯಾಪ್ಚರ್ ಮಾಡಲು ಸಹಾಯ ಮಾಡುತ್ತದೆ"</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"ಇದು ನಿಮ್ಮ ಪೂರ್ಣ ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಅನ್ನು ಕ್ಯಾಪ್ಚರ್ ಮಾಡಲು ಸಹಾಯ ಮಾಡುತ್ತದೆ"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ನೋಂದಣಿ ಶೇಕಡಾ <xliff:g id="PERCENTAGE">%d</xliff:g> ಆಗಿದೆ"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೇರಿಸಲಾಗಿದೆ"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"ನೀವು ಆ್ಯಪ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡುವಂತೆಯೇ, ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಅಥವಾ ನೀವು ಎಂದು ದೃಢೀಕರಿಸಲು ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಅನ್ನು ನೀವು ಬಳಸಬಹುದು"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"ಕಳೆದ 24 ಗಂಟೆಗಳಲ್ಲಿನ ಸಿಸ್ಟಂ ಬಳಕೆ"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"<xliff:g id="SLOT">%s</xliff:g> ಗಾಗಿ ಸಿಸ್ಟಂ ಬಳಕೆ"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"<xliff:g id="SLOT">%s</xliff:g> ಗಾಗಿ ಆ್ಯಪ್ ಬಳಕೆ"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"am"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"pm"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"ಒಟ್ಟು: ಒಂದು ನಿಮಿಷಕ್ಕಿಂತ ಕಡಿಮೆ"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"ಹಿನ್ನೆಲೆ: ಒಂದು ನಿಮಿಷಕ್ಕಿಂತ ಕಡಿಮೆ"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"ಒಟ್ಟು: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"ಪವರ್ ಬಟನ್ ಹಿಡಿದಿಟ್ಟುಕೊಳ್ಳುವ ಮೂಲಕ Assistant ಅನ್ನು ಬಳಸಿ"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"ಪವರ್ ಮತ್ತು ತುರ್ತು ಮೆನು:\nಪವರ್ ಮತ್ತು ವಾಲ್ಯೂಮ್ ಬಟನ್ ಅನ್ನು ಒಟ್ಟಿಗೆ ಒತ್ತಿರಿ."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"ರಿಂಗ್ ಆಗುವುದನ್ನು ತಡೆಯಿರಿ:\nವಾಲ್ಯೂಮ್ ಮೆನುವಿನಲ್ಲಿ ಶಾರ್ಟ್‌ಕಟ್ ಲಭ್ಯವಿದೆ."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"ಒತ್ತಿ ಹಿಡಿಯುವ ಅವಧಿ"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"ಪವರ್ ಬಟನ್ ಅನ್ನು ಎಷ್ಟು ಹೊತ್ತು ಒತ್ತಿ ಹಿಡಿಯಬೇಕು ಎಂಬುದನ್ನು ಆಯ್ಕೆ ಮಾಡುವ ಮೂಲಕ ಸೂಕ್ಷ್ಮತೆಯನ್ನು ಸರಿಹೊಂದಿಸಿ"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"ಚಿಕ್ಕದು"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"ದೀರ್ಘ"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"ವಾಲೆಟ್ ತೋರಿಸಿ"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"ಲಾಕ್ ಸ್ಕ್ರೀನ್ ಮತ್ತು ತ್ವರಿತ ಸೆಟ್ಟಿಂಗ್‍ಗಳ ಮೂಲಕ ವಾಲೆಟ್ ಅನ್ನು ಪ್ರವೇಶಿಸಲು ಅನುಮತಿಸಿ."</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"ಸಾಧನ ನಿಯಂತ್ರಣಗಳನ್ನು ತೋರಿಸಿ"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"ತಾತ್ಕಾಲಿಕವಾಗಿ ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"ಯಾವುದೇ ಸಿಮ್ ಇಲ್ಲ"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"ನೆಟ್‌ವರ್ಕ್ ಪ್ರಾಶಸ್ತ್ಯಗಳು"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ಸಾರ್ವಜನಿಕ ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗೆ ಕನೆಕ್ಟ್ ಮಾಡಿ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ನೆಟ್‌ವರ್ಕ್ ಕನೆಕ್ಷನ್, ಇಂಟರ್ನೆಟ್, ವೈರ್‌ಲೆಸ್, ಡೇಟಾ, ವೈಫೈ, ವೈ-ಫೈ, ವೈ ಫೈ, ಸೆಲ್ಯುಲಾರ್, ಮೊಬೈಲ್, ಸೆಲ್ ವಾಹಕ, 4g, 3g, 2g, LTE"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"ವೈ-ಫೈ ಆನ್‌ ಮಾಡಿ"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"ವೈ-ಫೈ ಆಫ್ ಮಾಡಿ"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ ನೆಟ್‌ವರ್ಕ್"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"ಸಿಮ್"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವ ಸಿಮ್"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"ಡೌನ್‌ಲೋಡ್ ಮಾಡಲಾದ ಸಿಮ್‌ಗಳು"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"ಸಕ್ರಿಯವಾಗಿದೆ"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"ನಿಷ್ಕ್ರಿಯವಾಗಿದೆ"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / <xliff:g id="ID_1">%1$s</xliff:g> ಗಾಗಿ ಡೀಫಾಲ್ಟ್ ಆಗಿದೆ"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"ಎಲ್ಲಾ ಆ್ಯಪ್‌ಗಳು ಮತ್ತು ಸೇವೆಗಳಿಗಾಗಿ"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"ಗೇಮ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"ಗೇಮ್ ಡ್ಯಾಶ್‌ಬೋರ್ಡ್ ಶಾರ್ಟ್‌ಕಟ್, ಇತ್ಯಾದಿ ಆನ್ ಮಾಡಿ"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"ಹಿಂದಿನದು"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"ಮುಂದಿನದು"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"ಬಣ್ಣ ಪೂರ್ವವೀಕ್ಷಣೆ"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM ಕಾರ್ಡ್ ಪ್ರವೇಶ ವಿನಂತಿ"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"ಸಾಧನವು ನಿಮ್ಮ SIM ಕಾರ್ಡ್ ಅನ್ನು ಪ್ರವೇಶಿಸಲು ಬಯಸುತ್ತದೆ. ವಿವರಗಳಿಗಾಗಿ ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"SIM ಕಾರ್ಡ್‌ಗೆ ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸುವುದೇ?"</string>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 2d63f0b..66603b8 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -76,7 +76,7 @@
     <item msgid="7789156794775399931">"IP 주소를 가져오는 중..."</item>
     <item msgid="492518447401534767">"연결됨"</item>
     <item msgid="4322989558568666518">"일시 정지됨"</item>
-    <item msgid="286164147080824297">"연결 해제 중…"</item>
+    <item msgid="286164147080824297">"연결을 끊는 중…"</item>
     <item msgid="1628460745311787730">"연결 끊김"</item>
     <item msgid="4013828218541488949">"실패"</item>
     <item msgid="5473541238056528086">"차단됨"</item>
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"캐시됨(활동 클라이언트)"</item>
     <item msgid="8186970968968646288">"캐시됨(비어 있음)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"청록색"</item>
+    <item msgid="7216413848731287689">"녹청색"</item>
     <item msgid="5661027589207588703">"파란색"</item>
-    <item msgid="3795787248113275442">"남색"</item>
+    <item msgid="1219738214736244749">"녹색"</item>
     <item msgid="6331809026622602308">"보라색"</item>
     <item msgid="6390546163902724700">"분홍색"</item>
-    <item msgid="6618900408138432102">"빨간색"</item>
+    <item msgid="6500473130620545980">"주황색"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30일 이상 경과"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index ebfa12e..2c3a4a4 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"한 번 더 하세요"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"지문 인식 아이콘을 따라가세요"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"손가락을 뗀 후 다시 터치하여 지문의 다른 부분을 추가하세요."</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"지문 아이콘이 움직일 때마다 길게 터치합니다. 이렇게 하면 지문을 더 많이 캡처할 수 있습니다"</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"센서에 손가락 끝부분을 올리세요"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"마지막으로 손가락 가장자리를 돌아가며 올리세요"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"센서에 손가락 한쪽을 올리고 잠시 기다린 후에 다른 쪽을 올리세요"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"이렇게 하면 지문을 더 많이 캡처할 수 있습니다"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"지문 아이콘이 움직일 때마다 길게 터치합니다. 지문 전체를 등록하는 데 도움이 됩니다."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"지문 전체를 등록하는 데 도움이 됩니다."</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
@@ -2879,8 +2876,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"지난 24시간 동안의 시스템 사용량"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"<xliff:g id="SLOT">%s</xliff:g>의 시스템 사용량"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"<xliff:g id="SLOT">%s</xliff:g>의 앱 사용량"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"오전"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"오후"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"총 시간: 1분 미만"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"백그라운드: 1분 미만"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"총 시간: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5402,6 +5397,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"전원 버튼을 길게 눌러 어시스턴트 실행"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"전원 및 비상 메뉴:\n전원 버튼과 볼륨 업 버튼을 동시에 누릅니다."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"벨 울림 방지:\n볼륨 메뉴에서 바로가기를 사용할 수 있습니다."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"길게 누르기 시간"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"전원 버튼을 얼마나 길게 누를지 선택하여 민감도 조정"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"짧게"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"길게"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"월렛 표시"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"잠금 화면 및 빠른 설정에서 월렛 액세스 허용"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"기기 제어 표시"</string>
@@ -5447,7 +5446,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"일시적으로 사용할 수 없음"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM 없음"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"네트워크 환경설정"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"공용 네트워크에 연결"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"네트워크 연결, 인터넷, 무선, 데이터, Wifi, Wi-Fi, Wi Fi, 셀룰러, 모바일, 이동통신사, 4G, 3G, 2G, LTE"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Wi-Fi 사용"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Wi-Fi 사용 중지"</string>
@@ -5465,6 +5463,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ 네트워크"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"SIM 다운로드"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"다운로드한 SIM"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"활성"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"비활성"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" /<xliff:g id="ID_1">%1$s</xliff:g> 기본값"</string>
@@ -5542,6 +5541,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"모든 앱 및 서비스"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"게임 설정"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"게임 대시보드 바로가기 사용 설정 등"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"이전"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"다음"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"색상 미리보기"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM 카드 액세스 요청"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"기기에서 SIM 카드에 액세스하려고 합니다. 탭하여 세부정보를 확인하세요."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"SIM 카드 액세스를 허용하시겠습니까?"</string>
diff --git a/res/values-ky/arrays.xml b/res/values-ky/arrays.xml
index abe0fcd..cb59e7a 100644
--- a/res/values-ky/arrays.xml
+++ b/res/values-ky/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Кештелген (иш-аракет кардары)"</item>
     <item msgid="8186970968968646288">"Кештелген (бош)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Жашыл"</item>
+    <item msgid="7216413848731287689">"Көгүлтүр"</item>
     <item msgid="5661027589207588703">"Көк"</item>
-    <item msgid="3795787248113275442">"Индиго"</item>
+    <item msgid="1219738214736244749">"Жашыл"</item>
     <item msgid="6331809026622602308">"Сыя"</item>
     <item msgid="6390546163902724700">"Кызгылтым"</item>
-    <item msgid="6618900408138432102">"Кызыл"</item>
+    <item msgid="6500473130620545980">"Кызгылт сары"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 күндөн мурунку"</item>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index d7b49e0..a69aaf3 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Дагы бир жолу"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Манжа изинин сүрөтчөсүн басыңыз"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Манжаңызды толугу менен скандоо үчүн, акырындык менен жылдырыңыз"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Сүрөтчө жылган сайын аны коё бербей басып туруңуз. Бул манжаңыздын изин көбүрөөк тартууга жардам берет."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Манжаңыздын учун сенсорго коюңуз"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Эми манжаңыздын четтерин коюңуз"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Манжаңыздын бир тарабын сенсорго коюп, кармап туруңуз, андан кийин башка тарабына которулуңуз"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Бул манжаңыздын изин көбүрөөк тартууга жардам берет"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Сүрөтчө жылган сайын аны коё бербей басып туруңуз. Ушуну менен манжаңыздын изин толук тартып аласыз."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Ушуну менен манжаңыздын изин толук тартып аласыз"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Манжа изи катталууда: <xliff:g id="PERCENTAGE">%d</xliff:g> пайыз"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Манжа изи кошулду"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Эми манжаңыздын изи менен телефонуңуздун кулпусун ачып же колдонмолорго кирүүдө өзүңүздү ырастайсыз"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Системанын акыркы 24 саатта колдонулушу"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Системанын колдонулушу: <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Колдонмонун иштетилиши: <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"түшкө чейин"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"түштөн кийин"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Жалпысынан: бир мүнөткө жетпейт"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Фондо колдонулушу: бир мүнөткө жетпейт"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Жалпысынан: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Кубат баскычын көпкө басып, Жардамчыны иштетесиз"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Кубат баскычы жана Шашылыш билдирүү менюсу:\nКубат менен Үндү катуулатуу баскычтарын чогуу басыңыз."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Шыңгыратуунун алдын алуу:\nЫкчам баскыч үндү катуулатуу менюсунда жеткиликтүү."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Коё бербей басып туруунун узактыгы"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Сезгичтигин тууралоо үчүн кубат баскычын канча убакытка чейин коё бербей басып туруу керектигин тандаңыз"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Кыска"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Узун"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Капчыкты көрсөтүү"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Капчыкка кулпуланган экрандан жана ыкчам жөндөөлөрдөн өтөсүз"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Түзмөктү башкаруу элементтерин көрсөтүү"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Убактылуу жеткиликсиз"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM-карта жок"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Тармак жөндөөлөрү"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Жалпыга ачык тармактарга туташуу"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"тармакка туташуу, интернет, зымсыз, маалымат, wifi, wi-fi, wi fi, уюлдук, мобилдик, байланыш оператору, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Wi‑Fi\'ды жандыруу"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Wi-Fi\'ды өчүрүү"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ тармак"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM-карта"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"SIM-КАРТА ЖҮКТӨЛҮП АЛЫНДЫ"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"ЖҮКТӨЛҮП АЛЫНГАН SIM-КАРТАЛАР"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Иштеп жатат"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Өчүрүлгөн"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / <xliff:g id="ID_1">%1$s</xliff:g> үчүн демейки конфигурация"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Бардык колдонмолор жана кызматтар үчүн"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Оюндун жөндөөлөрү"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Оюн тактасынын ыкчам баскычын ж.б. күйгүзүү"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Мурунку"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Кийинки"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Түстү алдын ала көрүү"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM картага кирүүгө уруксат суралды"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Түзмөк SIM картаңызга мүмкүнчүлүк алгысы келет. Чоо-жайын көрүү үчүн таптап коюңуз."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"SIM картага кирүүгө уруксат бересизби?"</string>
diff --git a/res/values-lo/arrays.xml b/res/values-lo/arrays.xml
index e179361..b03d165 100644
--- a/res/values-lo/arrays.xml
+++ b/res/values-lo/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Cached (​ການ​ເຄື່ອນ​ໄຫວ​ລູກ​ຂ່າຍ)"</item>
     <item msgid="8186970968968646288">"Cached (​ຫວ່າງ​ເປົ່າ)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"ສີຂຽວອົມຟ້າ"</item>
+    <item msgid="7216413848731287689">"ສີຟ້າຂຽວ"</item>
     <item msgid="5661027589207588703">"ສີຟ້າ"</item>
-    <item msgid="3795787248113275442">"​ສີມ່ວງ​ເຂັ້ມ"</item>
+    <item msgid="1219738214736244749">"ສີຂຽວ"</item>
     <item msgid="6331809026622602308">"ສີມ່ວງ"</item>
     <item msgid="6390546163902724700">"ສີບົວ"</item>
-    <item msgid="6618900408138432102">"ສີແດງ"</item>
+    <item msgid="6500473130620545980">"ສີສົ້ມ"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"ເກີນ 30 ມື້ແລ້ວ"</item>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 0a3a995..320fd4c 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"ອີກເທື່ອໜຶ່ງ"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"ເລື່ອນຕາມໄອຄອນລາຍນິ້ວມື"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"ຍົກນິ້ວຂອງທ່ານຂຶ້ນເພື່ອເພີ່ມສ່ວນຕ່າງໆຂອງລາຍນິ້ວມືທ່ານ."</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"ແຕະຄ້າງໄວ້ໃນແຕ່ລະເທື່ອທີ່ໄອຄອນລາຍນິ້ວມືເຄື່ອນ. ນີ້ຈະຊ່ວຍບັນທຶກລາຍນິ້ວມືຂອງທ່ານໄດ້ຫຼາຍຂຶ້ນ."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"ວາງປາຍນິ້ວມືຂອງທ່ານໃສ່ເຊັນເຊີ"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"ສຸດທ້າຍ, ໃຫ້ວາງຂອບຂອງນິ້ວມືທ່ານໃສ່"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"ວາງທາງຂ້າງຂອງລາຍນິ້ວມືທ່ານໃສ່ເຊັນເຊີແລ້ວກົດຄ້າງໄວ້, ຈາກນັ້ນສະຫຼັບໄປອີກຂ້າງ"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"ນີ້ຈະຊ່ວຍບັນທຶກລາຍນິ້ວມືຂອງທ່ານໄດ້ຫຼາຍຂຶ້ນ"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"ແຕະຄ້າງໄວ້ໃນແຕ່ລະເທື່ອທີ່ໄອຄອນລາຍນິ້ວມືເຄື່ອນ. ນີ້ຈະຊ່ວຍບັນທຶກລາຍນິ້ວມືເຕັມຂອງທ່ານ."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"ນີ້ຈະຊ່ວຍບັນທຶກລາຍນິ້ວມືເຕັມຂອງທ່ານ"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"ກຳລັງລົງທະບຽນລາຍນິ້ວມື <xliff:g id="PERCENTAGE">%d</xliff:g> ເປີເຊັນ"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"ເພີ່ມລາຍນີ້ວມືແລ້ວ"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"ຕອນນີ້ທ່ານສາມາດໃຊ້ລາຍນິ້ວມືຂອງທ່ານເພື່ອປົດລັອກໂທລະສັບຂອງທ່ານ ຫຼື ຢັ້ງຢືນວ່າແມ່ນທ່ານໄດ້ແລ້ວ ເຊັ່ນ: ໃນເວລາທີ່ທ່ານເຂົ້າສູ່ລະບົບຫາແອັບຕ່າງໆ"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"ການໃຊ້ລະບົບສຳລັບ 24 ຊມ ທີ່ຜ່ານມາ"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"ການໃຊ້ລະບົບສຳລັບ <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"ການໃຊ້ແອັບສຳລັບ <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"ກ່ອນທ່ຽງ"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"ຫຼັງທ່ຽງ"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"ທັງໝົດ: ໜ້ອຍກວ່າໜຶ່ງນາທີ"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"ພື້ນຫຼັງ: ໜ້ອຍກວ່າໜຶ່ງນາທີ"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"ທັງໝົດ: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"ເອີ້ນຜູ້ຊ່ວຍໂດຍການກົດປຸ່ມເປີດປິດຄ້າງໄວ້"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"ເມນູເປີດປິດ ແລະ ເມນູສຸກເສີນ:\nກົດປຸ່ມເປີດປິດ ແລະ ປຸ່ມເພີ່ມສຽງຂຶ້ນພ້ອມກັນ."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"ປ້ອງກັນບໍ່ໃຫ້ເຕືອນດ້ວຍສຽງ:\nມີທາງລັດໃນເມນູລະດັບສຽງ."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"ໄລຍະເວລາກົດຄ້າງໄວ້"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"ປັບຄວາມລະອຽດອ່ອນໂດຍການເລືອກໄລຍະເວລາໃນການກົດປຸ່ມເປີດປິດຄ້າງໄວ້"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"ບໍ່ດົນ"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"ດົນ"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"ສະແດງກະເປົາ"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"ອະນຸຍາດໃຫ້ເຂົ້າເຖິງກະເປົາໄດ້ຈາກໜ້າຈໍລັອກ ແລະ ການ​ຕັ້ງ​ຄ່າ​ດ່ວນ"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"ສະແດງການຄວບຄຸມອຸປະກອນ"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"ບໍ່ສາມາດໃຊ້ໄດ້ຊົ່ວຄາວ"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"ບໍ່ມີຊິມ"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"ການຕັ້ງຄ່າເຄືອຂ່າຍ"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ເຊື່ອມຕໍ່ຫາເຄືອຂ່າຍສາທາລະນະ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ການເຊື່ອມຕໍ່ເຄືອຂ່າຍ, ອິນເຕີເນັດ, ໄຮ້ສາຍ, ອິນເຕີເນັດມືຖື, wifi, wi-fi, wi fi, ເຄືອຂ່າຍທືຖື, ມືຖື, ຜູ້ໃຫ້ບໍລິການມືຖື, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"ເປີດໃຊ້ Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"ປິດ Wi-Fi"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"ເຄືອຂ່າຍ W+"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"ຊິມ"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"ຊິມທີ່ດາວໂຫຼດມາແລ້ວ"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"ຊິມທີ່ດາວໂຫຼດມາແລ້ວ"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"ນຳໃຊ້ຢູ່"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"ບໍ່ໄດ້ນຳໃຊ້"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / ຄ່າເລີ່ມຕົ້ນສຳລັບ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"ສຳລັບແອັບ ແລະ ບໍລິການທັງໝົດ"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"ການຕັ້ງຄ່າເກມ"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"ເປີດໃຊ້ທາງລັດແຜງໜ້າປັດເກມ ແລະ ອື່ນໆ"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"ກ່ອນໜ້າ"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"ຕໍ່ໄປ"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"ຕົວຢ່າງສີ"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"ຄຳຮ້ອງຂໍການເຂົ້າເຖິງຊິມກາດ"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"ມີອຸປະກອນຕ້ອງການເຂົ້າເຖິງຊິມກາດຂອງທ່ານ. ແຕະເພື່ອເບິ່ງລາຍລະອຽດ."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"ອະນຸຍາດການເຂົ້າເຖິງຊິມກາດບໍ?"</string>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 744546a..b9a00e7 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Išsaugota talpykloje (veiklos kliento programa)"</item>
     <item msgid="8186970968968646288">"Išsaugota talpykloje (tuščia)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Žalsvai mėlyna"</item>
+    <item msgid="7216413848731287689">"Žalsvai mėlyna"</item>
     <item msgid="5661027589207588703">"Mėlyna"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Žalia"</item>
     <item msgid="6331809026622602308">"Purpurinė"</item>
     <item msgid="6390546163902724700">"Rožinė"</item>
-    <item msgid="6618900408138432102">"Raudona"</item>
+    <item msgid="6500473130620545980">"Oranžinė"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Daugiau nei 30 dienų"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 3107839..a457673 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -492,11 +492,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Dar kartą"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Stebėkite kontrolinio kodo piktogramą"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Vis patraukite pirštą, kad pridėtumėte skirtingas piršto atspaudo dalis"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Palieskite ir palaikykite kiekvieną kartą, kai kontrolinio kodo piktograma sujuda. Taip užfiksuojama daugiau piršto atspaudo"</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Padėkite piršto galiuką ant jutiklio"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Galiausiai padėkite piršto kraštus"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Padėkite vieną piršto šoną ant jutiklio ir palaikykite, tada tą patį atlikite su kitu šonu"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Taip užfiksuojama daugiau piršto atspaudo"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Palieskite ir palaikykite kiekvieną kartą, kai kontrolinio kodo piktograma sujuda. Tai padės užfiksuoti visą kontrolinį kodą."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Tai padės užfiksuoti visą kontrolinį kodą"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Registracija kontroliniu kodu: <xliff:g id="PERCENTAGE">%d</xliff:g> proc."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Kontrolinis kodas pridėtas"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Dabar galite naudoti kontrolinį kodą, kad atrakintumėte telefoną ar patvirtintumėte savo tapatybę, pvz., kai prisijungiate prie programų"</string>
@@ -2953,8 +2950,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Sistemos naudojimas per pastarąsias 24 val."</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Sistemos naudojimas: <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Programos naudojimas: <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"priešpiet"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"popiet"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Iš viso: mažiau nei minutė"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Fonas: trumpiau nei minutė"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Iš viso: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5578,6 +5573,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Padėjėją suaktyvinti laikant nuspaustą maitinimo mygtuką"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Maitinimo ir kritinės padėties meniu:\npaspauskite maitinimo ir garsumo didinimo mygtukus tuo pačiu metu."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Skambėjimo išjungimas:\nspartusis klavišas pasiekiamas garsumo meniu."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Laikymo paspaudus trukmė"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Koreguokite jautrumą nustatydami, kaip ilgai reikia laikyti paspaudus maitinimo mygtuką"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Trumpai"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Ilgai"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Rodyti piniginę"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Leiskite pasiekti piniginę iš užrakinimo ekrano ir sparčiųjų nustatymų"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Rodyti įrenginio valdiklius"</string>
@@ -5623,7 +5622,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Laikinai nepasiekiama"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nėra SIM kortelės"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Tinklo nuostatos"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Prisijungti prie viešųjų tinklų"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"tinklo ryšys, internetas, belaidis ryšys, duomenys, „Wifi“, „Wi-Fi“, „Wi Fi“, mobilusis ryšys, mobilusis, mobiliojo ryšio operatorius, 4G, 3G, 2G, LTE"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"„Wi-Fi“ įjungimas"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Išjungti „Wi-Fi“"</string>
@@ -5641,6 +5639,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ tinklas"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM kortelė"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"ATSISIŲSTA SIM KORTELĖ"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"ATSISIŲSTOS SIM KORTELĖS"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Aktyvi"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Neaktyvi"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Numatytoji <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5718,6 +5717,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Visoms programoms ir paslaugoms"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Žaidimų nustatymai"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Įjunkite žaidimų informacijos suvestinės spartųjį klavišą ir t. t."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Ankstesnis"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Kitas"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Spalvos peržiūra"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM kortelės prieigos užklausa"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Įrenginys nori pasiekti jūsų SIM kortelę. Palieskite, jei reikia išsamios informacijos."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Leisti pasiekti SIM kortelę?"</string>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 3df73c3..8e2c787 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Saglabāts kešatmiņā (darbības klients)"</item>
     <item msgid="8186970968968646288">"Saglabāts kešatmiņā (tukša)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Zilganzaļa"</item>
+    <item msgid="7216413848731287689">"Ciānzila"</item>
     <item msgid="5661027589207588703">"Zila"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Zaļa"</item>
     <item msgid="6331809026622602308">"Violeta"</item>
     <item msgid="6390546163902724700">"Rozā"</item>
-    <item msgid="6618900408138432102">"Sarkana"</item>
+    <item msgid="6500473130620545980">"Oranža"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Vecāki par 30 dienām"</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index ac7393a..e78d0ee 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -488,11 +488,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Vēlreiz…"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Atkārtota pieskaršanās pirksta nospieduma ikonai"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Atkārtoti uzlieciet pirkstu, lai pievienotu dažādas pirksta nospieduma daļas."</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Pieskarieties pirksta nospieduma ikonai un turiet to ikreiz, kad tā pārvietojas. Tādējādi tiks tverts plašāks pirksta nospiedums."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Novietojiet pirksta galu uz sensora"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Visbeidzot, novietojiet pirksta sānus"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Novietojiet pirksta sānu uz sensora un turiet, pēc tam novietojiet otru pirksta sānu."</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Tādējādi tiks tverts plašāks pirksta nospiedums."</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Pieskarieties pirksta nospieduma ikonai un turiet to ikreiz, kad tā pārvietojas. Tādējādi varat tvert visu pirksta nospiedumu."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Tādējādi varat tvert visu pirksta nospiedumu."</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Pirksta nospieduma reģistrēšana: <xliff:g id="PERCENTAGE">%d</xliff:g> procenti"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Pirksta nospiedums pievienots"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Tagad varat izmantot pirksta nospiedumu, lai autorizētu tālruni vai apstiprinātu savu identitāti, piemēram, pierakstoties lietotnēs."</string>
@@ -2915,8 +2912,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Sistēmas lietojums pēdējo 24 h laikā"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Sistēmas izmantojums: <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Lietotnes izmantojums: <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"priekšpusdienā"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"pēcpusdienā"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Kopā: mazāk par minūti"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Fonā: mazāk par minūti"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Kopā: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5489,6 +5484,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Aktivizējiet Asistentu, turot barošanas pogu."</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Barošanas un ārkārtas izvēlne:\nvienlaikus nospiediet barošanas un skaļuma palielināšanas pogu."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Zvana signāla novēršana:\nsaīsne ir pieejama skaļuma izvēlnē."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Nospiešanas un turēšanas ilgums"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Pielāgojiet jutīgumu, izvēloties, cik ilgi nospiest un turēt barošanas pogu."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Īsi"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Ilgi"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Rādīt maku"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Atļaut piekļuvi makam no bloķēšanas ekrāna un ātrajiem iestatījumiem"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Rādīt ierīču vadīklas"</string>
@@ -5534,7 +5533,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Īslaicīgi nav pieejams"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nav SIM kartes"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Tīkla preferences"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Izveidot savienojumu ar publiskiem tīkliem"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"tīkla savienojums, internets, bezvadu, dati, Wi-Fi, mobilais tīkls, mobilie sakari, mobilo sakaru operators, 4G, 3G, 2G, LTE"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Ieslēdziet Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Izslēdziet Wi-Fi"</string>
@@ -5552,6 +5550,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ tīkls"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM karte"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"LEJUPIELĀDĒTĀ SIM KARTE"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"LEJUPIELĀDĒTĀS SIM KARTES"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Aktīva"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Neaktīva"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Noklusējuma iestatījums kategorijai “<xliff:g id="ID_1">%1$s</xliff:g>”"</string>
@@ -5629,6 +5628,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Visām lietotnēm un pakalpojumiem"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Spēļu iestatījumi"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Spēļu informācijas paneļa saīsnes ieslēgšana u.c."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Iepriekšējā"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Nākamā"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Krāsas priekšskatījums"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM kartes piekļuves pieprasījums"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Kāda ierīce pieprasa piekļuvi jūsu SIM kartei. Pieskarieties, lai skatītu detalizētu informāciju."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Vai atļaut piekļuvi SIM kartei?"</string>
diff --git a/res/values-mk/arrays.xml b/res/values-mk/arrays.xml
index 5f4698c..f116f62 100644
--- a/res/values-mk/arrays.xml
+++ b/res/values-mk/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Кеширана (клиент за активност)"</item>
     <item msgid="8186970968968646288">"Кеширана (празна)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Тиркизна"</item>
+    <item msgid="7216413848731287689">"Тиркизна"</item>
     <item msgid="5661027589207588703">"Сина"</item>
-    <item msgid="3795787248113275442">"Индиго"</item>
+    <item msgid="1219738214736244749">"Зелена"</item>
     <item msgid="6331809026622602308">"Виолетова"</item>
     <item msgid="6390546163902724700">"Розова"</item>
-    <item msgid="6618900408138432102">"Црвена"</item>
+    <item msgid="6500473130620545980">"Портокалова"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Постари од 30 дена"</item>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index f135d40..c01c192 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Уште еднаш"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Следете ја иконата за отпечаток"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Подигнувајте го прстот за да ги додадете различните делови од отпечатокот"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Допрете и задржете секој пат кога иконата за отпечаток ќе се премести. Ова помага за да се сними повеќе од отпечатокот."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Поставете го врвот на прстот на сензорот"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"За крај, поставете ги рабовите на прстот"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Поставете го отпечаток странично на сензорот и задржете, а потоа направете исто со другата страна"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Ова помага за да се сними повеќе од отпечатокот"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Допрете и задржете секој пат кога иконата за отпечаток ќе се премести. Ова помага да се сними целиот отпечаток."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Ова помага да се сними целиот отпечаток"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
@@ -2879,8 +2876,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Користење на системот во минатите 24 часа"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Користење на системот за <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Користење на апликацијата за <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"прет."</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"попл."</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Вкупно: помалку од една минута"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Заднина: помалку од една минута"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Вкупно: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5402,6 +5397,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Стартувајте го „Помошникот“ со задржување на копчето за вклучување"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Мени на копчето за вклучување и за итни случаи:\nпритиснете ги копчињата за вклучување и зголемување на звукот истовремено."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Спречете ѕвонење:\nкратенката е достапна во менито за јачина на звук."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Времетраење на притискање и задржување"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Приспособете ја чувствителноста со бирање колку долго треба да го притиснете и задржите копчето за вклучување"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Кратко"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Долго"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Прикажувај паричник"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Овозможете пристап до паричникот од заклучен екран и „Брзи поставки“"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Прикажувај контроли за уреди"</string>
@@ -5447,7 +5446,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Привремено недостапен"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Нема SIM"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Мрежни поставки"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Поврзувај се на јавни мрежи"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"мрежна врска, интернет, безжичен, мобилен, Wi-Fi, мобилна, мобилен оператор, 4G, 3G, 2G, LTE"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Вклучете Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Исклучете Wi-Fi"</string>
@@ -5465,6 +5463,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ мрежа"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"ПРЕЗЕМЕНА SIM"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"ПРЕЗЕМЕНИ SIM-КАРТИЧКИ"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Активна"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Неактивна"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" /Стандардно за <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5542,6 +5541,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"За сите апликации и услуги"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Поставки за игри"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Вклучете ја кратенката за „Контролната табла за игри“ итн."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Претходна"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Следна"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Преглед на бојата"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Барање за пристап до SIM-картичката"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Даден уред сака да пристапи до вашата SIM-картичка. Допрете за детали."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Да се дозволи пристап до SIM-картичката?"</string>
diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml
index 5ac71ec..dafc6e2 100644
--- a/res/values-ml/arrays.xml
+++ b/res/values-ml/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"കാഷെചെയ്‌തു (പ്രവർത്തന ക്ലയന്റ്)"</item>
     <item msgid="8186970968968646288">"കാഷെചെയ്‌തു (ശൂന്യം)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"ടീല്‍"</item>
+    <item msgid="7216413848731287689">"സിയാൻ"</item>
     <item msgid="5661027589207588703">"നീല"</item>
-    <item msgid="3795787248113275442">"ഇൻഡിഗോ"</item>
+    <item msgid="1219738214736244749">"പച്ച"</item>
     <item msgid="6331809026622602308">"പര്‍പ്പിള്‍"</item>
     <item msgid="6390546163902724700">"പിങ്ക്"</item>
-    <item msgid="6618900408138432102">"ചുവപ്പ്"</item>
+    <item msgid="6500473130620545980">"ഓറഞ്ച്"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 ദിവസത്തിലധികം പഴയത്"</item>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 5711fc9..265e494 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"ഒരിക്കൽ കൂടി"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"ഫിംഗർപ്രിന്റ് ഐക്കൺ പിന്തുടരുക"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"നിങ്ങളുടെ ഫിംഗർപ്രിന്റിന്റെ വ്യത്യസ്ത ഭാഗങ്ങൾ ചേർക്കുന്നതിന് നിങ്ങളുടെ വിരൽ ഉയർത്തിക്കൊണ്ടിരിക്കുക"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"ഓരോ തവണ ഫിംഗർപ്രിന്റ് ഐക്കൺ നീങ്ങുമ്പോഴും സ്‌പർശിച്ചുപിടിക്കുക. ഇത് നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് കൂടുതൽ സമഗ്രമായി ക്യാപ്‌ചർ ചെയ്യാൻ സഹായിക്കും."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"നിങ്ങളുടെ വിരലിന്റെ അഗ്രം സെൻസറിൽ വയ്ക്കുക"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"അവസാനമായി, നിങ്ങളുടെ വിരലിന്റെ വശങ്ങൾ നൽകുക"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"നിങ്ങളുടെ ഫിംഗർപ്രിന്റിന്റെ വശം സെൻസറിൽ വച്ച് അമർത്തിപ്പിടിക്കുക, തുടർന്ന് മറ്റേ വശം നൽകുക"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"ഇത് നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് കൂടുതൽ സമഗ്രമായി ക്യാപ്‌ചർ ചെയ്യാൻ സഹായിക്കും"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"ഓരോ തവണ ഫിംഗർപ്രിന്റ് ഐക്കൺ നീങ്ങുമ്പോഴും സ്‌പർശിച്ചുപിടിക്കുക. ഇത് നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് പൂർണ്ണമായി ക്യാപ്‌ചർ ചെയ്യാൻ സഹായിക്കുന്നു."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"ഇത് നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് പൂർണ്ണമായി ക്യാപ്‌ചർ ചെയ്യാൻ സഹായിക്കുന്നു"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"ഫിംഗർപ്രിന്റ് എൻറോൾ ചെയ്യൽ <xliff:g id="PERCENTAGE">%d</xliff:g> ശതമാനം ആയി"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"ഫിംഗർപ്രിന്റ് ചേർത്തു"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"ഫോൺ അൺലോക്ക് ചെയ്യാനോ ആപ്പുകളിലേക്ക് സൈൻ ഇൻ ചെയ്യുന്നത് പോലുള്ള സന്ദർഭങ്ങളിൽ ഇത് നിങ്ങൾ തന്നെയാണെന്ന് പരിശോധിച്ചുറപ്പിക്കാനോ ഇപ്പോൾ നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് ഉപയോഗിക്കാനാകും"</string>
@@ -2788,7 +2785,7 @@
     <string name="battery_desc_radio" msgid="454677140485133914">"സെൽ റേഡിയോയുടെ ബാറ്ററി ഉപഭോഗം"</string>
     <string name="battery_sugg_radio" msgid="5476234634503535270">"സെൽ കവറേജ് ഇല്ലാത്ത മേഖലകളിൽ പവർ സംരക്ഷിക്കുന്നതിന് വിമാന മോഡിലേക്ക് മാറുക"</string>
     <string name="battery_desc_flashlight" msgid="6694895513133361404">"ഫ്ലാഷ്ലൈറ്റിൽ ഉപയോഗിക്കുന്ന ബാറ്ററി"</string>
-    <string name="battery_desc_camera" msgid="6152712271731518018">"ക്യാമറ ഉപയോഗിച്ച ബാറ്ററി"</string>
+    <string name="battery_desc_camera" msgid="6152712271731518018">"ക്യാമറ ഉപയോഗിക്കുന്ന ബാറ്ററി"</string>
     <string name="battery_desc_display" msgid="7175017688954602685">"ഡിസ്‌പ്ലേയുടെയും ബാക്ക്‌ലൈറ്റിന്റെയും ബാറ്ററി ഉപഭോഗം"</string>
     <string name="battery_sugg_display" msgid="3102137296547788111">"സ്‌ക്രീൻ തെളിച്ചം കൂടാതെ/അല്ലെങ്കിൽ സ്‌ക്രീൻ ടൈംഔട്ട് കുറയ്ക്കുക"</string>
     <string name="battery_desc_wifi" msgid="5276669172548928768">"Wi‑Fi-യുടെ ബാറ്ററി ഉപഭോഗം"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"കഴിഞ്ഞ 24 മണിക്കൂറിലെ സിസ്‌റ്റം ഉപയോഗം"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"<xliff:g id="SLOT">%s</xliff:g> എന്നതിനുള്ള സിസ്‌റ്റം ഉപയോഗം"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"<xliff:g id="SLOT">%s</xliff:g> എന്നതിനുള്ള ആപ്പ് ഉപയോഗം"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"am"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"pm"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"ആകെ: ഒരു മിനിറ്റിൽ താഴെ"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"പശ്ചാത്തലം: ഒരു മിനിറ്റിൽ താഴെ"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"ആകെ: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4966,7 +4961,7 @@
       <item quantity="other">Camera ആപ്പുകൾ</item>
       <item quantity="one">Camera ആപ്പ്</item>
     </plurals>
-    <string name="default_calendar_app_title" msgid="1870095225089706093">"Calendar ആപ്പ്"</string>
+    <string name="default_calendar_app_title" msgid="1870095225089706093">"കലണ്ടർ ആപ്പ്"</string>
     <string name="default_contacts_app_title" msgid="7740028900741944569">"കോണ്‍‌ടാക്റ്റ് ആപ്പ്"</string>
     <plurals name="default_email_app_title" formatted="false" msgid="8338194872609410234">
       <item quantity="other">ഇമെയിൽ ക്ലയന്റ് ആപ്പുകൾ</item>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"പവർ ബട്ടൺ അമർത്തിപ്പിടിച്ച് Assistant സജീവമാക്കുക"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"പവർ, അടിയന്തര മെനു:\nപവർ, ശബ്‌ദം കൂട്ടുക എന്നീ ബട്ടണുകൾ ഒരേസമയം അമർത്തുക."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"റിംഗ് ചെയ്യുന്നത് തടയുക:\nശബ്‌ദ മെനുവിൽ കുറുക്കുവഴി ലഭ്യമാണ്."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"സമയ ദൈർഘ്യം അമർത്തിപ്പിടിക്കുക"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"പവർ ബട്ടൺ എത്ര സമയം അമർത്തിപ്പിടിക്കണമെന്ന് തിരഞ്ഞെടുത്ത് സെൻസിറ്റിവിറ്റി ക്രമീകരിക്കുക"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"ദൈർഘ്യം കുറഞ്ഞത്"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"ദൈർഘ്യമേറിയത്"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Wallet കാണിക്കുക"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"ലോക്ക് സ്‌ക്രീനിൽ നിന്നും ദ്രുത ക്രമീകരണത്തിൽ നിന്നും Wallet-ലേക്ക് ആക്‌സസ് അനുവദിക്കുക"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"ഉപകരണ നിയന്ത്രണങ്ങൾ കാണിക്കുക"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"താൽക്കാലികമായി ലഭ്യമല്ല"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"സിം ഇല്ല"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"നെറ്റ്‌വർക്ക് മുൻഗണനകൾ"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"പൊതു നെറ്റ്‌വർക്കിലേക്ക് കണക്റ്റ് ചെയ്യുക"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"നെറ്റ്‌വർക്ക് കണക്ഷൻ, ഇന്‍റര്‍നെറ്റ്, വയർലെസ്, ഡാറ്റ, വൈഫൈ, വൈഫൈ, വൈഫൈ, സെല്ലുലാർ, മൊബൈൽ, സെൽ കാരിയർ, 4g, 3g, 2g, LTE"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"വൈഫൈ ഓണാക്കുക"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"വൈഫൈ ഓഫാക്കുക"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ നെറ്റ്‌വർക്ക്"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"സിം"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"ഡൗൺലോഡ് ചെയ്‌ത സിം"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"ഡൗൺലോഡ് ചെയ്‌ത SIM-കൾ"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"സജീവം"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"നിഷ്ക്രിയം"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / <xliff:g id="ID_1">%1$s</xliff:g> എന്നിവയ്ക്കുള്ള ഡിഫോൾട്ട്"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"എല്ലാ ആപ്പുകൾക്കും സേവനങ്ങൾക്കും"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"ഗെയിം ക്രമീകരണം"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"ഗെയിം ഡാഷ്ബോർഡ് ഷോർട്ട്കട്ട് മുതലായവ ഓണാക്കുക"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"മുമ്പത്തേത്"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"അടുത്തത്"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"വർണ്ണ പ്രിവ്യു"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"സിം കാർഡ് ആക്സസ് ചെയ്യാനുള്ള അഭ്യർത്ഥന"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"ഒരു ഉപകരണത്തിന് നിങ്ങളുടെ സിം കാർഡ് ആക്സസ് ചെയ്യണമെന്നുണ്ട്. വിശദാംശങ്ങൾക്ക് ടാപ്പ് ചെയ്യുക."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"സിം കാർഡിലേക്ക് ആക്സസ് അനുവദിക്കണോ?"</string>
diff --git a/res/values-mn/arrays.xml b/res/values-mn/arrays.xml
index 89dc9ee..832563b 100644
--- a/res/values-mn/arrays.xml
+++ b/res/values-mn/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Кеш хийгдсэн (үйлдэлийн клиент)"</item>
     <item msgid="8186970968968646288">"Кеш хийгдсэн (хоосон)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Ногоон цэнхэр"</item>
+    <item msgid="7216413848731287689">"Ногоон хөх"</item>
     <item msgid="5661027589207588703">"Цэнхэр"</item>
-    <item msgid="3795787248113275442">"Индиго"</item>
+    <item msgid="1219738214736244749">"Ногоон"</item>
     <item msgid="6331809026622602308">"Нил ягаан"</item>
     <item msgid="6390546163902724700">"Ягаан"</item>
-    <item msgid="6618900408138432102">"Улаан"</item>
+    <item msgid="6500473130620545980">"Улбар шар"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 гаруй хоног хадгална"</item>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 7a450dc..9c3e307 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Дахиад нэг удаа"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Хурууны хээний дүрс тэмдгийг дагана уу"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Хурууныхаа хээг бүрэн гаргахын тулд хуруугаа ахин дахин хөндийрүүлж хүргэнэ үү"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Хурууны хээний дүрс тэмдэг хөдлөх бүрд удаан дарна уу. Энэ нь таны хурууны хээний илүү их зургийг авахад тусална."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Хурууныхаа үзүүрийг мэдрэгч дээр байрлуулна уу"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Эцэст нь хурууныхаа ирмэгүүдийг байруулна уу"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Хурууныхаа хээний хажуу талыг мэдрэгч дээр удаан байрлуулж, дараа нь нөгөө тал руу сэлгэнэ үү"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Энэ нь таны хурууны хээний илүү их зургийг авахад тусална"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Хурууны хээний дүрс тэмдэг хөдлөх бүрд удаан дарна уу. Энэ нь таны хурууны хээг бүтэн авахад тусална."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Энэ нь таны хурууны бүтэн хээг авахад тусална"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Хурууны хээ бүртгүүлэх явц <xliff:g id="PERCENTAGE">%d</xliff:g> хувь"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Хурууны хээ нэмсэн"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Одоо та хурууны хээгээ утасныхаа түгжээг тайлах эсвэл аппуудад нэвтрэх зэргээр өөрийгөө мөн болохыг баталгаажуулахын тулд ашиглах боломжтой"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Өнгөрсөн 24 цагийн системийн ашиглалт"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"<xliff:g id="SLOT">%s</xliff:g>-н системийн ашиглалт"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"<xliff:g id="SLOT">%s</xliff:g>-н аппын ашиглалт"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"үө"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"үх"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Нийт: нэг минутаас доош"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Дэвсгэр: нэг минутаас доош"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Нийт: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Асаах/унтраах товчийг удаан дарснаар Туслахыг идэвхжүүлнэ үү"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Асаах/унтраах болон яаралтай тусламжийн цэс:\nАсаах/унтраах болон дууны түвшнийг нэмэх товчийг зэрэг дарна уу."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Хонх дуугаргахаас сэргийлэх:\nДууны түвшний цэсэд товчлол боломжтой байна."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Дараад үргэлжлэх хугацааг удаан дарна уу"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Хэр удаан дарахаа сонгож мэдрэгшилийг тохируулаад асаах/унтраах товчийг удаан дарна уу"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Хурдан"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Удаан"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Түрийвч харуулах"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Түгжигдсэн дэлгэц болон шуурхай тохиргооноос түрийвчид хандахыг зөвшөөрнө"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Төхөөрөмжийн хяналтыг харуулах"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Түр хугацаанд боломжгүй"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM байхгүй"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Сүлжээний тохиргоо"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Нийтийн Wi-Fi сүлжээнд холбогдох"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"сүлжээний холболт, интернэт, утасгүй интернэт, дата, wifi, wi-fi, wi fi, үүрэн холбоо, мобайл, үүрэн холбооны оператор, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Wi‑Fi асаах"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Wi-Fi-г унтраах"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ сүлжээ"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"ТАТСАН SIM"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"ТАТАЖ АВСАН SIM"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Идэвхтэй"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Идэвхгүй"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / <xliff:g id="ID_1">%1$s</xliff:g>-н өгөгдмөл"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Бүх апп болон үйлчилгээнд"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Тоглоомын тохиргоо"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Тоглоомын хяналтын самбарын товчлолыг асаах гэх мэт"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Өмнөх"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Дараах"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Өнгийг урьдчилан үзэх"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM картад хандах хүсэлт"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Төхөөрөмж таны SIM картад хандахыг хүсэж байна. Дэлгэрэнгүйг харахын тулд товшино уу."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"SIM картад хандахыг зөвшөөрөх үү?"</string>
diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml
index 626f385..ad2af7c 100644
--- a/res/values-mr/arrays.xml
+++ b/res/values-mr/arrays.xml
@@ -271,7 +271,7 @@
     <item msgid="4212187233638382465">"सक्रिय ठेवा"</item>
     <item msgid="5099026183238335900">"स्थानाचे परीक्षण करा"</item>
     <item msgid="2297727967385895059">"उच्च पॉवर स्थानाचे परीक्षण करा"</item>
-    <item msgid="8700593962030471569">"वापरविषयक आकडेवारी मिळवा"</item>
+    <item msgid="8700593962030471569">"वापर आकडेवारी मिळवा"</item>
     <item msgid="4140820386622184831">"मायक्रोफोन निःशब्द/सशब्द करा"</item>
     <item msgid="317746827951691657">"टोस्ट दर्शवा"</item>
     <item msgid="5679422988212309779">"प्रोजेक्‍ट मीडिया"</item>
@@ -338,7 +338,7 @@
     <item msgid="1148968792599973150">"सक्रिय ठेवा"</item>
     <item msgid="8482874682804856549">"स्थान"</item>
     <item msgid="5186169827582545242">"स्थान"</item>
-    <item msgid="6122293931012635638">"वापरविषयक आकडेवारी मिळवा"</item>
+    <item msgid="6122293931012635638">"वापर आकडेवारी मिळवा"</item>
     <item msgid="2526677383312751932">"मायक्रोफोन निःशब्द/सशब्द करा"</item>
     <item msgid="4000577305179914546">"टोस्ट दर्शवा"</item>
     <item msgid="8660207174515570558">"प्रोजेक्‍ट मीडिया"</item>
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"कॅशे  केलेला (ॲक्टिव्हिटी क्लायंट)"</item>
     <item msgid="8186970968968646288">"कॅशे   केलेला (रिक्त)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"टील"</item>
+    <item msgid="7216413848731287689">"निळसर"</item>
     <item msgid="5661027589207588703">"निळा"</item>
-    <item msgid="3795787248113275442">"नीळ"</item>
+    <item msgid="1219738214736244749">"हिरवा"</item>
     <item msgid="6331809026622602308">"जांभळा"</item>
     <item msgid="6390546163902724700">"गुलाबी"</item>
-    <item msgid="6618900408138432102">"लाल"</item>
+    <item msgid="6500473130620545980">"नारिंगी"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 दिवसांपेक्षा अधिक जुने"</item>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index d1faf9c..6f7ca7e 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"आणखी एकदा"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"फिंगरप्रिंट आयकन फॉलो करा"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"तुमच्‍या फिंगरप्रिंटचे वेगवेगळे भाग जोडण्यासाठी तुमचे बोट उचलत रहा"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"प्रत्येक वेळी फिंगरप्रिंट आयकन हलल्यावर स्पर्श करा आणि धरून ठेवा. यामुळे तुमची फिंगरप्रिंट आणखी स्पष्टपणे कॅप्चर करण्यात मदत होते."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"तुमच्या बोटाचे टोक सेन्सरवर ठेवा"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"शेवटी, तुमच्या बोटाच्या कडा ठेवा"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"तुमची फिंगरप्रिंट घ्यायची असलेली एक बाजू सेन्सरवर ठेवा आणि धरून ठेवा, त्यानंतर दुसऱ्या बाजूवर स्विच करा"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"यामुळे तुमची फिंगरप्रिंट आणखी स्पष्टपणे कॅप्चर करण्यात मदत होते"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"प्रत्येक वेळी फिंगरप्रिंट आयकन हलल्यावर स्पर्श करा आणि धरून ठेवा. यामुळे तुमची संपूर्ण फिंगरप्रिंट कॅप्चर करण्यात मदत होते."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"यामुळे तुमचे संपूर्ण फिंगरप्रिंट कॅप्चर होते"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"फिंगरप्रिंटची <xliff:g id="PERCENTAGE">%d</xliff:g> टक्के नोंदणी झाली आहे"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"फिंगरप्रिंट जोडली"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"तुम्ही ॲप्समध्ये साइन इन करता तेव्हा, तुमचा फोन अनलॉक करण्यासाठी किंवा ते तुम्हीच आहात याची पडताळणी करण्यासाठी तुम्ही आता तुमचा चेहरा वापरू शकता"</string>
@@ -648,7 +645,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="1961863114590024945">"मध्यम ते उच्च सुरक्षा"</string>
     <string name="unlock_set_unlock_password_title" msgid="2559842616268607041">"पासवर्ड"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7647435233968707432">"उच्च सुरक्षितता"</string>
-    <string name="unlock_set_do_later_title" msgid="6565575303676064364">"आता नको"</string>
+    <string name="unlock_set_do_later_title" msgid="6565575303676064364">"सध्या नाही"</string>
     <string name="current_screen_lock" msgid="1367883977261098017">"सद्य स्क्रीन लॉक"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4492334416059646032">"फिंगरप्रिंट + पॅटर्न"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"फिंगरप्रिंट + पिन"</string>
@@ -2878,8 +2875,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"मागील २४ तासांमधील सिस्टमचा वापर"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"<xliff:g id="SLOT">%s</xliff:g> साठी सिस्टमचा वापर"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"<xliff:g id="SLOT">%s</xliff:g> साठी ॲपचा वापर"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"am"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"pm"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"एकूण: एका मिनिटापेक्षा कमी"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"बॅकग्राउंड: एका मिनिटापेक्षा कमी"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"एकूण: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4967,7 +4962,7 @@
       <item quantity="other">कॅमेरा अ‍ॅप्स</item>
       <item quantity="one">कॅमेरा ॲप</item>
     </plurals>
-    <string name="default_calendar_app_title" msgid="1870095225089706093">"Calendar अ‍ॅप"</string>
+    <string name="default_calendar_app_title" msgid="1870095225089706093">"कॅलेंडर अ‍ॅप"</string>
     <string name="default_contacts_app_title" msgid="7740028900741944569">"संपर्क अ‍ॅप"</string>
     <plurals name="default_email_app_title" formatted="false" msgid="8338194872609410234">
       <item quantity="other">ईमेल क्लायंट अ‍ॅप्स</item>
@@ -5401,6 +5396,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"पॉवर बटण धरून ठेवून Assistant ट्रिगर करा"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"पॉवर आणि आणीबाणीशी संबंधित मेनू:\nपॉवर आणि व्‍हॉल्‍यूम जास्‍त ही बटण एकाच वेळी दाबा."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"रिंग होणे थांबवणे:\nव्‍हॉल्‍यूम मेनूमध्ये शॉर्टकट उपलब्ध आहे."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"दाबून धरून ठेवण्याचा कालावधी"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"किती वेळासाठी पॉवर बटण दाबून धरून ठेवायचे हे निवडून संवेदनशीलता अ‍ॅडजस्ट करा"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"कमी वेळासाठी"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"जास्त वेळासाठी"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"वॉलेट दाखवा"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"लॉक स्‍क्रीन आणि क्विक सेटिंग्जमधून वॉलेट ॲक्सेस करण्याची अनुमती द्या"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"डिव्हाइस नियंत्रणे दाखवा"</string>
@@ -5446,7 +5445,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"तात्पुरते उपलब्ध नाही"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"सिम नाही"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"नेटवर्क प्राधान्ये"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"सार्वजनिक नेटवर्कशी कनेक्ट करा"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"नेटवर्क कनेक्शन, इंटरनेट, वायरलेस, डेटा, वायफाय, वाय-फाय, वाय फाय, सेल्युलर, मोबाइल, सेल वाहक, 4g, 3g, 2g, LTE"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"वाय-फाय सुरू करा"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"वाय-फाय बंद करा"</string>
@@ -5464,6 +5462,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ नेटवर्क"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"सिम"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"डाउनलोड केलेले सिम"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"डाउनलोड केलेली सिम"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"सुरू आहे"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"बंद आहे"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / <xliff:g id="ID_1">%1$s</xliff:g> साठी डीफॉल्ट आहे"</string>
@@ -5541,6 +5540,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"सर्व अ‍ॅप्स आणि सेवांसाठी"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"गेम सेटिंग्ज"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"गेम डॅशबोर्ड शॉर्टकट इ. सुरू करा"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"मागील"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"पुढील"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"रंगाचे पूर्वावलोकन"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"सिम कार्डच्या अ‍ॅक्सेसची विनंती"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"डिव्हाइसला तुमचे सिम कार्ड अ‍ॅक्सेस करायचे आहे. तपशीलांसाठी टॅप करा."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"सिम कार्डच्या अ‍ॅक्सेसला अनुमती द्यायची आहे का?"</string>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index 4b6992b..274e55c 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Cache (klien aktiviti)"</item>
     <item msgid="8186970968968646288">"Cache (kosong)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Hijau kebiruan"</item>
+    <item msgid="7216413848731287689">"Sian"</item>
     <item msgid="5661027589207588703">"Biru"</item>
-    <item msgid="3795787248113275442">"Biru nila"</item>
+    <item msgid="1219738214736244749">"Hijau"</item>
     <item msgid="6331809026622602308">"Ungu"</item>
     <item msgid="6390546163902724700">"Merah jambu"</item>
-    <item msgid="6618900408138432102">"Merah"</item>
+    <item msgid="6500473130620545980">"Orange"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Lebih 30 hari"</item>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 93e8ff8..a03fb63 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Sekali lagi"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Ikut ikon cap jari"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Angkat jari berulang kali untuk menambahkan beberapa bahagian cap jari anda"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Sentuh &amp; tahan setiap kali ikon cap jari bergerak. Hal ini membantu menangkap lebih banyak permukaan cap jari anda."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Letakkan hujung jari anda pada penderia"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Akhir sekali, letakkan bahagian tepi jari anda"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Letakkan bahagian tepi cap jari anda pada penderia dan tahan, kemudian alih ke bahagian yang lain"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Hal ini membantu menangkap lebih banyak permukaan cap jari anda"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Sentuh &amp; tahan setiap kali ikon cap jari bergerak. Ini membantu tangkapan cap jari penuh anda."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Ini membantu tangkapan cap jari penuh anda"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Mendaftarkan cap jari <xliff:g id="PERCENTAGE">%d</xliff:g> peratus"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Cap jari ditambahkan"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Sekarang, anda boleh menggunakan cap jari anda untuk membuka kunci telefon anda atau mengesahkan sama ada itulah anda atau tidak, seperti ketika anda log masuk apl"</string>
@@ -2313,7 +2310,7 @@
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Zum masuk pada skrin"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Ketik 3 kali untuk mengezum"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Ketik butang untuk mengezum"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2527664482392097865">"Zum masuk dengan pantas pada skrin untuk menjadikan kandungan lebih besar.&lt;br/&gt;&lt;br/&gt; &lt;b&gt;Untuk mengezum masuk:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Gunakan pintasan untuk memulakan pembesaran&lt;br/&gt; {1,number,integer}. Ketik skrin&lt;br/&gt; {2,number,integer}. Seret 2 jari untuk menerokai skrin&lt;br/&gt; {3,number,integer}. Cubit dengan 2 jari untuk melaraskan zum&lt;br/&gt; {4,number,integer}. Gunakan pintasan untuk menghentikan pembesaran&lt;br/&gt;&lt;br/&gt; &lt;b&gt;Untuk mengezum masuk sementara:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Gunakan pintasan untuk memulakan pembesaran&lt;br/&gt; {1,number,integer}. Sentuh &amp; tahan di mana-mana pada skrin&lt;br/&gt; {2,number,integer}. Seret jari untuk menerokai skrin&lt;br/&gt; {3,number,integer}. Angkat jari untuk menghentikan pembesaran"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2527664482392097865">"Zum masuk dengan pantas pada skrin untuk menjadikan kandungan lebih besar.&lt;br/&gt;&lt;br/&gt; &lt;b&gt;Untuk mengezum masuk:&lt;/b&gt;&lt;br/&gt; {0,nombor,integer}. Gunakan pintasan untuk memulakan pembesaran&lt;br/&gt; {1,nombor,integer}. Ketik skrin&lt;br/&gt; {2,nombor,integer}. Seret 2 jari untuk menerokai skrin&lt;br/&gt; {3,nombor,integer}. Cubit dengan 2 jari untuk melaraskan zum&lt;br/&gt; {4,nombor,integer}. Gunakan pintasan untuk menghentikan pembesaran&lt;br/&gt;&lt;br/&gt; &lt;b&gt;Untuk mengezum masuk sementara:&lt;/b&gt;&lt;br/&gt; {0,nombor,integer}. Gunakan pintasan untuk memulakan pembesaran&lt;br/&gt; {1,nombor,integer}. Sentuh &amp; tahan di mana-mana pada skrin&lt;br/&gt; {2,nombor,integer}. Seret jari untuk menerokai skrin&lt;br/&gt; {3,nombor,integer}. Angkat jari untuk menghentikan pembesaran"</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Apabila pembesaran dihidupkan, anda boleh mengezum masuk pada skrin.\n\n"<b>"Untuk mengezum"</b>", mulakan pembesaran, kemudian ketik di mana-mana pada skrin.\n"<ul><li>"Seret sekurang-kurangnya 2 jari untuk menatal"</li>\n<li>"Cubit menggunakan sekurang-kurangnya 2 jari untuk melaraskan zum"</li></ul>\n\n<b>"Untuk mengezum sementara"</b>", mulakan pembesaran, kemudian sentuh &amp; tahan di mana-mana pada skrin.\n"<ul><li>"Seret untuk beralih-alih di sekitar skrin"</li>\n<li>"Angkat jari untuk mengezum keluar"</li></ul>\n\n"Anda tidak boleh mengezum masuk pada papan kekunci atau bar navigasi."</string>
     <string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Halaman <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> daripada <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
     <string name="accessibility_tutorial_dialog_title_button" msgid="4681164949716215131">"Gunakan butang kebolehaksesan untuk buka"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Penggunaan sistem untuk tempoh 24 jam lalu"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Penggunaan sistem untuk <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Penggunaan apl untuk <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"pg"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"ptg"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Jumlah: kurang dari seminit"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Latar: kurang dari seminit"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Jumlah: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Cetuskan Assistant dengan menahan butang kuasa"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Menu Kuasa &amp; Kecemasan:\nTekan Kuasa dan Naikkan kelantangan pada masa yang sama."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Halang deringan:\nPintasan tersedia pada menu kelantangan."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Tempoh tekan &amp; tahan"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Laraskan kepekaan dengan memilih tempoh untuk menekan &amp; menahan butang kuasa"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Pendek"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Panjang"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Tunjukkan wallet"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Benarkan akses kepada wallet daripada skrin kunci dan tetapan pantas"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Tunjukkan kawalan peranti"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Tidak tersedia buat sementara waktu"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Tiada SIM"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Pilihan rangkaian"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Sambungkan kepada rangkaian awam"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"sambungan rangkaian, internet, wayarles, data, wifi, wi-fi, wi fi, selular, mudah alih, pembawa selular, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Hidupkan Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Matikan Wi-Fi"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"Rangkaian W+"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"SIM YANG DIMUAT TURUN"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"SIM YANG DIMUAT TURUN"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Aktif"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Tidak aktif"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Lalai untuk <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Untuk semua apl dan perkhidmatan"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Tetapan permainan"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Hidupkan pintasan Papan Pemuka Permainan, dll"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Sebelumnya"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Seterusnya"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Pratonton warna"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Permintaan akses kad SIM"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Peranti ingin mengakses kad SIM anda. Ketik untuk mendapatkan butiran."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Benarkan akses kepada kad SIM?"</string>
diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml
index 2b0c319..93a8fc3 100644
--- a/res/values-my/arrays.xml
+++ b/res/values-my/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"ကက်ရှ လုပ်ထား (အသုံးပြုသူ ဖောက်သည်)"</item>
     <item msgid="8186970968968646288">"ကက်ရှ် လုပ်ထား (ဗလာ)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"စိမ်းပြာ"</item>
+    <item msgid="7216413848731287689">"စိမ်းပြာ"</item>
     <item msgid="5661027589207588703">"အပြာ"</item>
-    <item msgid="3795787248113275442">"မဲနယ်"</item>
+    <item msgid="1219738214736244749">"အစိမ်း"</item>
     <item msgid="6331809026622602308">"ခရမ်း"</item>
     <item msgid="6390546163902724700">"ပန်းရောင်"</item>
-    <item msgid="6618900408138432102">"အနီ"</item>
+    <item msgid="6500473130620545980">"လိမ္မော်"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"ရက်ပေါင်း ၃၀ ထက်ကျော်သော"</item>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index ccb0187..69abdbc 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"နောက်တစ်ကြိမ်"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"လက်ဗွေသင်္ကေတကို ထပ်တို့ပါ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"လက်ဗွေ၏ အစိတ်အပိုင်းအမျိုးမျိုးကို ထည့်ရန်အတွက် သင့်လက်ချောင်းကို အကြိမ်ကြိမ် ပြန်မြှောက်ပါ"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"လက်ဗွေသင်္ကေတ ရွေ့သွားတိုင်း တို့ထိ၍ ဖိထားပါ။ ၎င်းက သင့်လက်ဗွေကို ပိုမိုဖမ်းယူပေးသည်။"</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"အာရုံခံကိရိယာပေါ်တွင် သင့်လက်ချောင်း၏ထိပ်ကို တင်ပါ"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"နောက်ဆုံးအနေဖြင့် သင့်လက်ချောင်း၏ အစွန်းများကို တင်ပါ"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"အာရုံခံကိရိယာပေါ်တွင် သင့်လက်ဗွေ၏ဘေးခြမ်းကို တင်ပြီးဖိထားပါ။ ထို့နောက် အခြားတစ်ဘက်သို့ ပြောင်းပါ"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"၎င်းက သင့်လက်ဗွေကို ပိုမိုဖမ်းယူပေးသည်"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"လက်ဗွေသင်္ကေတ ရွေ့သွားတိုင်း တို့ထိ၍ ဖိထားပါ။ ၎င်းက သင်၏လက်ဗွေအပြည့်အစုံကို သိမ်းယူရာတွင် ကူညီပေးသည်။"</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"၎င်းက သင်၏လက်ဗွေအပြည့်အစုံကို သိမ်းယူရာတွင် ကူညီပေးသည်"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"လက်ဗွေ စာရင်းသွင်းခြင်း <xliff:g id="PERCENTAGE">%d</xliff:g> ရာခိုင်နှုန်း"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"လက်ဗွေကို ထည့်ပြီးပါပြီ"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"အက်ပ်များသို့ လက်မှတ်ထိုးဝင်သောအခါကဲ့သို့ သင်ဖြစ်ကြောင်း အတည်ပြုရန်အတွက် (သို့) သင့်ဖုန်းကို လော့ခ်ဖွင့်ရန်အတွက် သင့်လက်ဗွေကို ယခု သုံးနိုင်သည်။"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"ပြီးခဲ့သော ၂၄ နာရီအတွင်း စနစ်အသုံးပြုမှု"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"<xliff:g id="SLOT">%s</xliff:g> အတွက် စနစ်အသုံးပြုမှု"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"<xliff:g id="SLOT">%s</xliff:g> အတွက် အက်ပ်အသုံးပြုမှု"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"နံနက်"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"ညနေ"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"စုစုပေါင်း- တစ်မိနစ်ထက် နည်းသည်"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"နောက်ခံအချိန်- တစ်မိနစ်ထက် နည်းသည်"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"စုစုပေါင်း- <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"ဖွင့်ပိတ်ခလုတ်ကို ဖိထားခြင်းဖြင့် Assistant ကိုဖွင့်ပါ"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"ပါဝါနှင့် အရေးပေါ် မီနူး-\n‘ဖွင့်ပိတ်ခလုတ်’ နှင့် ‘အသံချဲ့ခလုတ်’ ကို တစ်ပြိုင်တည်းနှိပ်ပါ။"</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"အသံမြည်ခြင်းကို ပိတ်ရန်-\nအသံထိန်း မီနူးတွင် ဖြတ်လမ်းလင့်ခ် ရနိုင်သည်။"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"ကြာချိန်ကို နှိပ်၍ဖိထားပါ"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"ဖွင့်ပိတ်ခလုတ်အား မည်မျှကြာကြာနှိပ်၍ ဖိထားရမည်ကို ရွေးပြီး အာရုံခံနိုင်စွမ်းကို ချိန်ညှိပါ"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"အတို"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"အရှည်"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Wallet ပြရန်"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"လော့ခ်မျက်နှာပြင်နှင့် အမြန် ဆက်တင်များမှ Wallet သို့ ဝင်သုံးခွင့်ပြုသည်"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"စက်ထိန်းစနစ် ပြရန်"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"လောလောဆယ် မရနိုင်သေးပါ"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM မရှိပါ"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"ကွန်ရက် သတ်မှတ်ချက်များ"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"အများသုံးကွန်ရက်များသို့ ချိတ်ဆက်ရန်"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ကွန်ရက်ချိတ်ဆက်မှု၊ အင်တာနက်၊ ကြိုးမဲ့၊ ဒေတာ၊ wifi၊ wi-fi၊ wi fi၊ ဆယ်လူလာ၊ မိုဘိုင်း၊ ဖုန်းကုမ္ပဏီ၊ 4g၊ 3g၊ 2g၊ lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Wi-Fi ဖွင့်ပါ"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Wi-Fi ပိတ်ရန်"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ ကွန်ရက်"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"ဆင်းမ်ကတ်"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"ဒေါင်းလုဒ်လုပ်ထားသော ဆင်းမ်ကတ်"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"ဒေါင်းလုဒ်လုပ်ထားသော ဆင်းမ်များ"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"အသုံးပြုနေသည်"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"အသုံးမပြုပါ"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / <xliff:g id="ID_1">%1$s</xliff:g> အတွက် မူရင်း"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"အက်ပ်နှင့် ဝန်ဆောင်မှုအားလုံးအတွက်"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"ဂိမ်း ဆက်တင်များ"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"ဂိမ်းဒက်ရှ်ဘုတ် ဖြတ်လမ်းလင့်ခ်ကို ဖွင့်ခြင်း စသည်"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"ယခင်"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"ရှေ့သို့"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"အရောင် အစမ်းကြည့်ရှုခြင်း"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"ဆင်းမ်ကတ်သုံးခွင့် တောင်းဆိုချက်"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"စက်တစ်ခုက သင့်ဆင်းမ်ကတ်ကို သုံးခွင့်ရလိုသည်။ အသေးစိတ်အချက်အလက်များအတွက် တို့ပါ။"</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"ဆင်းမ်ကတ်ကို သုံးခွင့်ပြုမလား။"</string>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index e1d7b76..c212dbb 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Bufret (aktivitetsklient)"</item>
     <item msgid="8186970968968646288">"Bufret (tom)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Blågrønn"</item>
+    <item msgid="7216413848731287689">"Turkis"</item>
     <item msgid="5661027589207588703">"Blå"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Grønn"</item>
     <item msgid="6331809026622602308">"Lilla"</item>
     <item msgid="6390546163902724700">"Rosa"</item>
-    <item msgid="6618900408138432102">"Rød"</item>
+    <item msgid="6500473130620545980">"Oransje"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Over 30 dager gamle"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index b447dd7..4ec43db 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"En gang til"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Følg fingeravtrykkikonet"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Løft fingeren gjentatte ganger for å legge til de forskjellige delene av fingeravtrykket ditt"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Trykk og hold hver gang fingeravtrykkikonet beveger seg. Dette bidrar til å registrere mer av fingeravtrykket."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Plassér fingertuppen på sensoren"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Plassér til slutt kantene av fingeren"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Plassér siden av fingeravtrykket på sensoren og hold. Bytt deretter til den andre siden"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Dette bidrar til å registrere mer av fingeravtrykket"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Trykk og hold hver gang fingeravtrykkikonet beveger seg. Dette bidrar til å registrere hele fingeravtrykket ditt."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Dette bidrar til å registrere hele fingeravtrykket ditt"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Registrerer fingeravtrykket: <xliff:g id="PERCENTAGE">%d</xliff:g> prosent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingeravtrykket er lagt til"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Nå kan du bruke fingeravtrykket til å låse opp telefonen eller bekrefte identiteten din, for eksempel når du logger på apper"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Systembruk de siste 24 timene"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Systembruk for <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Appbruk for <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"am"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"pm"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Totalt: mindre enn ett minutt"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Bakgrunn: mindre enn ett minutt"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Totalt: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Start assistenten ved å holde inne av/på-knappen"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Av/på- og nødmeny:\nTrykk på av/på og volum opp samtidig."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Forhindre ringing:\nEn snarvei er tilgjengelig i volummenyen."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Varighet for trykk og hold inne"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Juster følsomheten ved å velge hvor lenge av/på-knappen skal holdes inne"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Kort"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Lang"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Vis Wallet"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Gi tilgang til Wallet fra låseskjermen og hurtiginnstillingene"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Vis enhetsstyring"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Midlertidig utilgjengelig"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Uten SIM-kort"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Nettverksinnstillinger"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Koble til offentlige nettverk"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"nettverkstilkobling, internett, trådløs, data, wifi, wi-fi, wi fi, mobilnett, mobil, mobiloperatør, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Slå på Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Slå av Wi-Fi"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+-nettverk"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"NEDLASTET SIM-KORT"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"NEDLASTEDE SIM-KORT"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Aktiv"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Inaktiv"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Standard for <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"For alle apper og tjenester"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Spillinnstillinger"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Slå på Spilloversikt-snarvei osv."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Forrige"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Neste"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Forhåndsvisning av farge"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Forespørsel om tilgang til SIM-kort"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"En enhet vil ha tilgang til SIM-kortet ditt. Trykk for å se mer informasjon."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Vil du gi tilgang til SIM-kortet?"</string>
diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml
index 94452cc..0c4c653 100644
--- a/res/values-ne/arrays.xml
+++ b/res/values-ne/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"क्यास (गतिविधि ग्राहक)"</item>
     <item msgid="8186970968968646288">"क्यास (खाली)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"टिल"</item>
+    <item msgid="7216413848731287689">"सायन"</item>
     <item msgid="5661027589207588703">"निलो"</item>
-    <item msgid="3795787248113275442">"इन्डिगो"</item>
+    <item msgid="1219738214736244749">"हरियो"</item>
     <item msgid="6331809026622602308">"बैजनी"</item>
     <item msgid="6390546163902724700">"गुलाबी"</item>
-    <item msgid="6618900408138432102">"रातो"</item>
+    <item msgid="6500473130620545980">"सुन्तले रङ"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"कम्तीमा ३० दिन पुरानो"</item>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 8763a13..5e29ef4 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"अझ एक पटक छुनुहोस्"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"फिंगरप्रिन्ट आइकन जताजता सर्छ उतैउतै टच गर्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"तपाईंको फिंगरप्रिन्टका फरक-फरक भागहरू हाल्न आफ्नो औंलालाई उठाउँदै राख्दै गर्नुहोस्"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"हरेक पटक फिंगरप्रिन्ट आइकन सर्दा उक्त आइकनमा टच एण्ड होल्ड गर्नुहोस्। यसले तपाईंको फिंगरप्रिन्टको अझ धेरै भाग सेभ गर्न मद्दत गर्छ।"</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"आफ्नो औँलाको टुप्पो सेन्सरमा राख्नुहोस्"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"अन्त्यमा, आफ्नो औँलाका किनारा सेन्सरमा राख्नुहोस्"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"आफ्नो कुनै औँलाको एकतिरको भाग सेन्सरमा राखिरहनुहोस् अनि उक्त औँलाको अर्को भाग पनि सेन्सरमा राखिरहनुहोस्"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"यसले तपाईंको फिंगरप्रिन्टको अझ धेरै भाग सेभ गर्न मद्दत गर्छ"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"हरेक पटक फिंगरप्रिन्ट आइकन सर्दा उक्त आइकनमा टच एण्ड होल्ड गर्नुहोस्। तपाईंले यसो गर्नुभयो भने तपाईंको पूरै फिंगरप्रिन्ट क्याप्चर गर्न मद्दत मिल्छ।"</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"तपाईंले यसो गर्नुभयो भने तपाईंको पूरै फिंगरप्रिन्ट क्याप्चर गर्न मद्दत मिल्छ"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"फिंगरप्रिन्ट दर्ता गर्ने कार्य <xliff:g id="PERCENTAGE">%d</xliff:g> पूरा भयो"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"फिंगरप्रिन्ट हालियो"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"तपाईं अब फोन अनलक गर्न वा एपमा साइन इन गर्ने जस्ता प्रयोजनका लागि आफ्नो पहिचान पुष्टि गर्न आफ्नो फिंगरप्रिन्ट प्रयोग गर्न सक्नुहुन्छ"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"विगत २४ घन्टामा सिस्टमले खपत गरेको ब्याट्री"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"<xliff:g id="SLOT">%s</xliff:g> मा सिस्टमले खपत गरेको ब्याट्री"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"<xliff:g id="SLOT">%s</xliff:g> मा एपले खपत गरेको ब्याट्री"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"पूर्वाह्न"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"अपराह्न"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"कुल समय: एक मिनेटभन्दा कम"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"ब्याकग्राउन्डमा चलाइएको समय: एक मिनेटभन्दा कम"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"कुल समय: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"पावर बटन थिच्दा सहायक खुलोस्"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"पावर र आपत्‌कालीन मेनु:\nपावर र भोल्युम बढाउने बटन एकै पटक थिच्नुहोस्।"</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"डिभाइसको घण्टी म्युट गरियोस्:\nसर्टकट भोल्युम मेनुमा छ।"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"थिचिराख्ने अवधि"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"कति समयसम्म पावर बटन थिचिराख्ने भन्ने कुरा छनौट गरेर संवेदनशीलता मिलाउनुहोस्"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"छोटो"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"लामो"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"वालेट देखाइयोस्"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"लक स्क्रिन र द्रुत सेटिङमार्फत वालेट प्रयोग गर्ने अनुमति दिनुहोस्"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"डिभाइस नियन्त्रण गर्ने विजेटहरू देखाइयोस्"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"केही समयका लागि अनुपलब्ध छ"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM कार्ड छैन"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"नेटवर्कसम्बन्धी प्राथमिकताहरू"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"सार्वजनिक Wi-Fi नेटवर्कमा कनेक्ट गरियोस्"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"नेटवर्क कनेक्सन, इन्टरनेट, वायरलेस, डेटा, wifi, wi-fi, wi fi, सेलुलर, मोबाइल, सेल सेवा प्रदायक, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Wi-Fi अन गर्नुहोस्"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Wi-Fi अफ गर्नुहोस्"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ नेटवर्क"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"डाउनलोड गरिएको SIM"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"डाउनलोड गरिएका SIM हरू"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"सक्रिय छ"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"निष्क्रिय छ"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / <xliff:g id="ID_1">%1$s</xliff:g> को डिफल्ट कन्फिगुरेसन"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"सबै एप र सेवाहरूका लागि"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"गेमका सेटिङ"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"गेम ड्यासबोर्डको सर्टकटलगायतका सुविधाहरू अन गर्नुहोस्"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"अघिल्लो"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"अर्को"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"रङको प्रिभ्यू"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM कार्डमा भएका डेटा हेर्ने तथा प्रयोग गर्ने अनुमति"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"कुनै डिभाइसले तपाईंको SIM कार्डमा भएका डेटा हेर्ने तथा प्रयोग गर्ने अनुमति माग्दै छ। विवरणहरू हेर्न ट्याप गर्नुहोस्।"</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"SIM कार्डमा भएका डेटा हेर्न तथा प्रयोग गर्न दिने हो?"</string>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index d0aa809..875e5bc 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Gecacht (activiteitsclient)"</item>
     <item msgid="8186970968968646288">"Gecacht (leeg)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Blauwgroen"</item>
+    <item msgid="7216413848731287689">"Cyaan"</item>
     <item msgid="5661027589207588703">"Blauw"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Groen"</item>
     <item msgid="6331809026622602308">"Paars"</item>
     <item msgid="6390546163902724700">"Roze"</item>
-    <item msgid="6618900408138432102">"Rood"</item>
+    <item msgid="6500473130620545980">"Oranje"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Meer dan 30 dagen oud"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 453da98..791420d 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Nog een keer"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Volg het vingerafdrukicoon"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Raak de sensor meerdere keren aan om de verschillende delen van je vingerafdruk toe te voegen."</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Tik en houd vast elke keer dat het vingerafdrukicoon beweegt. Zo kan er meer van je vingerafdruk worden geregistreerd."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Leg het puntje van je vingertop op de sensor"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Leg tot slot de randen van je vinger op de sensor"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Leg de zijkant van je vingerafdruk op de sensor en houd vast. Doe dan hetzelfde aan de andere kant."</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Zo kan er meer van je vingerafdruk worden geregistreerd"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Tik en houd vast elke keer dat het vingerafdrukicoon beweegt. Zo kan je hele vingerafdruk worden vastgelegd."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Zo kan je hele vingerafdruk worden vastgelegd"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Vingerafdruk vastleggen: <xliff:g id="PERCENTAGE">%d</xliff:g> procent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Vingerafdruk toegevoegd"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Je kunt nu je vingerafdruk gebruiken om je telefoon te ontgrendelen of voor verificatie, bijvoorbeeld als je inlogt bij apps"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Systeemgebruik voor afgelopen 24 uur"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Systeemgebruik voor <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"App-gebruik voor <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"a.m."</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"p.m."</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Totaal: minder dan een minuut"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Achtergrond: minder dan een minuut"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Totaal: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Houd de aan/uit-knop ingedrukt om de Assistent te activeren"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Aan/uit- en noodmenu:\ndruk tegelijkertijd op de aan/uit-knop en de knop Volume omhoog."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Ringtone uitzetten:\nsnelkoppeling beschikbaar in het volumemenu."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Duur van ingedrukt houden"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Pas de gevoeligheid aan door te kiezen hoelang je de aan/uit-knop ingedrukt moet houden"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Kort"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Lang"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Portemonnee tonen"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Toegang tot portemonnee toestaan via vergrendelscherm en snelle instellingen"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Apparaatbediening tonen"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Tijdelijk niet beschikbaar"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Geen simkaart"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Netwerkvoorkeuren"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Maak verbinding met openbare netwerken"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"netwerkverbinding, internet, draadloos, data, wifi, wi-fi, wi fi, mobiel, mobiele provider, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Wifi aanzetten"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Wifi uitzetten"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ netwerk"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"Simkaart"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"GEDOWNLOADE SIMKAART"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"GEDOWNLOADE SIMKAARTEN"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Actief"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Inactief"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Standaard voor <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Voor alle apps en services"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Game-instellingen"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Game Dashboard-snelkoppeling aanzetten, enzovoort"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Vorige"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Volgende"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Kleurvoorbeeld"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Verzoek voor toegang tot simkaart"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Een apparaat wil toegang tot je simkaart. Tik voor informatie."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Toegang tot simkaart toestaan?"</string>
diff --git a/res/values-or/arrays.xml b/res/values-or/arrays.xml
index cc8cce2..cda80f2 100644
--- a/res/values-or/arrays.xml
+++ b/res/values-or/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"କ୍ୟାଶ୍ ହୋଇଥିବା (କାର୍ଯ୍ୟକଳାପ କ୍ଲାଏଣ୍ଟ)"</item>
     <item msgid="8186970968968646288">"କ୍ୟାଶ୍ ହୋଇଥିବା (ଖାଲି)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"ଟିଲ୍"</item>
+    <item msgid="7216413848731287689">"ସାଇଆନ୍"</item>
     <item msgid="5661027589207588703">"ନୀଳ"</item>
-    <item msgid="3795787248113275442">"ଇଣ୍ଡିଗୋ"</item>
+    <item msgid="1219738214736244749">"ସବୁଜ"</item>
     <item msgid="6331809026622602308">"ବାଇଗଣୀ"</item>
     <item msgid="6390546163902724700">"ଗୋଲାପି"</item>
-    <item msgid="6618900408138432102">"ନାଲି"</item>
+    <item msgid="6500473130620545980">"କମଳା"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 ଦିନରୁ ଅଧିକ ପୁରୁଣା"</item>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 8074aa2..abbca29 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"ଆଉ ଥରେ"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"ଟିପଚିହ୍ନ ଆଇକନକୁ ଅନୁସରଣ କରନ୍ତୁ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"ନିଜ ଟିପଚିହ୍ନର ବିଭିନ୍ନ ଅଂଶ ଯୋଗ କରିବା ପାଇଁ ଆଙ୍ଗୁଠି ଉଠାଉଥାନ୍ତୁ"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"ପ୍ରତ୍ୟେକ ଥର ଟିପଚିହ୍ନ ଆଇକନ୍ ମୁଭ୍ ହେଲେ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ। ଏହା ଆପଣଙ୍କ ଚିପଚିହ୍ନର ଅଧିକାଂଶ କ୍ୟାପଚର୍ କରିବାରେ ସାହାଯ୍ୟ କରେ।"</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"ଆପଣଙ୍କ ଆଙ୍ଗୁଠି ଟିପକୁ ସେନ୍ସର୍ ଉପରେ ରଖନ୍ତୁ"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"ଶେଷରେ, ଆପଣଙ୍କ ଆଙ୍ଗୁଠିର ଧାର ରଖନ୍ତୁ"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"ଆପଣଙ୍କ ଟିପଚିହ୍ନର ଗୋଟିଏ ପାର୍ଶ୍ୱକୁ ସେନ୍ସର୍ ଉପରେ ଧରି ରଖନ୍ତୁ, ତା\'ପରେ ଅନ୍ୟ ପାର୍ଶ୍ୱକୁ ସ୍ୱିଚ୍ କରନ୍ତୁ"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"ଏହା ଆପଣଙ୍କ ଚିପଚିହ୍ନର ଅଧିକାଂଶ କ୍ୟାପଚର୍ କରିବାରେ ସାହାଯ୍ୟ କରେ"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"ପ୍ରତ୍ୟେକ ଥର ଟିପଚିହ୍ନ ଆଇକନ୍ ମୁଭ୍ ହେଲେ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ। ଏହା ଆପଣଙ୍କ ସମ୍ପୂର୍ଣ୍ଣ ଟିପଚିହ୍ନ କ୍ୟାପଚର୍ କରିବାରେ ସାହାଯ୍ୟ କରେ।"</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"ଏହା ଆପଣଙ୍କ ସମ୍ପୂର୍ଣ୍ଣ ଟିପଚିହ୍ନ କ୍ୟାପଚର୍ କରିବାରେ ସାହାଯ୍ୟ କରେ"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"ଟିପଚିହ୍ନ ପଞ୍ଜିକରଣ କରିବା ଶତକଡ଼ା <xliff:g id="PERCENTAGE">%d</xliff:g> ସମ୍ପୂର୍ଣ୍ଣ ହୋଇଛି"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"ଟିପଚିହ୍ନ ଯୋଗ କରାଯାଇଛି"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"ବର୍ତ୍ତମାନ ଆପଣ ଆପଗୁଡ଼ିକରେ ସାଇନ୍ ଇନ୍ କରିବା ପରି କାର୍ଯ୍ୟ କରିବା ସମୟରେ, ଆପଣଙ୍କ ଫୋନକୁ ଅନଲକ୍ କରିବା କିମ୍ବା ଏହା ଆପଣ ବୋଲି ଯାଞ୍ଚ କରିବା ପାଇଁ ଆପଣଙ୍କ ଟିପଚିହ୍ନ ବ୍ୟବହାର କରିପାରିବେ"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"ଗତ 24 ଘଣ୍ଟାର ସିଷ୍ଟମ୍ ବ୍ୟବହାର"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"<xliff:g id="SLOT">%s</xliff:g> ପାଇଁ ସିଷ୍ଟମ୍ ବ୍ୟବହାର"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"<xliff:g id="SLOT">%s</xliff:g> ପାଇଁ ଆପ୍ ବ୍ୟବହାର"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"am"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"pm"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"ମୋଟ: ଏକ ମିନିଟରୁ କମ୍"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"ପୃଷ୍ଠପଟ: ଏକ ମିନିଟରୁ କମ୍"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"ମୋଟ: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"ପାୱାର ବଟନକୁ ଧରି ରଖି Assistantକୁ ଟ୍ରିଗର୍ କରନ୍ତୁ"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"ପାୱାର ଏବଂ ଜରୁରୀକାଳୀନ ମେନୁ:\nସମାନ ସମୟରେ \"ପାୱାର\" ଏବଂ \"ଭଲ୍ୟୁମ୍ ବଢ଼ାନ୍ତୁ\"କୁ ଦବାନ୍ତୁ।"</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"ରିଙ୍ଗ ହେବାକୁ ପ୍ରତିରୋଧ କରନ୍ତୁ:\nଭଲ୍ୟୁମ୍ ମେନୁରେ ସର୍ଟକଟ୍ ଉପଲବ୍ଧ ଅଛି।"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"ଦବାଇ ଧରି ରଖିବାର ଅବଧି"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"ପାୱାର ବଟନକୁ କେତେ ସମୟ ଦବାଇ ଧରି ରଖିବେ, ତାହା ବାଛି ସମ୍ବେଦନଶୀଳତାକୁ ଆଡଜଷ୍ଟ କରନ୍ତୁ"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"କମ୍ ସମୟ"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"ଅଧିକ ସମୟ"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"ୱାଲେଟ୍ ଦେଖାନ୍ତୁ"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"ଲକ୍ ସ୍କ୍ରିନ୍ ଏବଂ କ୍ୱିକ୍ ସେଟିଂସରୁ ୱାଲେଟକୁ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"ଡିଭାଇସ୍ ନିୟନ୍ତ୍ରଣଗୁଡ଼ିକୁ ଦେଖାନ୍ତୁ"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"ଅସ୍ଥାୟୀ ଭାବେ ଅନୁପଲବ୍ଧ"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"କୌଣସି SIM ନାହିଁ"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"ନେଟୱାର୍କ ପସନ୍ଦଗୁଡ଼ିକ"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ସାର୍ବଜନୀନ ନେଟୱାର୍କଗୁଡ଼ିକ ସହ ସଂଯୋଗ କରନ୍ତୁ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ନେଟୱାର୍କ ସଂଯୋଗ, ଇଣ୍ଟରନେଟ୍, ୱାୟାରଲେସ୍, ଡାଟା, ୱାଇଫାଇ, ୱାଇ-ଫାଇ, ୱାଇ ଫାଇ, ସେଲ୍ୟୁଲାର୍, ମୋବାଇଲ, ସେଲ୍ କ୍ୟାରିଅର୍, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"ୱାଇ-ଫାଇ ଚାଲୁ କରନ୍ତୁ"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"ୱାଇ-ଫାଇ ବନ୍ଦ କରନ୍ତୁ"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ ନେଟୱାର୍କ"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"ଡାଉନଲୋଡ୍ କରାଯାଇଥିବା SIM"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"ଡାଉନଲୋଡ୍ କରାଯାଇଥିବା SIMଗୁଡ଼ିକ"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"ସକ୍ରିୟ"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"ନିଷ୍କ୍ରିୟ"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / <xliff:g id="ID_1">%1$s</xliff:g> ପାଇଁ ଡିଫଲ୍ଟ"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"ସମସ୍ତ ଆପ୍ ଓ ସେବା ପାଇଁ"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"ଗେମ୍ ସେଟିଂସ୍"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"ଗେମ୍ ଡ୍ୟାସବୋର୍ଡ ସର୍ଟକଟ୍ ଇତ୍ୟାଦି ଚାଲୁ କରନ୍ତୁ"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"ପୂର୍ବବର୍ତ୍ତୀ"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"ପରବର୍ତ୍ତୀ"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"ରଙ୍ଗ ପ୍ରିଭ୍ୟୁ"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM କାର୍ଡ ଆକ୍ସେସ୍ କରିବାର ଅନୁରୋଧ"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"ଏକ ଡିଭାଇସ୍ ଆପଣଙ୍କ SIM କାର୍ଡକୁ ଆକ୍ସେସ୍ କରିବାକୁ ଚାହୁଁଛି। ବିବରଣୀ ପାଇଁ ଟାପ୍ କରନ୍ତୁ।"</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"SIM କାର୍ଡକୁ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଅନୁମତି ଦେବେ?"</string>
diff --git a/res/values-pa/arrays.xml b/res/values-pa/arrays.xml
index 79d098f..daa8d5a 100644
--- a/res/values-pa/arrays.xml
+++ b/res/values-pa/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"ਕੈਸ਼ ਕੀਤੀ (ਗਤੀਵਿਧੀ ਕਲਾਇੰਟ)"</item>
     <item msgid="8186970968968646288">"ਕੈਚ ਕੀਤੀ (ਖਾਲੀ)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"ਟੀਲ"</item>
+    <item msgid="7216413848731287689">"ਹਰਾ ਨੀਲਾ"</item>
     <item msgid="5661027589207588703">"ਨੀਲਾ"</item>
-    <item msgid="3795787248113275442">"ਗੂੜ੍ਹਾ ਨੀਲਾ"</item>
+    <item msgid="1219738214736244749">"ਹਰਾ"</item>
     <item msgid="6331809026622602308">"ਜਾਮਨੀ"</item>
     <item msgid="6390546163902724700">"ਗੁਲਾਬੀ"</item>
-    <item msgid="6618900408138432102">"ਲਾਲ"</item>
+    <item msgid="6500473130620545980">"ਸੰਤਰੀ"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 ਦਿਨਾਂ ਤੋਂ ਜ਼ਿਆਦਾ ਪੁਰਾਣੀ"</item>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index e0bf34a..7ce7ac2 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"ਇੱਕ ਵਾਰ ਹੋਰ"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਪ੍ਰਤੀਕ ਦੀਆਂ ਹਿਦਾਇਤਾਂ ਦੀ ਪਾਲਣਾ ਕਰੋ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੇ ਵੱਖ-ਵੱਖ ਭਾਗਾਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਆਪਣੀ ਉਂਗਲ ਨੂੰ ਰੱਖਣਾ-ਚੁੱਕਣਾ ਜਾਰੀ ਰੱਖੋ"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਪ੍ਰਤੀਕ ਵਿੱਚ ਹਰੇਕ ਵਾਰ ਹਲਚਲ ਹੋਣ \'ਤੇ ਉਸਨੂੰ ਸਪਰਸ਼ ਕਰਕੇ ਰੱਖੋ। ਇਸ ਨਾਲ ਤੁਹਾਡੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਨੂੰ ਬਿਹਤਰ ਢੰਗ ਨਾਲ ਕੈਪਚਰ ਕਰਨ ਵਿੱਚ ਮਦਦ ਹੁੰਦੀ ਹੈ।"</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"ਆਪਣੀ ਉਂਗਲ ਦੇ ਪੋਟੇ ਨੂੰ ਸੈਂਸਰ \'ਤੇ ਰੱਖੋ"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"ਅੰਤ ਵਿੱਚ, ਆਪਣੀ ਉਂਗਲ ਦੇ ਕੋਨਿਆਂ ਨੂੰ ਰੱਖੋ"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"ਆਪਣੀ ਉਂਗਲ ਦੇ ਇੱਕ ਪਾਸੇ ਨੂੰ ਸੈਂਸਰ \'ਤੇ ਲਗਾ ਕੇ ਰੱਖੋ, ਫਿਰ ਦੂਜੇ ਪਾਸੇ ਨੂੰ ਲਗਾਓ"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"ਇਸ ਨਾਲ ਤੁਹਾਡੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਨੂੰ ਬਿਹਤਰ ਢੰਗ ਨਾਲ ਕੈਪਚਰ ਕਰਨ ਵਿੱਚ ਮਦਦ ਹੁੰਦੀ ਹੈ"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਪ੍ਰਤੀਕ ਵਿੱਚ ਹਰੇਕ ਵਾਰ ਹਲਚਲ ਹੋਣ \'ਤੇ ਉਸਨੂੰ ਸਪਰਸ਼ ਕਰਕੇ ਰੱਖੋ। ਇਸ ਨਾਲ ਤੁਹਾਡਾ ਪੂਰਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਕੈਪਚਰ ਕਰਨ ਵਿੱਚ ਮਦਦ ਮਿਲਦੀ ਹੈ।"</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"ਇਸ ਨਾਲ ਤੁਹਾਡਾ ਪੂਰਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਕੈਪਚਰ ਕਰਨ ਵਿੱਚ ਮਦਦ ਮਿਲਦੀ ਹੈ"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਦਰਜ ਕਰਨ ਦੀ ਪ੍ਰਕਿਰਿਆ <xliff:g id="PERCENTAGE">%d</xliff:g> ਫ਼ੀਸਦ ਹੋ ਗਈ ਹੈ"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਹੋ ਗਿਆ"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"ਹੁਣ ਤੁਸੀਂ ਆਪਣਾ ਫ਼ੋਨ ਅਣਲਾਕ ਕਰਨ ਜਾਂ ਆਪਣੀ ਪਛਾਣ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਲਈ ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤ ਸਕਦੇ ਹੋ, ਜਿਵੇਂ ਕਿ ਜਦੋਂ ਤੁਸੀਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਦੇ ਹੋ"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"ਪਿਛਲੇ 24 ਘੰਟਿਆਂ ਦੌਰਾਨ ਸਿਸਟਮ ਦੀ ਵਰਤੋਂ"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"<xliff:g id="SLOT">%s</xliff:g> ਦੌਰਾਨ ਸਿਸਟਮ ਦੀ ਵਰਤੋਂ"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"<xliff:g id="SLOT">%s</xliff:g> ਦੌਰਾਨ ਐਪ ਦੀ ਵਰਤੋਂ"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"am"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"pm"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"ਕੁੱਲ: ਇੱਕ ਮਿੰਟ ਤੋਂ ਵੀ ਘੱਟ ਸਮਾਂ"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"ਬੈਕਗ੍ਰਾਊਂਡ: ਇੱਕ ਮਿੰਟ ਤੋਂ ਵੀ ਘੱਟ ਸਮਾਂ"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"ਕੁੱਲ: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"ਪਾਵਰ ਬਟਨ ਨੂੰ ਕੁਝ ਸਮਾਂ ਦਬਾਈ ਰੱਖ ਕੇ Assistant ਨੂੰ ਟ੍ਰਿਗਰ ਕਰੋ"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"ਪਾਵਰ ਅਤੇ ਸੰਕਟਕਾਲੀਨ ਮੀਨੂ:\nਪਾਵਰ ਬਟਨ ਅਤੇ \'ਅਵਾਜ਼ ਵਧਾਓ\' ਬਟਨ ਨੂੰ ਇੱਕੋ ਸਮੇਂ ਦਬਾਓ।"</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"ਘੰਟੀ ਵੱਜਣ ਤੋਂ ਰੋਕੋ:\nਸ਼ਾਰਟਕੱਟ ਅਵਾਜ਼ ਮੀਨੂ ਵਿੱਚ ਉਪਲਬਧ ਹੈ।"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"ਦਬਾਈ ਰੱਖਣ ਦੀ ਸਮੇਂ-ਸੀਮਾ"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"ਪਾਵਰ ਬਟਨ ਨੂੰ ਦਬਾਈ ਰੱਖਣ ਦੀ ਸਮੇਂ-ਸੀਮਾ ਦੀ ਚੋਣ ਕਰਕੇ ਸੰਵੇਦਨਸ਼ੀਲਤਾ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"ਛੋਟਾ"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"ਲੰਮਾ"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"ਵਾਲੇਟ ਦਿਖਾਓ"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"ਲਾਕ ਸਕ੍ਰੀਨ ਅਤੇ ਤਤਕਾਲ ਸੈਟਿੰਗਾਂ ਤੋਂ ਵਾਲੇਟ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦਿਓ"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"ਡੀਵਾਈਸ ਕੰਟਰੋਲ ਦਿਖਾਓ"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"ਕੁਝ ਸਮੇਂ ਲਈ ਅਣਉਪਲਬਧ"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"ਕੋਈ ਸਿਮ ਨਹੀਂ"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"ਨੈੱਟਵਰਕ ਤਰਜੀਹਾਂ"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ਜਨਤਕ ਨੈੱਟਵਰਕਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ, ਇੰਟਰਨੈੱਟ, ਵਾਇਰਲੈੱਸ, ਡਾਟਾ, ਵਾਈ-ਫਾਈ, ਸੈਲਿਊਲਰ, ਮੋਬਾਈਲ, ਸੈੱਲ ਕੈਰੀਅਰ, 4G, 3G, 2G, LTE"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"ਵਾਈ-ਫਾਈ ਚਾਲੂ ਕਰੋ"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"ਵਾਈ-ਫਾਈ ਬੰਦ ਕਰੋ"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ ਨੈੱਟਵਰਕ"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"ਸਿਮ"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"ਡਾਊਨਲੋਡ ਕੀਤਾ ਗਿਆ ਸਿਮ"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"ਡਾਊਨਲੋਡ ਕੀਤੇ ਗਏ ਸਿਮ"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"ਕਿਰਿਆਸ਼ੀਲ"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"ਅਕਿਰਿਆਸ਼ੀਲ"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / <xliff:g id="ID_1">%1$s</xliff:g> ਲਈ ਪੂਰਵ-ਨਿਰਧਾਰਿਤ"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"ਸਾਰੀਆਂ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਲਈ"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"ਗੇਮ ਸੈਟਿੰਗਾਂ"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"ਗੇਮ ਡੈਸ਼ਬੋਰਡ ਸ਼ਾਰਟਕੱਟ, ਆਦਿ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"ਪਿੱਛੇ"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"ਅੱਗੇ"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"ਰੰਗ ਦੀ ਪੂਰਵ-ਝਲਕ"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"ਸਿਮ ਕਾਰਡ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਬੇਨਤੀ"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"ਕੋਈ ਡੀਵਾਈਸ ਤੁਹਾਡੇ ਸਿਮ ਕਾਰਡ ਤੱਕ ਪਹੁੰਚ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ। ਵੇਰਵਿਆਂ ਲਈ ਟੈਪ ਕਰੋ।"</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"ਕੀ ਸਿਮ ਕਾਰਡ ਤੱਕ ਪਹੁੰਚ ਦੀ ਇਜਾਜ਼ਤ ਦੇਣੀ ਹੈ?"</string>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 3845bc1..d10c228 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Pamięć podręczna (klient aktywności)"</item>
     <item msgid="8186970968968646288">"Pamięć podręczna (pusta)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Morski"</item>
+    <item msgid="7216413848731287689">"Cyjan"</item>
     <item msgid="5661027589207588703">"Niebieski"</item>
-    <item msgid="3795787248113275442">"Indygo"</item>
+    <item msgid="1219738214736244749">"Zielony"</item>
     <item msgid="6331809026622602308">"Fioletowy"</item>
     <item msgid="6390546163902724700">"Różowy"</item>
-    <item msgid="6618900408138432102">"Czerwony"</item>
+    <item msgid="6500473130620545980">"Pomarańczowy"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Starsze niż 30 dni"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ec5c8c9..8934dd9 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -492,11 +492,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Jeszcze raz"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Dotknij ikony odcisku cyfrowego"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Unoś palec, by odcisk był dokładniejszy."</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Naciśnij i przytrzymaj za każdym razem, gdy ikona się porusza. Dzięki temu zeskanujesz większą część odcisku palca."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Umieść na czytniku koniuszek palca"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Na koniec umieść na czytniku krawędzie palca"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Umieść na czytniku palec bokiem i przytrzymaj, a następnie obróć na drugi bok"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Dzięki temu zeskanujesz większą część odcisku palca"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Kliknij i przytrzymaj za każdym razem, kiedy ikona się porusza. Pomoże to zarejestrować dokładny odcisk palca."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Pomoże to zarejestrować dokładny odcisk palca"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Rejestruję odcisk palca – <xliff:g id="PERCENTAGE">%d</xliff:g> procent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Odcisk palca dodany"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Możesz teraz używać odcisku palca do odblokowywania telefonu oraz weryfikacji tożsamości, na przykład podczas logowania się w aplikacjach"</string>
@@ -2953,8 +2950,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Wykorzystanie przez system w ciągu ostatnich 24 godzin"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Wykorzystanie przez system w godz. <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Wykorzystanie przez aplikacje w godz. <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"AM"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"PM"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Łącznie: niecała minuta"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"W tle: niecała minuta"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Łącznie: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5578,6 +5573,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Przytrzymaj przycisk zasilania, aby uaktywnić Asystenta"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Menu zasilania i alarmowe:\nNaciśnij jednocześnie przyciski zasilania i zwiększania głośności."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Zapobiegaj włączeniu się dzwonka:\nSkrót dostępny w menu głośności."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Czas naciskania i przytrzymywania przycisku głośności"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Dostosuj czułość, określając, jak długo ma być naciskany i przytrzymywany przycisk głośności"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Krótko"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Długo"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Pokazuj portfel"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Zezwalaj na dostęp do portfela na ekranie blokady i w szybkich ustawieniach"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Pokazuj sterowanie urządzeniami"</string>
@@ -5623,7 +5622,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Chwilowo niedostępna"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Brak karty SIM"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Ustawienia sieci"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Łącz się z sieciami publicznymi"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"połączenie sieciowe, internet, bezprzewodowy, dane, Wi-Fi, wi-fi, wi fi, komórka, telefon, operator komórkowy, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Włącz Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Wyłącz Wi-Fi"</string>
@@ -5641,6 +5639,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"Sieć W+"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"POBRANA KARTA SIM"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"POBRANE KARTY SIM"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Aktywna"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Nieaktywna"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Domyślna dla: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5718,6 +5717,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Dla wszystkich aplikacji i usług"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Ustawienia gier"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Włączanie skrótu do panelu gier i inne ustawienia"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Wstecz"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Dalej"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Podgląd koloru"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Prośba o dostęp do karty SIM"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Urządzenie chce uzyskać dostęp do Twojej karty SIM. Kliknij, by wyświetlić szczegóły."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Zezwolić na dostęp do karty SIM?"</string>
diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml
index 8b75911..e802e57 100644
--- a/res/values-pt-rBR/arrays.xml
+++ b/res/values-pt-rBR/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Em cache (cliente de atividade)"</item>
     <item msgid="8186970968968646288">"Em cache (vazio)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Azul-petróleo"</item>
+    <item msgid="7216413848731287689">"Ciano"</item>
     <item msgid="5661027589207588703">"Azul"</item>
-    <item msgid="3795787248113275442">"Índigo"</item>
+    <item msgid="1219738214736244749">"Verde"</item>
     <item msgid="6331809026622602308">"Roxo"</item>
     <item msgid="6390546163902724700">"Rosa"</item>
-    <item msgid="6618900408138432102">"Vermelho"</item>
+    <item msgid="6500473130620545980">"Laranja"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Com mais de 30 dias"</item>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 7c5648c..ad00fc8 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Mais uma vez"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Siga o ícone de impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Repita o processo de tocar e levantar o dedo para registrar todas as partes da sua impressão digital"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Toque na tela e a mantenha pressionada sempre que o ícone de impressão digital se mover. Isso ajuda na captura da sua impressão digital."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Coloque a ponta do dedo no sensor"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Por fim, coloque as laterais do dedo"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Coloque a lateral da sua impressão digital no sensor e mantenha o dedo parado por alguns instantes. Depois, mude para o outro lado"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Isso ajuda na captura da sua impressão digital"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Toque na tela e a mantenha pressionada sempre que o ícone de impressão digital se mover. Isso ajudará a fazer uma captura completa."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Isso ajuda a capturar toda a impressão digital"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
@@ -2879,8 +2876,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Uso do sistema nas últimas 24h"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Uso do sistema em <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Uso do app em <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"manhã"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"tarde/noite"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: menos de um minuto"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Segundo plano: menos de um minuto"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5402,6 +5397,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Mantenha o botão liga/desliga pressionado para acionar o Google Assistente"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Menu liga/desliga e de emergência:\nPressione os botões liga/desliga e aumentar volume ao mesmo tempo."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Impedir o toque:\nAtalho disponível no menu de volumes."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Duração do pressionamento"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Ajuste a sensibilidade escolhendo por quanto tempo manter o botão liga/desliga pressionado"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Curto"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Longo"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Mostrar carteira"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Permitir acesso à carteira pela tela de bloqueio e pelas Configurações rápidas"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Mostrar controles do dispositivo"</string>
@@ -5447,7 +5446,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Temporariamente indisponível"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Sem chip"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferências de rede"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectar-se a redes públicas"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"conexão de rede, internet, sem fio, dados, wifi, wi-fi, wi fi, celular, rede móvel, operadora de celular, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Ativar o Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Desativar o Wi-Fi"</string>
@@ -5465,6 +5463,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"Rede W+"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"Chip"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"CHIP TRANSFERIDO POR DOWNLOAD"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"CHIPS TRANSFERIDOS POR DOWNLOAD"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Ativo"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Inativo"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Padrão para <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5542,6 +5541,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Para todos os apps e serviços"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Configurações de jogos"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Ativar o atalho do Painel de jogo etc."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Anterior"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Próxima"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Visualização da cor"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Solicitação de acesso ao chip"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Um dispositivo quer acessar seu chip. Toque para ver detalhes."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Permitir acesso ao chip?"</string>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 5750e2b..5994f66 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Em cache (cliente de atividade)"</item>
     <item msgid="8186970968968646288">"Em cache (vazio)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Azul esverdeado"</item>
+    <item msgid="7216413848731287689">"Ciano"</item>
     <item msgid="5661027589207588703">"Azul"</item>
-    <item msgid="3795787248113275442">"Índigo"</item>
+    <item msgid="1219738214736244749">"Verde"</item>
     <item msgid="6331809026622602308">"Roxo"</item>
     <item msgid="6390546163902724700">"Cor-de-rosa"</item>
-    <item msgid="6618900408138432102">"Vermelho"</item>
+    <item msgid="6500473130620545980">"Laranja"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Mais de 30 dias"</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 737f774..734dbb3 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Mais uma vez"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Siga o ícone da impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Vá levantando o dedo para adicionar as diferentes partes da sua impressão digital"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Toque sem soltar de cada vez que o ícone da impressão digital se mover. Isto ajuda a capturar mais da sua impressão digital."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Coloque a ponta do dedo no sensor"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Por fim, coloque as extremidades do dedo"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Coloque o lado da sua impressão digital no sensor, mantenha essa posição e, em seguida, mude para o outro lado"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Isto ajuda a capturar mais da sua impressão digital"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Toque sem soltar de cada vez que o ícone da impressão digital se mover. Isto ajuda a capturar a sua impressão digital completa."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Isto ajuda a capturar a sua impressão digital completa"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Inscrição da impressão digital: <xliff:g id="PERCENTAGE">%d</xliff:g> por cento"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Impressão digital adicionada"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Já pode utilizar a sua impressão digital para desbloquear o telemóvel ou validar a sua identidade, como quando inicia sessão em apps"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Utilização do sistema durante as últimas 24 h"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Utilização do sistema durante <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Utilização da app durante <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"da manhã"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"da tarde"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: menos de um min"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Em segundo plano: menos de um min"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Acione o Assistente ao manter premido o botão ligar/desligar"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Menu ligar/desligar e de emergência:\nprima os botões ligar/desligar e aumentar volume em simultâneo."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Impedir o toque:\natalho disponível no menu do volume."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Duração de premir sem soltar"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Ajuste a sensibilidade ao escolher durante quanto tempo o botão ligar/desligar deve ser premido sem soltar"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Curta"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Longa"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Mostrar carteira"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Permita o acesso à carteira a partir do ecrã de bloqueio e das Definições rápidas"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Mostrar controlos de dispositivos"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Temporariamente indisponível"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"sem cartão SIM"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferências de rede"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Ligar a redes públicas"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ligação de rede, internet, sem fios, dados, wifi, wi-fi, wi fi, telemóvel, dispositivo móvel, operador de telemóvel, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Ative o Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Desativar o Wi-Fi"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"Rede W+"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"SIM TRANSFERIDO"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"SIMs TRANSFERIDOS"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Ativo"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Inativo"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" /Predefinição para <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Para todas as apps e serviços"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Definições de jogos"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Ative o atalho do Painel de jogo, etc."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Anterior"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Seguinte"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Pré-visualização da cor"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Pedido de acesso ao cartão SIM"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Um dispositivo pretende aceder ao seu cartão SIM. Toque para obter detalhes."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Pretende permitir o acesso ao cartão SIM?"</string>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 8b75911..e802e57 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Em cache (cliente de atividade)"</item>
     <item msgid="8186970968968646288">"Em cache (vazio)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Azul-petróleo"</item>
+    <item msgid="7216413848731287689">"Ciano"</item>
     <item msgid="5661027589207588703">"Azul"</item>
-    <item msgid="3795787248113275442">"Índigo"</item>
+    <item msgid="1219738214736244749">"Verde"</item>
     <item msgid="6331809026622602308">"Roxo"</item>
     <item msgid="6390546163902724700">"Rosa"</item>
-    <item msgid="6618900408138432102">"Vermelho"</item>
+    <item msgid="6500473130620545980">"Laranja"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Com mais de 30 dias"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 7c5648c..ad00fc8 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Mais uma vez"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Siga o ícone de impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Repita o processo de tocar e levantar o dedo para registrar todas as partes da sua impressão digital"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Toque na tela e a mantenha pressionada sempre que o ícone de impressão digital se mover. Isso ajuda na captura da sua impressão digital."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Coloque a ponta do dedo no sensor"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Por fim, coloque as laterais do dedo"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Coloque a lateral da sua impressão digital no sensor e mantenha o dedo parado por alguns instantes. Depois, mude para o outro lado"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Isso ajuda na captura da sua impressão digital"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Toque na tela e a mantenha pressionada sempre que o ícone de impressão digital se mover. Isso ajudará a fazer uma captura completa."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Isso ajuda a capturar toda a impressão digital"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
@@ -2879,8 +2876,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Uso do sistema nas últimas 24h"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Uso do sistema em <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Uso do app em <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"manhã"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"tarde/noite"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: menos de um minuto"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Segundo plano: menos de um minuto"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5402,6 +5397,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Mantenha o botão liga/desliga pressionado para acionar o Google Assistente"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Menu liga/desliga e de emergência:\nPressione os botões liga/desliga e aumentar volume ao mesmo tempo."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Impedir o toque:\nAtalho disponível no menu de volumes."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Duração do pressionamento"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Ajuste a sensibilidade escolhendo por quanto tempo manter o botão liga/desliga pressionado"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Curto"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Longo"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Mostrar carteira"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Permitir acesso à carteira pela tela de bloqueio e pelas Configurações rápidas"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Mostrar controles do dispositivo"</string>
@@ -5447,7 +5446,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Temporariamente indisponível"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Sem chip"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferências de rede"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectar-se a redes públicas"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"conexão de rede, internet, sem fio, dados, wifi, wi-fi, wi fi, celular, rede móvel, operadora de celular, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Ativar o Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Desativar o Wi-Fi"</string>
@@ -5465,6 +5463,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"Rede W+"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"Chip"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"CHIP TRANSFERIDO POR DOWNLOAD"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"CHIPS TRANSFERIDOS POR DOWNLOAD"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Ativo"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Inativo"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Padrão para <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5542,6 +5541,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Para todos os apps e serviços"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Configurações de jogos"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Ativar o atalho do Painel de jogo etc."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Anterior"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Próxima"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Visualização da cor"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Solicitação de acesso ao chip"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Um dispositivo quer acessar seu chip. Toque para ver detalhes."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Permitir acesso ao chip?"</string>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index 937ea46..a8c6545 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"În cache (client de activitate)"</item>
     <item msgid="8186970968968646288">"În cache (gol)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Turcoaz"</item>
+    <item msgid="7216413848731287689">"Cyan"</item>
     <item msgid="5661027589207588703">"Albastru"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Verde"</item>
     <item msgid="6331809026622602308">"Violet"</item>
     <item msgid="6390546163902724700">"Roz"</item>
-    <item msgid="6618900408138432102">"Roșu"</item>
+    <item msgid="6500473130620545980">"Portocaliu"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Vechi de peste 30 de zile"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 6e74171..1039028 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -488,11 +488,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Încă o dată"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Atingeți repetat pictograma amprentă"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Ridicați degetul și atingeți din nou pentru a adăuga toate părțile amprentei"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Atingeți lung de fiecare dată când se mișcă pictograma amprentei. Astfel veți putea captura o parte mai mare din amprentă."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Așezați vârful degetului pe senzor"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"În final, așezați părțile laterale ale degetului"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Așezați partea laterală a degetului pe senzor și mențineți, apoi procedați la fel cu cealaltă parte"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Astfel veți putea captura o parte mai mare din amprentă"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Atingeți lung de fiecare dată când se mișcă pictograma amprentei. Astfel, poate fi capturată amprenta integrală."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Astfel, poate fi capturată amprenta integrală"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
@@ -2917,8 +2914,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Utilizarea pentru sistem în ultimele 24 h"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Utilizarea de către sistem pentru <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Utilizarea de către aplicație pentru <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"a.m."</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"p.m."</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: mai puțin de un minut"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"În fundal: mai puțin de un minut"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5491,6 +5486,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Declanșați Asistentul apăsând lung butonul de pornire"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Meniul Pornire și urgențe:\napăsați simultan pe butonul de pornire și pe cel de creștere a volumului"</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Împiedicați sunatul:\ncomandă rapidă disponibilă în meniul de volum"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Durata cât țineți apăsat"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Ajustați sensibilitatea alegând cât să țineți apăsat butonul de pornire"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Scurtă"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Lungă"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Afișați Wallet"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Permiteți accesul la Wallet din ecranul de blocare și setările rapide"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Afișați comenzile dispozitivului"</string>
@@ -5536,7 +5535,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Temporar indisponibil"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Niciun card SIM"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferințe privind rețeaua"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectați-vă la rețele publice"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"conexiune la rețea, internet, wireless, date, wifi, wi-fi, wi fi, celular, mobil, operator servicii mobile, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Activați conexiunea Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Dezactivați conexiunea Wi-Fi"</string>
@@ -5554,6 +5552,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"Rețea W+"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"SIM DESCĂRCAT"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"SIM-URI DESCĂRCATE"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Activ"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Inactiv"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Prestabilit pentru <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5631,6 +5630,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Pentru toate aplicațiile și serviciile"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Setări de joc"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Activați comanda rapidă din Tabloul de bord al jocului, etc."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Înapoi"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Înainte"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Previzualizarea culorii"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Solicitare de acces la cardul SIM"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Un dispozitiv solicită acces la cardul SIM. Atingeți pentru detalii."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Permiteți accesul la cardul SIM?"</string>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index e271faf..e2ade5d 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Кешировано (клиент)"</item>
     <item msgid="8186970968968646288">"Кешировано (пусто)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Сине-зеленый"</item>
+    <item msgid="7216413848731287689">"Голубой"</item>
     <item msgid="5661027589207588703">"Синий"</item>
-    <item msgid="3795787248113275442">"Индиго"</item>
+    <item msgid="1219738214736244749">"Зеленый"</item>
     <item msgid="6331809026622602308">"Фиолетовый"</item>
     <item msgid="6390546163902724700">"Розовый"</item>
-    <item msgid="6618900408138432102">"Красный"</item>
+    <item msgid="6500473130620545980">"Оранжевый"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Добавленные более 30 дней назад"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 2cd2475..c2a0268 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -492,11 +492,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Ещё раз"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Работа со значком отпечатка пальца"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Немного перемещайте палец, чтобы отсканировать его полностью."</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Нажимайте и удерживайте значок каждый раз, когда он перемещается. Так отпечаток пальца будет более точным."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Коснитесь датчика и удерживайте его подушечкой пальца"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Мы почти закончили"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Наклоните палец вбок, нажмите и удерживайте датчик. Затем поменяйте положение пальца и повторите действия."</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Так отпечаток пальца будет более точным"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Каждый раз, когда значок перемещается, нажимайте на него и удерживайте. Это поможет зафиксировать отпечаток целиком."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Это поможет зафиксировать отпечаток целиком."</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Процент выполнения задачи по добавлению отпечатка пальца: <xliff:g id="PERCENTAGE">%d</xliff:g>."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Отпечаток добавлен"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Теперь вы можете использовать отпечаток пальца, чтобы разблокировать телефон или подтверждать свою личность для входа в приложения."</string>
@@ -2953,8 +2950,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Расход системой за 24 часа"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Использование системой за <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Использование приложениями за <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"AM"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"PM"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Всего: меньше минуты"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"В фоновом режиме: меньше минуты"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Всего: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5578,6 +5573,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Нажмите и удерживайте кнопку питания для запуска Ассистента"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Меню кнопки питания и экстренных вызовов\nЧтобы его открыть, одновременно нажмите кнопки питания и увеличения громкости."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Отключение звука звонка\nБыстрый запуск функции доступен в меню регулировки громкости."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Длительность нажатия и удержания"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Настройте чувствительность, выбрав длительность нажатия и удержания кнопки питания."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Быстро"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Долго"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Показывать кошелек"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Разрешить доступ к кошельку на заблокированном экране и в быстрых настройках"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Показывать виджеты управления устройством"</string>
@@ -5623,7 +5622,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Временно недоступно"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Нет SIM-карты"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Настройки подключения"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Подключаться к общедоступным сетям"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"сетевое подключение, Интернет, беспроводная сеть, передача данных, Wi-Fi, wifi, wi fi, сотовая сеть, мобильный Интернет, сотовый оператор, 4G, 3G, 2G, LTE"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Включить Wi‑Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Отключить Wi-Fi"</string>
@@ -5641,6 +5639,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"Сеть W+"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM-карта"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"СКАЧАННАЯ SIM-КАРТА"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"СКАЧАННЫЕ SIM-КАРТЫ"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Активна"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Неактивна"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" /По умолчанию для категорий: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5718,6 +5717,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Для всех приложений и сервисов"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Настройки игр"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Включение ярлыков игровой панели и т. п."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Назад"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Далее"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Предпросмотр цвета"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Запрос на доступ к SIM-карте"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Устройство запрашивает доступ к вашей SIM-карте. Нажмите, чтобы узнать больше."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Предоставить доступ к SIM-карте?"</string>
diff --git a/res/values-si/arrays.xml b/res/values-si/arrays.xml
index 0450326..207c582 100644
--- a/res/values-si/arrays.xml
+++ b/res/values-si/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"හැඹිලි ගත කළ (ක්‍රියාකාරකම් සේවාලාභියා)"</item>
     <item msgid="8186970968968646288">"හැඹිලි ගත කළ (හිස්)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"සේරා"</item>
+    <item msgid="7216413848731287689">"සියන්"</item>
     <item msgid="5661027589207588703">"නිල්"</item>
-    <item msgid="3795787248113275442">"ඉන්ඩිගෝ"</item>
+    <item msgid="1219738214736244749">"කොළ"</item>
     <item msgid="6331809026622602308">"දම්"</item>
     <item msgid="6390546163902724700">"රෝස"</item>
-    <item msgid="6618900408138432102">"රතු"</item>
+    <item msgid="6500473130620545980">"තැඹිලි"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"දින 30කට වඩා පැරණි"</item>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 45f066f..f64538b 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"තව එක් වරක්"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"ඇඟිලි සලකුණු නිරූපකය අනුගමනය කරන්න"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"ඔබේ ඇඟිලි සලකුණෙහි විවිධ කොටස් එක් කිරීමට ඔබගේ ඇඟිල්ල ඔසවා තබා ගන්න"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"ඇඟිලි සලකුණු නිරූපකය චලනය වන එක් එක් අවස්ථාවේ ස්පර්ශ කර අල්ලාගෙන සිටින්න. මෙය ඔබගේ ඇඟිලි සලකුණෙහි වැඩි ප්‍රමාණයක් ග්‍රහණය කර ගැනීමට උපකාරී වේ."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"ඔබගේ ඇඟිලි තුඩ සංවේදකය මත තබන්න"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"අවසානයේදී, ඔබගේ ඇඟිල්ලේ දාර තබන්න"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"ඔබගේ ඇඟිලි සලකුණුණෙහි පැත්ත සංවේදකය මත තබා අල්ලාගෙන සිටින්න, අනතුරුව අනෙක් පැත්තට මාරු වන්න"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"මෙය ඔබගේ ඇඟිලි සලකුණෙහි වැඩි ප්‍රමාණයක් ග්‍රහණය කර ගැනීමට උපකාරී වේ"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"ඇඟිලි සලකුණු නිරූපකය චලනය වන එක් එක් අවස්ථාවේ ස්පර්ශ කර අල්ලාගෙන සිටින්න. මෙය ඔබගේ සම්පූර්ණ ඇඟිලි සලකුණ ග්‍රහණය කර ගැනීමට උපකාරී වේ."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"මෙය ඔබගේ සම්පූර්ණ ඇඟිලි සලකුණ ග්‍රහණය කර ගැනීමට උපකාරී වේ"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"ඇඟිලි සලකුණ සියයට <xliff:g id="PERCENTAGE">%d</xliff:g>ක් ලියාපදිංචි කරමින්"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"ඇඟිලි සලකුණ එක් කරන ලදී"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"දැන් ඔබට ඔබගේ දුරකථනය අගුලු හැරීමට හෝ ඔබ යෙදුම්වලට පුරන විට වැනි අවස්ථාවල, ඒ ඔබ බව සත්‍යාපනය සකිරීමට ඔබගේ ඇඟිලි සලකුණ භාවිත කළ හැකිය"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"පසුගිය පැය 24 සඳහා පද්ධති භාවිතය"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"<xliff:g id="SLOT">%s</xliff:g> සඳහා පද්ධති භාවිතය"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"<xliff:g id="SLOT">%s</xliff:g> සඳහා යෙදුම් භාවිතය"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"පෙ.ව."</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"ප.ව."</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"මුළු: මිනිත්තුවකට වඩා අඩුය"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"පසුබිම: මිනිත්තුවකට වඩා අඩුය"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"එකතුව: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"බල බොත්තම තද කර ගෙන සිටීමෙන් සහායක ප්‍රේරණය කරන්න"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"බලය සහ හදිසි අවස්ථා මෙනුව:\nඑකම අවස්ථාවේදී බලය සහ හඬ පරිමාව ඉහළට බොත්තම ඔබන්න."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"නාද වීම වළක්වන්න:\nකෙටි මග හඬ පරිමා මෙනුවෙහි තිබේ."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"ඔබා අල්ලාගෙන සිටින කාල සීමාව"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"බල බොත්තම කොපමණ වේලාවක් ඔබා අල්ලාගෙන සිටින්නේද යන්න තෝරා සංවේදීතාව සීරුමාරු කරන්න"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"කෙටි"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"දිගු"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"පසුම්බිය පෙන්වන්න"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"තිර අගුල සහ ඉක්මන් සැකසීම් වෙතින් පසුම්බිය වෙත ප්‍රවේශය ඉඩ දෙන්න"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"උපාංග පාලන පෙන්වන්න"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"තාවකාලිකව ලබා ගත නොහැකිය"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM නැත"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"ජාල මනාප"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"පොදු ජාලයකට සම්බන්ධ වන්න"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ජාල සම්බන්ධතාව, අන්තර්ජාලය, රැහැන් රහිත, දත්ත, wifi, wi-fi, wi fi, සෙලියුලර්, ජංගම, සෙල් වාහක, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Wi-Fi ක්‍රියාත්මක කරන්න"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"WiFi ක්‍රියාවිරහිත කරන්න"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ ජාලය"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"බාගත් SIM"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"බාගත් SIM"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"සක්‍රිය"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"අක්‍රිය"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / <xliff:g id="ID_1">%1$s</xliff:g> සඳහා පෙරනිමි"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"සියලු යෙදුම් සහ සේවා සඳහා"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"ක්‍රීඩා සැකසීම්"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"ක්‍රීඩා උපකරණ පුවරු කෙටි මං ආදිය ක්‍රියාත්මක කරන්න"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"පෙර"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"ඊළඟ"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"වර්ණ පෙරදසුන"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM කාඩ්පත් ප්‍රවේශ ඉල්ලීම"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"උපාංගයකට ඔබගේ SIM කාඩ්පත වෙත ප්‍රවේශ වීමට අවශ්‍යයි. විස්තර සඳහා තට්ටු කරන්න."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"SIM කාඩ්පත වෙත ප්‍රවේශය ඉඩ දෙන්නද?"</string>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index b467c8a..0c9e75d 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Vo vyrovnávacej pamäti (klient aktivity)"</item>
     <item msgid="8186970968968646288">"Vo vyrovnávacej pamäti (prázdne)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Modrozelená"</item>
+    <item msgid="7216413848731287689">"Azúrová"</item>
     <item msgid="5661027589207588703">"Modrá"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Zelená"</item>
     <item msgid="6331809026622602308">"Purpurová"</item>
     <item msgid="6390546163902724700">"Ružová"</item>
-    <item msgid="6618900408138432102">"Červená"</item>
+    <item msgid="6500473130620545980">"Oranžová"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Staršie ako 30 dní"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 43edca1..473e752 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -56,7 +56,7 @@
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Zväčšiť"</string>
     <string name="auto_rotate_settings_primary_switch_title" msgid="3151963020165952847">"Používať automatické otáčanie"</string>
     <string name="smart_rotate_text_headline" msgid="436277795183609578">"Rozpoznávanie tváre zlepšuje presnosť automatického otáčania pomocou predného fotoaparátu. Obrázky sa nikdy neukladajú ani neodosielajú Googlu."</string>
-    <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Ukážka textu"</string>
+    <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Ukážkový text"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Čarodejník z krajiny Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"11. kapitola: Nádherné smaragdové mesto"</string>
     <string name="font_size_preview_text_body" msgid="3323732544011097199">"Lesk tohto nádherného mesta Dorotku a jej priateľov najskôr oslepoval, hoci mali na očiach zelené okuliare. Ulice lemovali nádherné domy zo zeleného mramoru, husto osadené trblietajúcimi sa smaragdmi. Kráčali po chodníku z takého istého zeleného mramoru. Na miestach, kde sa spájali dlaždice, sa ligotali v odraze slnka husté rady smaragdov. Obločné tabule boli zo zeleného skla. Dokonca aj obloha nad mestom bola zafarbená dozelena a slnečné lúče boli tiež zelené. \n\nV uliciach bolo veľa ľudí. Muži, ženy i deti si vykračovali oblečení v zelených šatách a všetci mali zelenkavú pokožku. Zvedavo si obzerali Dorotku a jej prazvláštnu spoločnosť. Keď deti zbadali leva, rýchlo utiekli a skryli sa za matkin chrbát. Nik sa však Dorotke a jej spoločníkom neprihovoril. Na ulici bolo mnoho rozličných obchodov. Dorotkinmu zraku neušlo, že všetok tovar bol zelený. Zelené cukríky, zelené pukance, zelené topánky, zelené klobúky a všelijaké zelené šaty – to všetko tu bolo na predaj. Jeden obchodník predával zelenú limonádu. Keď si ju deti kupovali, Dorotka zbadala, že platia zelenými mincami. \n\nZdalo sa, že sa v meste nenachádzajú žiadne kone ani iné zvieratá. Muži tlačili pred sebou malé zelené vozíky, v ktorých prevážali veci, kam bolo treba. Všetci vyzerali šťastní, spokojní a prekvitajúci."</string>
@@ -492,11 +492,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Ešte raz"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Sledujte ikonu odtlačku prsta"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Zdvíhajte prst, aby ste pridali všetky odlišné časti odtlačku prsta"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Pridržte pri každom presune ikony odtlačku prsta. Takto sa nasníma väčšia časť odtlačku vášho prsta."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Priložte špičku prsta na senzor"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Nakoniec priložte bočné strany prsta"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Umiestnite bočnú stranu odtlačku prsta na senzor, chvíľu ho tam podržte a potom priložte opačnú stranu"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Takto sa nasníma väčšia časť odtlačku vášho prsta"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Pridržte pri každom presune ikony odtlačktu prsta. Pomôže vám to nasnímať celý odtlačok prsta."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Pomôže vám to nasnímať celý odtlačok prsta"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
@@ -2955,8 +2952,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Spotreba batérie systémom za posledných 24 h"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Spotreba batérie systémom: <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Spotreba batérie aplikáciou: <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"AM"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"PM"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Celkove: menej ako minúta"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Na pozadí: menej ako minúta"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Celkove: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5580,6 +5575,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Spustiť Asistenta pridržaním vypínača"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Ponuka vypínača a stavu tiesne:\nnaraz stlačte vypínač a tlačidlo zvýšenia hlasitosti."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Nezvoniť:\nskratka v ponuke hlasitosti."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Trvanie pridržania"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Upravte citlivosť tak, že vyberiete, ako dlho treba pridržať vypínač"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Krátke"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Dlhé"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Zobraziť peňaženku"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Povoľte prístup k peňaženke z uzamknutej obrazovky a rýchlych nastavení"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Zobraziť ovládanie zariadení"</string>
@@ -5625,7 +5624,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Dočasne nedostupný"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Žiadna SIM karta"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Nastavenia siete"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Pripájať sa k verejným sieťam"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"pripojenie k sieti, internet, bezdrôtové, dátové, wifi, wi-fi, wi fi, mobilné, mobilný operátor, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Zapnúť Wi‑Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Vypnúť Wi-Fi"</string>
@@ -5643,6 +5641,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"Sieť W+"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"STIAHNUTÁ SIM KARTA"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"STIAHNUTÉ SIM KARTY"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Aktívna"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Neaktívna"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Predvolené pre <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5720,6 +5719,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Pre všetky aplikácie a služby"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Nastavenia hier"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Zapnutie odkazu na herný panel a podobne"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Naspäť"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Ďalej"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Ukážka farby"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Žiadosť o prístup k SIM karte"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Zariadenie požaduje prístup k vašej SIM karte. Klepnutím zobrazíte podrobnosti."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Chcete povoliť prístup k SIM karte?"</string>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index a42d464..58223f0 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Predpomnjeno (odjemalec dejavnosti)"</item>
     <item msgid="8186970968968646288">"Predpomnjeno (prazno)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Zelenomodra"</item>
+    <item msgid="7216413848731287689">"Cijan"</item>
     <item msgid="5661027589207588703">"Modra"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Zelena"</item>
     <item msgid="6331809026622602308">"Vijolična"</item>
     <item msgid="6390546163902724700">"Rožnata"</item>
-    <item msgid="6618900408138432102">"Rdeča"</item>
+    <item msgid="6500473130620545980">"Oranžna"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Starejše od 30 dni"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 929f49d..aa986b4 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -492,11 +492,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Še enkrat"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Sledite ikoni prstnega odtisa"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Še naprej privzdigujte prst, da dodate različne dele prstnega odtisa."</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Dotaknite se in pridržite vsakič, ko se ikona prstnega odtisa premakne. Tako bo sistem lahko zajel večji del prstnega odtisa."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Na tipalo položite konico prsta."</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Nazadnje na tipalo položite robove prsta."</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Stranski del prstnega odtisa položite na tipalo prstnih odtisov in ga pridržite, nato zamenjajte stran."</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Tako bo sistem lahko zajel večji del prstnega odtisa."</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Dotaknite se in pridržite vsakič, ko se ikona prstnega odtisa premakne. Tako bo lažje zajeti celoten prstni odtis."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Tako bo lažje zajeti celoten prstni odtis."</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
@@ -2955,8 +2952,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Uporaba sistema v zadnjih 24 urah"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Poraba sistema za <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Poraba aplikacij za <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"dopoldne"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"popoldne"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Skupno: manj kot minuta"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"V ozadju: manj kot minuta"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Skupno: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5580,6 +5575,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Sprožite Pomočnika tako, da pridržite gumb za vklop."</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Meni za vklop/izklop in nujne primere:\nSočasno pritisnite gumba za vklop in povečanje glasnosti."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Preprečevanje zvonjenja:\nBližnjica je na voljo v meniju za glasnost."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Dolžina pridržanja"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Prilagodite občutljivost z izbiro dolžine pridržanja gumba za vklop."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Kratko"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Dolgo"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Prikaži denarnico"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Dovolite dostop do denarnice prek zaklenjenega zaslona in hitrih nastavitev."</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Prikaži kontrolnike naprave"</string>
@@ -5625,7 +5624,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Začasno ni na voljo"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Ni kartice SIM"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Omrežne nastavitve"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Poveži se z javnimi omrežji."</string>
     <string name="keywords_internet" msgid="7674082764898690310">"omrežna povezava, internet, brezžično, podatki, wifi, wi-fi, wi fi, mobilno omrežje, mobilno, mobilni operater, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Vklop Wi-Fi-ja"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Izklop Wi-Fi-ja"</string>
@@ -5643,6 +5641,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"Omrežje W+"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"PRENESENA KARTICA SIM"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"PRENESENE KARTICE SIM"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Aktivna"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Neaktivna"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Privzeto za: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5720,6 +5719,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Za vse aplikacije in storitve"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Nastavitve iger"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Vklop bližnjice na nadzorni plošči igre itd."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Nazaj"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Naprej"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Predogled barve"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Zahteva za dostop do kartice SIM"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Naprava želi dostopati do kartice SIM. Dotaknite se za podrobnosti."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Želite dovoliti dostop do kartice SIM?"</string>
diff --git a/res/values-sq/arrays.xml b/res/values-sq/arrays.xml
index aba8967..2bd9b766 100644
--- a/res/values-sq/arrays.xml
+++ b/res/values-sq/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"I ruajtur në memorie specifike (aktiviteti i klientit)"</item>
     <item msgid="8186970968968646288">"I ruajtur në memorie specifike (bosh)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Gurkali"</item>
+    <item msgid="7216413848731287689">"E bruztë"</item>
     <item msgid="5661027589207588703">"E kaltër"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"E gjelbër"</item>
     <item msgid="6331809026622602308">"Vjollcë"</item>
     <item msgid="6390546163902724700">"Rozë"</item>
-    <item msgid="6618900408138432102">"E kuqe"</item>
+    <item msgid="6500473130620545980">"Portokalli"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Mbi 30 ditë të vjetra"</item>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index d81abf2..b4a45a4 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Edhe një herë"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Ndiq ikonën e gjurmës së gishtit"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Vazhdo ta ngresh gishtin për të shtuar pjesë të ndryshme të gjurmës së gishtit"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Prek dhe mbaj të shtypur sa herë që lëviz ikona e gjurmës së gishtit. Kjo ndihmon për të regjistruar një pjesë më të madhe të gjurmës së gishtit tënd."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Vendos majën e gishtit në sensor"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Së fundi, vendos skajet e gishtit"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Vendos anën e gjurmës së gishtit në sensor dhe mbaje, më pas kalo në anën tjetër"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Kjo ndihmon për të regjistruar një pjesë më të madhe të gjurmës së gishtit tënd"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Prek dhe mbaj të shtypur sa herë që lëviz ikona e gjurmës së gishtit. Kjo ndihmon në regjistrimin e të gjithë gjurmës së gishtit."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Kjo ndihmon në regjistrimin e të gjithë gjurmës së gishtit"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Regjistrimi i gjurmës së gishtit: <xliff:g id="PERCENTAGE">%d</xliff:g> për qind"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Gjurma e gishtit u shtua"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Tani mund të përdorësh gjurmën tënde të gishtit për të shkyçur telefonin ose për të verifikuar që je ti, si p.sh. kur identifikohesh në aplikacione"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Përdorimi i sistemit për 24 orët e fundit"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Përdorimi i sistemit për: <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Përdorimi i aplikacionit për: <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"paradite"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"pasdite"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Në total: më pak se një minutë"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Në sfond: më pak se një minutë"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Në total: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Aktivizo \"Asistentin\" duke mbajtur shtypur butonin e energjisë"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Menyja \"Energjia dhe urgjenca\":\nShtyp njëherësh \"Energjinë\" dhe \"Volumin lart\"."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Parandalo rënien e ziles:\nKa shkurtore në menynë e volumit."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Kohëzgjatja e mbajtjes shtypur"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Rregullo ndjeshmërinë duke zgjedhur kohëzgjatjen e mbajtjes shtypur të butonit të energjisë"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"E shkurtër"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"E gjatë"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Shfaq portofolin"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Lejo qasjen te portofoli nga ekrani i kyçjes dhe cilësimet e shpejta"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Shfaq kontrollet e pajisjes"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Nuk ofrohet për momentin"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nuk ka kartë SIM"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferencat e rrjetit"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Lidhu me rrjetet publike"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"lidhja e rrjetit, internet, pa tel, të dhëna, wifi, wi-fi, wi fi, rrjeti celular, celular, operatori celular, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Aktivizo Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Çaktivizo Wi-Fi"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"Rrjeti W+"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"KARTA SIM E SHKARKUAR"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"SIM-ET E SHKARKUARA"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Aktive"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Joaktive"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Parazgjedhja për <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Për të gjitha aplikacionet dhe shërbimet"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Cilësimet e lojërave"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Aktivizo shkurtoren e \"Panelit të lojës\" etj."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Prapa"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Para"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Pamja paraprake e ngjyrave"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Kërkesë për qasje te karta SIM"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Një pajisje dëshiron të ketë qasje te karta jote SIM. Trokit për detaje."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Të lejohet qasja te karta SIM?"</string>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 4c1406d..8cbd363 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Кеширана (клијент активности)"</item>
     <item msgid="8186970968968646288">"Кеширана (празно)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Плавозелена"</item>
+    <item msgid="7216413848731287689">"Тиркизна"</item>
     <item msgid="5661027589207588703">"Плава"</item>
-    <item msgid="3795787248113275442">"Тамноплава"</item>
+    <item msgid="1219738214736244749">"Зелена"</item>
     <item msgid="6331809026622602308">"Љубичаста"</item>
     <item msgid="6390546163902724700">"Розе"</item>
-    <item msgid="6618900408138432102">"Црвена"</item>
+    <item msgid="6500473130620545980">"Наранџаста"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Старије од 30 дана"</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index d176b8c..b44bccc 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -488,11 +488,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Још једном"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Пратите икону утиска прста"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Наставите да подижете прст да бисте додали различите делове отиска прста"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Додирните и задржите сваки пут када се икона отиска прста помери. Тако ћете снимити већи део отиска прста."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Ставите врх прста на сензор"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"На крају ставите ивице прста"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Ставите једну страну прста на сензор и задржите, па ставите другу страну"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Тако ћете снимити већи део отиска прста"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Додирните и задржите сваки пут када се икона отиска прста помери. Ово нам помаже да снимимо цео отисак прста."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Ово нам помаже да снимимо цео отисак прста"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Регистровање отиска прста је на <xliff:g id="PERCENTAGE">%d</xliff:g> посто"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Отисак прста је додат"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Сада можете да користите отисак прста за откључавање телефона или потврду идентитета, на пример, кад се пријављујете у апликације"</string>
@@ -2915,8 +2912,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Потрошња од стране система у претходна 24 сата"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Потрошња од стране система за: <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Потрошња од стране апликација за: <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"пре подне"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"по подне"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Укупно: мање од минут"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Позадина: мање од минут"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Укупно: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5489,6 +5484,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Покрените Помоћник тако што ћете задржати дугме за укључивање"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Мени дугмета за укључивање и за хитне случајеве:\nИстовремено притисните дугме за укључивање и дугме за појачавање звука."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Спречи звоњење:\nПречица је доступна у менију дугмета за јачину звука."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Колико дуго треба да се притисне и задржи"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Прилагодите осетљивост тако што ћете одабрати колико дуго треба да се притисне и задржи дугме за укључивање"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Кратко"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Дуго"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Прикажи новчаник"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Дозволите приступ новчанику са закључаног екрана и из брзих подешавања"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Прикажи контроле уређаја"</string>
@@ -5534,7 +5533,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Привремено је недоступно"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Нема SIM картице"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Подешавања мреже"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Повежите се са јавним мрежама"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"мрежна веза, интернет, бежично, подаци, wifi, wi-fi, wi fi, мобилни телефон, мобилни, мобилни оператер, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Укључи WiFi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Искључи WiFi"</string>
@@ -5552,6 +5550,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ мрежа"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"ПРЕУЗЕТИ SIM"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"ПРЕУЗЕТЕ SIM КАРТИЦЕ"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Активно"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Неактивно"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" /Подразумевано за: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5629,6 +5628,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"За све апликације и услуге"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Подешавања игара"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Укључите пречицу за контролну таблу игре итд."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Претходна"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Следећа"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Преглед боје"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Захтев за приступ SIM картици"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Уређај жели да приступа SIM картици. Додирните за детаље."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Желите да дозволите приступ SIM картици?"</string>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index aaeda5c..15ca538 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Cachelagrad (aktivitetsklient)"</item>
     <item msgid="8186970968968646288">"Cachelagrad (tom)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Blågrön"</item>
+    <item msgid="7216413848731287689">"Cyan"</item>
     <item msgid="5661027589207588703">"Blå"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Grön"</item>
     <item msgid="6331809026622602308">"Lila"</item>
     <item msgid="6390546163902724700">"Rosa"</item>
-    <item msgid="6618900408138432102">"Röd"</item>
+    <item msgid="6500473130620545980">"Orange"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Äldre än 30 dagar"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index def2485..c74323a 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"En gång till"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Följ ikonen för fingeravtryck"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Lyft fingret flera gånger för att lägga till hela fingeravtrycket"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Tryck länge på fingeravtrycksikonen varje gång den flyttas. På så sätt kan mer av ditt fingeravtryck registreras."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Placera fingerspetsen på sensorn"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Slutligen trycker du med fingerspetsens sidor"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Placera sidan av fingerspetsen på sensorn, håll kvar och byt sedan till andra sidan"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"På så sätt kan mer av ditt fingeravtryck registreras"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Tryck länge på fingeravtrycksikonen varje gång den flyttas. Det här gör att hela fingeravtrycket registreras."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Det här gör att hela fingeravtrycket registreras"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Fingeravtrycket registreras: <xliff:g id="PERCENTAGE">%d</xliff:g> procent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingeravtrycket är tillagt"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Nu kan du låsa upp telefonen eller verifiera din identitet med ditt fingeravtryck, till exempel när du loggar in i appar"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Systemanvändning för de senaste 24 timmarna"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Systemanvändning för <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Appanvändning för <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"am"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"pm"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Totalt: mindre än en minut"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"I bakgrunden: mindre än en minut"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Totalt: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Öppna assistenten genom att hålla ned strömbrytaren"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Startmenyn och menyn för nödsituationer:\nTryck på strömbrytaren + höj volymen samtidigt"</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Inaktivera ringsignal:\nEn genväg finns i volymmenyn."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Längd på tryck"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Justera känsligheten genom att välja hur länge strömbrytaren ska hållas nedtryckt"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Kort"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Lång"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Visa Wallet"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Tillåt åtkomst till Wallet från låsskärmen och snabbinställningar"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Visa enhetsstyrning"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Inte tillgängligt just nu"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Inget SIM-kort"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Nätverksinställningar"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Anslut till offentliga nätverk"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"nätverksanslutning, internet, trådlös, data, wifi, wi-fi, wi fi, mobil, telefon, mobiloperatör, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Aktivera wifi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Stäng av wifi"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+-nätverk"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"NEDLADDAT SIM-KORT"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"NEDLADDADE SIM-KORT"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Aktiv"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Inaktiv"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Standardinställning för <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"För alla appar och tjänster"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Spelinställningar"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Aktivera genväg i Spelöversikt med mera"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Föregående"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Nästa"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Förhandsgranska färger"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Begäran om åtkomst till SIM-kort"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"En enhet vill få åtkomst till ditt SIM-kort. Tryck här för mer information."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Vill du tillåta åtkomst till SIM-kortet?"</string>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 942ff6f..b3ebf18 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Imewekwa akiba (kiteja cha shughuli)"</item>
     <item msgid="8186970968968646288">"Imewekwa akiba (tupu)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Kijani"</item>
+    <item msgid="7216413848731287689">"Samawati-Kijani"</item>
     <item msgid="5661027589207588703">"Samawati"</item>
-    <item msgid="3795787248113275442">"Nili"</item>
+    <item msgid="1219738214736244749">"Kijani"</item>
     <item msgid="6331809026622602308">"Zambarau"</item>
     <item msgid="6390546163902724700">"Waridi"</item>
-    <item msgid="6618900408138432102">"Nyekundu"</item>
+    <item msgid="6500473130620545980">"Rangi ya machungwa"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Zilizokaa zaidi ya siku 30"</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 7f5a5b2..472ea76 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Gusa mara nyingine"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Fuata aikoni ya alama ya kidole"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Endelea kuinua kidole chako ili uongeze sehemu tofauti za alama ya kidole chako"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Gusa na ushikilie kila mara aikoni ya alama ya kidole inaposogea. Hatua hii husaidia kunasa sehemu nyingi za alama ya kidole chako."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Weka ncha ya kidole chako kwenye kitambuzi"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Mwishowe, weka kingo za kidole chako"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Weka upande mmoja wa alama ya kidole chako kwenye kitambuzi na ushikilie, kisha ubadili upande mwingine"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Hatua hii husaidia kunasa sehemu nyingi za alama ya kidole chako"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Gusa na ushikilie kila mara aikoni ya alama ya kidole inaposogea. Hatua hii inakusaidia kunasa alama ya kidole chako chote."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Hatua hii inakusaidia kunasa alama ya kidole chako chote"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Imeandikisha asilimia <xliff:g id="PERCENTAGE">%d</xliff:g> ya alama ya kidole"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Alama ya kidole imeongezwa"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Sasa unaweza kutumia alama ya kidole chako kufungua simu yako au kuthibitisha kuwa ni wewe, kama vile unapoingia katika akaunti kwenye programu"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Matumizi ya mfumo katika saa 24 zilizopita"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Matumizi ya mfumo kwa <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Matumizi ya programu kwa <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"am"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"pm"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Jumla: chini ya dakika moja"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Chinichini: chini ya dakika moja"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Jumla: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5401,6 +5396,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Anzisha programu ya Mratibu kwa kushikilia kitufe cha kuwasha/kuzima"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Menyu ya Dharura na ya Kuzima/Kuwasha:\nBonyeza Kuongeza Sauti na Kuzima/Kuwasha kwa wakati mmoja."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Zuia mlio:\nNjia ya mkato inapatikana katika menyu ya sauti."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Muda wa kubonyeza na kushikilia"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Rekebisha kiwango cha hisi kwa kuchagua muda wa kubonyeza na kushikilia kitufe cha kuwasha/kuzima"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Mfupi"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Mrefu"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Onyesha kipochi"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Ruhusu kipochi kifikiwe kwenye skrini iliyofungwa na mipangilio ya haraka"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Onyesha vidhibiti vya vifaa"</string>
@@ -5446,7 +5445,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Haipatikani kwa muda"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Hakuna SIM"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Mapendeleo ya mtandao"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Unganisha kwenye mitandao ya umma"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"muunganisho wa mtandao, intaneti, isiyotumia waya, data, wifi, wi-fi, wi fi, mtandao wa simu, vifaa vya mkononi, mtoa huduma za vifaa vya mkononi, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Washa Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Zima Wi-Fi"</string>
@@ -5464,6 +5462,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"Mtandao wa W+"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"SIM ILIYOPAKULIWA"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"SIM ZILIZOPAKULIWA"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Inatumika"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Haitumiki"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Chaguomsingi ya <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5541,6 +5540,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Kwa ajili ya programu na huduma zote"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Mipangilio ya michezo"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Washa Njia ya mkato ya Dashibodi ya michezo, n.k."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Uliotangulia"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Unaofuata"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Onyesho la kukagua rangi"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Ombi la kufikia SIM kadi"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Kifaa kinataka kufikia SIM kadi yako. Gusa ili upate maelezo."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Ungependa kuruhusu ifikie SIM kadi?"</string>
diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml
index a2def21..fb62e80 100644
--- a/res/values-ta/arrays.xml
+++ b/res/values-ta/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"தற்காலிகச் சேமிப்பு (செயல்பாட்டு கிளையண்ட்)"</item>
     <item msgid="8186970968968646288">"தற்காலிகச் சேமிப்பு (காலி)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"பசும் நீலம்"</item>
+    <item msgid="7216413848731287689">"சியான்"</item>
     <item msgid="5661027589207588703">"நீலம்"</item>
-    <item msgid="3795787248113275442">"அடர் நீலம்"</item>
+    <item msgid="1219738214736244749">"பச்சை"</item>
     <item msgid="6331809026622602308">"ஊதா"</item>
     <item msgid="6390546163902724700">"பிங்க்"</item>
-    <item msgid="6618900408138432102">"சிவப்பு"</item>
+    <item msgid="6500473130620545980">"ஆரஞ்சு"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 நாட்களுக்கு மேல்"</item>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index fc81d02..7e3a72a 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"மீண்டும் ஒருமுறை தொடுங்கள்"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"கைரேகை ஐகானைப் பின்பற்றுங்கள்"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"கைரேகையின் பகுதிகளைச் சேர்க்க, விரலை எடுத்து எடுத்து வைக்கவும்"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"கைரேகை ஐகான் அசையும் போதெல்லாம் சென்சாரைத் தொட்டுப் பிடித்திருக்கவும். இது உங்கள் கைரேகையைத் துல்லியமாகப் பதிவுசெய்ய உதவும்."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"விரல்நுனியை சென்சாரின் மீது வைக்கவும்"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"இறுதியாக விரலின் விளிம்புகளை சென்சாரின் மீது வைக்கவும்"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"உங்கள் விரலின் விளிம்புப் பகுதியை சென்சாரின் ஒரு பக்கத்தில் வைத்துப் பிடித்திருந்து, பிறகு மற்றொரு பக்கத்திற்கு மாற்றவும்"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"இது உங்கள் கைரேகையைத் துல்லியமாகப் பதிவுசெய்ய உதவும்"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"கைரேகை ஐகான் அசையும்போதெல்லாம் அதைத் தொட்டுப் பிடித்திருங்கள். உங்கள் கைரேகை முழுவதையும் பதிவுசெய்ய இது உதவுகிறது."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"உங்கள் கைரேகை முழுவதையும் பதிவுசெய்ய இது உதவுகிறது"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"கைரேகை <xliff:g id="PERCENTAGE">%d</xliff:g> சதவீதம் பதிவுசெய்யப்பட்டது"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"கைரேகை சேர்க்கப்பட்டது"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"மொபைலை அன்லாக் செய்வதற்கும் நீங்கள்தான் என்பதை உறுதிப்படுத்துவதற்கும் (உதாரணமாக, ஆப்ஸில் உள்நுழைதல்) இனி உங்கள் கைரேகையைப் பயன்படுத்தலாம்"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"கடந்த 24 மணிநேரத்திற்கான சிஸ்டம் உபயோகம்"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"<xliff:g id="SLOT">%s</xliff:g>க்கான சிஸ்டம் உபயோகம்"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"<xliff:g id="SLOT">%s</xliff:g>க்கான ஆப்ஸ் உபயோகம்"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"am"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"pm"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"மொத்தம்: ஒரு நிமிடத்திற்கும் குறைவு"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"பின்னணி: ஒரு நிமிடத்திற்கும் குறைவு"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"மொத்தம்: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"பவர் பட்டனை அழுத்திப் பிடித்து Assistantடைத் தொடங்கலாம்"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"பவர் மற்றும் அவசரகால மெனு:\nபவர் பட்டனையும் ஒலியளவை அதிகரிக்கும் பட்டனையும் ஒன்றாக அழுத்தவும்."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"ஒலிப்பதைத் தடுத்தல்:\nஇதற்கான ஷார்ட்கட் ஒலியளவு மெனுவில் உள்ளது."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"அழுத்திப் பிடிப்பதற்கான கால அளவு"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"எவ்வளவு நேரம் பவர் பட்டனை அழுத்திப் பிடிக்க வேண்டும் என்பதைத் தேர்ந்தெடுப்பதன் மூலம் உணர்திறனைச் சரிசெய்யலாம்"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"குறைந்தபட்சம்"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"அதிகபட்சம்"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"வாலட்டைக் காட்டு"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"பூட்டுத் திரை, விரைவு அமைப்புகள் ஆகியவற்றில் இருந்து வாலட்டை அணுகலாம்"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"சாதனக் கட்டுப்பாடுகளைக் காட்டு"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"தற்காலிகமாகக் கிடைக்கவில்லை"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"சிம் இல்லை"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"நெட்வொர்க் விருப்பத்தேர்வுகள்"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"பொது நெட்வொர்க்குகளுடன் இணைக்கலாம்"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"நெட்வொர்க் இணைப்பு, இணையம், வயர்லெஸ், டேட்டா, வைஃபை, வை-ஃபை, வை ஃபை, செல்லுலார், மொபைல், செல் கேரியர், 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"வைஃபையை இயக்கு"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"வைஃபையை முடக்கு"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"வைஃபை பிளஸ் நெட்வொர்க்"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"சிம்"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"பதிவிறக்கப்பட்ட சிம்"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"பதிவிறக்கிய சிம்கள்"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"செயலிலுள்ளது"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"செயலில் இல்லை"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / <xliff:g id="ID_1">%1$s</xliff:g>க்கான இயல்புநிலை"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"அனைத்து ஆப்ஸுக்கும் சேவைகளுக்கும்"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"கேம் அமைப்புகள்"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"கேம் டாஷ்போர்டு ஷார்ட்கட்டை ஆன் செய்யும் மற்றும் பல"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"முந்தையது"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"அடுத்து"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"வண்ண மாதிரிக்காட்சி"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM கார்டை அணுகுவதற்கான கோரிக்கை"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"ஒரு சாதனம் உங்கள் SIM கார்டை அணுக விரும்புகிறது. விவரங்களைப் பார்க்கத் தட்டவும்."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"SIM கார்டை அணுக அனுமதிக்கவா?"</string>
diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml
index 3ac22e9..4cb9b50 100644
--- a/res/values-te/arrays.xml
+++ b/res/values-te/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"కాష్ చేసినవి (యాక్టివిటీ క్లయింట్)"</item>
     <item msgid="8186970968968646288">"కాష్ చేసినవి (ఖాళీ)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"నీలి ఆకుపచ్చ"</item>
+    <item msgid="7216413848731287689">"నీలి ఆకుపచ్చ రంగు"</item>
     <item msgid="5661027589207588703">"నీలం"</item>
-    <item msgid="3795787248113275442">"నీలిరంగు"</item>
+    <item msgid="1219738214736244749">"ఆకుపచ్చ"</item>
     <item msgid="6331809026622602308">"ఊదా"</item>
     <item msgid="6390546163902724700">"గులాబీ"</item>
-    <item msgid="6618900408138432102">"ఎరుపు"</item>
+    <item msgid="6500473130620545980">"ఆరెంజ్"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 రోజులు పైబడినవి"</item>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index a88eb83..31e643f 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"మరోసారి"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"వేలిముద్ర చిహ్నన్ని ట్యాప్ చేయండి"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"మీ వేలిముద్ర యొక్క వివిధ భాగాలను జోడించడం కోసం మీ వేలిని అనేకసార్లు పైకి ఎత్తండి"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"వేలిముద్ర చిహ్నం కదిలిన ప్రతిసారీ తాకి &amp; నొక్కి ఉంచండి. మీ వేలిముద్రను స్పష్టంగా క్యాప్చర్ చేయడానికి ఇది సహాయపడుతుంది."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"మీ వేలి కొనను సెన్సార్ మీద ఉంచండి"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"చివరగా, మీ వేలు అంచులను ఉంచండి"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"సెన్సార్‌పై మీ వేలిముద్రలో కొంత భాగాన్ని ఒక వైపునకు నొక్కి ఉంచి, ఆపై మరొక వైపునకు మార్చండి"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"మీ వేలిముద్రను స్పష్టంగా క్యాప్చర్ చేయడానికి ఇది సహాయపడుతుంది"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"వేలిముద్ర చిహ్నం కదిలిన ప్రతిసారీ తాకి &amp; నొక్కి ఉంచండి. ఇది మీ పూర్తి వేలిముద్రను క్యాప్చర్ చేయడానికి సహాయపడుతుంది."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"ఇది మీ పూర్తి వేలిముద్రను క్యాప్చర్ చేయడానికి సహాయపడుతుంది"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"వేలిముద్ర <xliff:g id="PERCENTAGE">%d</xliff:g> శాతం ఎన్‌రోల్ అవుతోంది"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"వేలిముద్ర జోడించబడింది"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"ఇప్పుడు మీరు మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి మీ వేలిముద్రను ఉపయోగించవచ్చు లేదా మీరు యాప్‌నకు సైన్ ఇన్ చేసినప్పుడు ఇది మీరేనని వెరిఫై చేయవచ్చు"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"గత 24 గంటలకు సిస్టమ్ వినియోగం"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"<xliff:g id="SLOT">%s</xliff:g> కోసం సిస్టమ్ వినియోగం సమాచారం"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"<xliff:g id="SLOT">%s</xliff:g> కోసం యాప్ వినియోగ సమాచారం"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"am"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"pm"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"మొత్తం సమయం: ఒక నిమిషం కన్నా తక్కువ"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"బ్యాక్‌గ్రౌండ్ సమయం: ఒక నిమిషం కన్నా తక్కువ"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"మొత్తం ఉపయోగం: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -3073,7 +3068,7 @@
     <string name="sync_gmail" msgid="228561698646018808">"Gmail"</string>
     <string name="sync_calendar" msgid="4603704438090387251">"Calendar"</string>
     <string name="sync_contacts" msgid="2376465611511325472">"కాంటాక్ట్‌లు"</string>
-    <string name="sync_plug" msgid="7956982719077985381"><font fgcolor="#ffffffff">"Google సింక్‌కు స్వాగతం!"</font>" \nమీరు ఎక్కడ ఉన్నా సరే మీకాంటాక్ట్‌లు, నియామకాలు మరియు మరిన్నింటికి యాక్సెస్‌ను అనుమతించడం కోసం డేటాను సింక్ చేయడానికి Google అవలంబించే విధానం."</string>
+    <string name="sync_plug" msgid="7956982719077985381"><font fgcolor="#ffffffff">"Google సింక్‌కు స్వాగతం!"</font>" \nమీరు ఎక్కడ ఉన్నా సరే మీకాంటాక్ట్‌లు, నియామకాలు మరియు మరిన్నింటికి యాక్సెస్‌ను అనుమతించడం కోసం డేటాను సమకాలీకరించడానికి Google అవలంబించే విధానం."</string>
     <string name="header_application_sync_settings" msgid="7427706834875419243">"యాప్‌ సింక్‌ సెట్టింగ్‌లు"</string>
     <string name="header_data_and_synchronization" msgid="453920312552838939">"డేటా &amp; సింక్‌"</string>
     <string name="preference_change_password_title" msgid="5465821666939825972">"పాస్‌వర్డ్‌ని మార్చండి"</string>
@@ -3371,7 +3366,7 @@
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"ఆటోమేటిక్ పేమెంట్ యాప్‌ను అప్‌డేట్ చేయండి"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"స్పర్శరహిత టెర్మినల్ వద్ద, <xliff:g id="APP">%1$s</xliff:g> ద్వారా పేమెంట్ చేయండి"</string>
     <string name="nfc_payment_set_default_instead_of" msgid="565237441045013280">"స్పర్శరహిత టెర్మినల్ వద్ద, <xliff:g id="APP_0">%1$s</xliff:g>ద్వారా పేమెంట్ చేయండి. \n\n ఇది మీ ఆటోమేటిక్ పేమెంట్ యాప్‌గా <xliff:g id="APP_1">%2$s</xliff:g>ను రీప్లేస్ చేస్తుంది."</string>
-    <string name="nfc_payment_btn_text_set_deault" msgid="1821065137209590196">"ఆటోమేటిక్ ఆప్షన్‌గా సెట్ చేయండి"</string>
+    <string name="nfc_payment_btn_text_set_deault" msgid="1821065137209590196">"డిఫాల్ట్‌గా సెట్ చేయండి"</string>
     <string name="nfc_payment_btn_text_update" msgid="5159700960497443832">"అప్‌డేట్ చేయండి"</string>
     <string name="restriction_settings_title" msgid="4293731103465972557">"పరిమితులు"</string>
     <string name="restriction_menu_reset" msgid="92859464456364092">"పరిమితులను తీసివేయి"</string>
@@ -3727,7 +3722,7 @@
     <string name="zen_onboarding_settings" msgid="2815839576245114342">"సెట్టింగ్‌లు"</string>
     <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"నోటిఫికేషన్‌లు కనిపించవు, వినిపించవు"</string>
     <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"నోటిఫికేషన్‌ల సౌండ్ రాదు"</string>
-    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"మీరు నోటిఫికేషన్‌లను చూడలేరు లేదా వినలేరు. స్టార్ గుర్తు ఉన్న కాంటాక్ట్‌ల మరియు రిపీట్ కాలర్‌‌ల నుండి కాల్స్‌ అనుమతించబడతాయి."</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"మీరు నోటిఫికేషన్‌లను చూడలేరు లేదా వినలేరు. నక్షత్రం గుర్తు ఉన్న కాంటాక్ట్‌ల మరియు రిపీట్ కాలర్‌‌ల నుండి కాల్స్‌ అనుమతించబడతాయి."</string>
     <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(ప్రస్తుత సెట్టింగ్)"</string>
     <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"అంతరాయం కలిగించవద్దు నోటిఫికేషన్‌ సెట్టింగ్‌లను మార్చాలా?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"ఆఫీస్‌ ప్రొఫైల్ సౌండ్స్"</string>
@@ -4081,7 +4076,7 @@
     <string name="zen_mode_calls_header" msgid="8379225445095856726">"అంతరాయం కలిగించగల కాల్స్‌"</string>
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"అనుమతించిన కాల్స్‌ వచ్చినప్పుడు శబ్దం వస్తుందని నిర్ధారించుకోవడానికి, పరికరం రింగ్ మోడ్‌లో ఉందో లేదో చెక్ చేయండి"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ సంబంధిత‌ ఇన్‌కమింగ్ కాల్స్‌ బ్లాక్ చేయబడ్డాయి. మీ ఫ్రెండ్స్, ఫ్యామిలీ మెంబెర్స్ లేదా ఇతర కాంటాక్ట్‌లు మిమ్మల్ని సంప్రదించగలిగేలా మీరు సెట్టింగ్‌లను సర్దుబాటు చేయవచ్చు."</string>
-    <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"స్టార్ గుర్తు ఉన్న కాంటాక్ట్‌లు"</string>
+    <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"నక్షత్రం గుర్తు ఉన్న కాంటాక్ట్‌లు"</string>
     <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{ఏవీ లేవు}=1{{contact_1}}=2{{contact_1}, {contact_2}}=3{{contact_1}, {contact_2}, {contact_3}}other{{contact_1}, {contact_2}, # మంది ఇతరులు}}"</string>
     <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(పేరు లేదు)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"మెసేజ్‌లు"</string>
@@ -4096,7 +4091,7 @@
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ఎవరైనా"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"కాంటాక్ట్‌లు"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"స్టార్ గుర్తు ఉన్న కాంటాక్ట్‌లు"</string>
-    <string name="zen_calls_summary_starred_repeat" msgid="8078759939219244001">"స్టార్ గుర్తు ఉన్న కాంటాక్ట్‌లు అలాగే రిపీట్ కాలర్‌ల నుండి"</string>
+    <string name="zen_calls_summary_starred_repeat" msgid="8078759939219244001">"నక్షత్రం గుర్తు ఉన్న కాంటాక్ట్‌లు అలాగే రిపీట్ కాలర్‌ల నుండి"</string>
     <string name="zen_calls_summary_contacts_repeat" msgid="2276432091940405376">"కాంటాక్ట్‌లు అలాగే రిపీట్ కాలర్‌ల నుండి"</string>
     <string name="zen_calls_summary_repeat_only" msgid="7748352153193832632">"రిపీట్ కాలర్‌ల నుండి మాత్రమే"</string>
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"ఏవీ లేవు"</string>
@@ -4145,7 +4140,7 @@
     <string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"పునరావృత కాలర్‌లను అనుమతించు"</string>
     <string name="zen_mode_all_callers" msgid="8104755389401941875">"ఎవరైనా"</string>
     <string name="zen_mode_contacts_callers" msgid="5429267704011896833">"కాంటాక్ట్‌లు"</string>
-    <string name="zen_mode_starred_callers" msgid="1002370699564211178">"స్టార్ గుర్తు ఉన్న కాంటాక్ట్‌లు"</string>
+    <string name="zen_mode_starred_callers" msgid="1002370699564211178">"నక్షత్రం గుర్తు ఉన్న కాంటాక్ట్‌లు"</string>
     <string name="zen_mode_repeat_callers_list" msgid="181819778783743847">"పునరావృత కాలర్‌లు"</string>
     <!-- no translation found for zen_mode_calls_summary_one (1928015516061784276) -->
     <skip />
@@ -4400,8 +4395,8 @@
     <string name="additional_permissions_more" msgid="8188145515437525307">"మరో <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="share_remote_bugreport_dialog_title" msgid="1575283098565582433">"బగ్ రిపోర్ట్‌ను షేర్ చేయాలా?"</string>
     <string name="share_remote_bugreport_dialog_message_finished" msgid="4869053468609007680">"మీ ఐటి అడ్మిన్ ఈ పరికరం సమస్యకు పరిష్కారాన్ని కనుగొనడంలో సహాయం కోసం బగ్ రిపోర్ట్‌ను రిక్వెస్ట్ చేశారు. యాప్‌లు మరియు డేటా షేర్ చేయబడవచ్చు."</string>
-    <string name="share_remote_bugreport_dialog_message" msgid="8714439220818865391">"మీ IT అడ్మిన్ ఈ పరికరం సమస్యకు పరిష్కారాన్ని కనుగొనడంలో సహాయం కోసం బగ్ రిపోర్ట్‌ను రిక్వెస్ట్ చేశారు. యాప్‌లు మరియు డేటా షేర్ చేయబడవచ్చు మరియు మీ పరికరం పనితీరు తాత్కాలికంగా నెమ్మదించవచ్చు."</string>
-    <string name="sharing_remote_bugreport_dialog_message" msgid="3523877008096439251">"ఈ బగ్ రిపోర్ట్‌ మీ IT అడ్మిన్‌తో షేర్ చేయబడుతోంది. మరిన్ని వివరాల కోసం వారిని సంప్రదించండి."</string>
+    <string name="share_remote_bugreport_dialog_message" msgid="8714439220818865391">"మీ ఐటి అడ్మిన్ ఈ పరికరం సమస్యకు పరిష్కారాన్ని కనుగొనడంలో సహాయం కోసం బగ్ రిపోర్ట్‌ను రిక్వెస్ట్ చేశారు. యాప్‌లు మరియు డేటా షేర్ చేయబడవచ్చు మరియు మీ పరికరం పనితీరు తాత్కాలికంగా నెమ్మదించవచ్చు."</string>
+    <string name="sharing_remote_bugreport_dialog_message" msgid="3523877008096439251">"ఈ బగ్ రిపోర్ట్‌ మీ ఐటి అడ్మిన్‌తో షేర్ చేయబడుతోంది. మరిన్ని వివరాల కోసం వారిని సంప్రదించండి."</string>
     <string name="share_remote_bugreport_action" msgid="7173093464692893276">"షేర్ చేయి"</string>
     <string name="decline_remote_bugreport_action" msgid="1276509879613158895">"తిరస్కరిస్తున్నాను"</string>
     <string name="usb_use_charging_only" msgid="1743303747327057947">"డేటా బదిలీ లేదు"</string>
@@ -4688,7 +4683,7 @@
     <string name="unrestricted_app_title" msgid="7117585996574329284">"అనియంత్రిత డేటా వినియోగం"</string>
     <string name="unrestricted_app_summary" msgid="282698963532000403">"డేటా సేవర్‌లో అనియంత్రిత డేటా"</string>
     <string name="home_app" msgid="6056850504746902747">"మొదటి స్క్రీన్ యాప్"</string>
-    <string name="no_default_home" msgid="3588073707316139318">"మొదటి స్క్రీన్ కోసం ఆటోమేటిక్ సెట్టింగ్ ఏదీ లేదు"</string>
+    <string name="no_default_home" msgid="3588073707316139318">"డిఫాల్ట్ హోమ్ లేదు"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="4098653943835666086">"సురక్షిత ప్రారంభం"</string>
     <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="311325321794497404">"మీ డివైజ్‌ను ప్రారంభించడానికి ఆకృతి అవసరం. ఆఫ్‌లో ఉన్నప్పుడు, ఈ డివైజ్ కాల్స్‌, మెసేజ్‌లు, నోటిఫికేషన్‌లు లేదా అలారాలను స్వీకరించలేదు."</string>
     <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="1881271630312222251">"మీ డివైజ్‌ను ప్రారంభించడానికి పిన్ అవసరం. ఆఫ్‌లో ఉన్నప్పుడు, ఈ డివైజ్ కాల్స్‌, మెసేజ్‌లు, నోటిఫికేషన్‌లు లేదా అలారాలను స్వీకరించలేదు."</string>
@@ -4822,8 +4817,8 @@
     <string name="legacy_navigation_title" msgid="7877402855994423727">"3-బటన్ నావిగేషన్‌"</string>
     <string name="legacy_navigation_summary" msgid="5905301067778326433">"మీ స్క్రీన్ దిగువన ఉన్న బటన్‌లతో వెనుకకు వెళ్ళండి, హోమ్ స్క్రీన్‌కు వెళ్ళండి అలాగే యాప్‌ల మధ్యన మారండి."</string>
     <string name="keywords_system_navigation" msgid="3131782378486554934">"సిస్టమ్ నావిగేషన్‌, 2 బటన్ నావిగేషన్‌, 3 బటన్ నావిగేషన్‌, సంజ్ఞ నావిగేషన్, స్వైప్"</string>
-    <string name="gesture_not_supported_dialog_message" msgid="5316512246119347889">"ఆటోమేటిక్ ఆప్షన్‌గా మీరు సెట్ చేసిన మొదటి స్క్రీన్ యాప్ <xliff:g id="DEFAULT_HOME_APP">%s</xliff:g> దీనిని సపోర్ట్ చేయదు"</string>
-    <string name="gesture_not_supported_positive_button" msgid="7909969459977021893">"మొదటి స్క్రీన్ కోసం ఆటోమేటిక్‌గా సెట్ చేసిన యాప్‌ను మార్చండి"</string>
+    <string name="gesture_not_supported_dialog_message" msgid="5316512246119347889">"మీ డిఫాల్ట్ హోమ్ యాప్ ద్వారా మద్దతు లేదు, <xliff:g id="DEFAULT_HOME_APP">%s</xliff:g>"</string>
+    <string name="gesture_not_supported_positive_button" msgid="7909969459977021893">"డిఫాల్ట్ హోమ్ యాప్‌ని మార్చండి"</string>
     <string name="assistant_gesture_category_title" msgid="2478251256585807920">"డిజిటల్ అసిస్టెంట్"</string>
     <string name="assistant_corner_gesture_title" msgid="1895061522687002106">"అసిస్టెంట్‌ను అమలు చేయడానికి స్వైప్ చేయండి"</string>
     <string name="assistant_corner_gesture_summary" msgid="7279576276455168075">"డిజిటల్ అసిస్టెంట్ యాప్‌ను అమలు చేయడానికి దిగువున మూల నుండి పైకి స్వైప్ చేయండి."</string>
@@ -5401,6 +5396,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"పవర్ బటన్‌ను హోల్డ్ చేయడం ద్వారా Assistantను ట్రిగ్గర్ చేయండి"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"పవర్ &amp; ఎమర్జెన్సీ మెనూ:\nపవర్ బటన్‌ను, అలాగే వాల్యూమ్ పెంపు బటన్‌ను ఒకే సమయంలో నొక్కండి."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"రింగ్ అవ్వడాన్ని నిరోధించండి:\nవాల్యూమ్ మెనూలో షార్ట్‌కట్ అందుబాటులో ఉంది."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"నొక్కి ఉంచాల్సిన సమయం"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"పవర్ బటన్‌ను ఎంతసేపు నొక్కి ఉంచాలో ఎంచుకోవడం ద్వారా సెన్సిటివిటీని సర్దుబాటు చేయండి"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"తక్కువ నిడివి"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"ఎక్కువ నిడివి"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"వాలెట్‌ను చూపించండి"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"లాక్ స్క్రీన్, త్వరిత సెట్టింగ్‌లు నుండి వాలెట్‌కు యాక్సెస్‌ను అనుమతించండి"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"డివైజ్ కంట్రోల్స్‌ను చూపించండి"</string>
@@ -5446,7 +5445,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"తాత్కాలికంగా అందుబాటులో లేదు"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"సిమ్ లేదు"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"నెట్‌వర్క్ ప్రాధాన్యతలు"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"పబ్లిక్ నెట్‌వర్క్‌లకు కనెక్ట్ అవ్వండి"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"నెట్‌వర్క్ కనెక్షన్, ఇంటర్‌నెట్, వైర్‌లెస్, డేటా, Wi-Fi, Wi-Fi, Wi-Fi, సెల్యూలార్, మొబైల్, సెల్ క్యారియర్, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Wi‑Fiని ఆన్ చేయండి"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Wi-Fiని ఆఫ్ చేయండి"</string>
@@ -5464,6 +5462,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ నెట్‌వర్క్"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"డౌన్‌లోడ్ చేసిన SIM"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"డౌన్‌లోడ్ చేసిన SIMలు"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"యాక్టివ్‌గా ఉంది"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"ఇన్‌యాక్టివ్"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / <xliff:g id="ID_1">%1$s</xliff:g> కోసం ఆటోమేటిక్ సెట్టింగ్"</string>
@@ -5541,6 +5540,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"అన్ని యాప్‌లు, సర్వీస్‌ల కోసం"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"గేమ్ సెట్టింగ్‌లు"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"గేమ్ డ్యాష్‌బోర్డ్ షార్ట్‌కట్ మొదలైనవాటిని ఆన్ చేయండి"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"మునుపటి"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"తర్వాత"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"రంగు ప్రివ్యూ"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM కార్డ్ యాక్సెస్ రిక్వెస్ట్"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"పరికరం మీ SIM కార్డ్‌ను యాక్సెస్ చేయాలనుకుంటోంది. వివరాల కోసం ట్యాప్ చేయండి."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"SIM కార్డ్‌కు యాక్సెస్‌ను అనుమతించాలా?"</string>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index a5ee6e2..bc399ab 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"แคชไว้ (ไคลเอ็นต์กิจกรรม)"</item>
     <item msgid="8186970968968646288">"แคชไว้ (ว่างเปล่า)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"น้ำเงินอมเขียว"</item>
+    <item msgid="7216413848731287689">"สีน้ำเงินเขียว"</item>
     <item msgid="5661027589207588703">"น้ำเงิน"</item>
-    <item msgid="3795787248113275442">"น้ำเงินอมม่วง"</item>
+    <item msgid="1219738214736244749">"สีเขียว"</item>
     <item msgid="6331809026622602308">"ม่วง"</item>
     <item msgid="6390546163902724700">"ชมพู"</item>
-    <item msgid="6618900408138432102">"แดง"</item>
+    <item msgid="6500473130620545980">"สีส้ม"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"เกิน 30 วัน"</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 98815df..1ef9955 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"อีกครั้งหนึ่ง"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"ทำตามไอคอนลายนิ้วมือ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"ยกนิ้วมือเรื่อยๆ เพื่อเพิ่มส่วนอื่นๆ ของลายนิ้วมือ"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"แตะค้างไว้ทุกครั้งที่ไอคอนลายนิ้วมือเคลื่อนไหว การทำเช่นนี้จะช่วยให้บันทึกลายนิ้วมือของคุณได้มากขึ้น"</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"วางปลายนิ้วลงบนเซ็นเซอร์"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"สุดท้าย วางปลายนิ้วของคุณ"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"วางด้านข้างของนิ้วค้างไว้บนเซ็นเซอร์ จากนั้นเปลี่ยนข้าง"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"การทำเช่นนี้จะช่วยให้บันทึกลายนิ้วมือของคุณได้มากขึ้น"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"แตะค้างไว้ทุกครั้งที่ไอคอนลายนิ้วมือเคลื่อนไหว การดำเนินการนี้ช่วยจับภาพลายนิ้วมือทั้งหมดของคุณ"</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"การดำเนินการนี้ช่วยจับภาพลายนิ้วมือทั้งหมดของคุณ"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"กำลังลงทะเบียนลายนิ้วมือ <xliff:g id="PERCENTAGE">%d</xliff:g> เปอร์เซ็นต์"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"เพิ่มลายนิ้วมือแล้ว"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"ตอนนี้คุณสามารถใช้ลายนิ้วมือเพื่อปลดล็อกโทรศัพท์หรือยืนยันว่าเป็นคุณ เช่น เมื่อลงชื่อเข้าใช้แอป"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"การใช้งานระบบใน 24 ชม. ที่ผ่านมา"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"การใช้งานระบบเมื่อ <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"การใช้งานแอปเมื่อ <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"AM"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"PM"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"รวม: ไม่ถึง 1 นาที"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"การทำงานในเบื้องหลัง: ไม่ถึง 1 นาที"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"รวม: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"เรียกให้ Assistant ทำงานโดยกดปุ่มเปิด/ปิดค้างไว้"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"เมนูเปิด/ปิดและกรณีฉุกเฉิน\nกดปุ่มเปิด/ปิดและปุ่มเพิ่มระดับเสียงพร้อมกัน"</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"ป้องกันการส่งเสียง\nมีทางลัดให้ใช้ในเมนูระดับเสียง"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"ระยะเวลาการกดค้าง"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"ปรับความไวโดยเลือกระยะเวลาการกดปุ่มเปิด/ปิดค้างไว้"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"ไม่นาน"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"นาน"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"แสดง Wallet"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"อนุญาตให้เข้าถึง Wallet จากหน้าจอล็อกและการตั้งค่าด่วน"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"แสดงระบบควบคุมอุปกรณ์"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"ไม่พร้อมใช้งานชั่วคราว"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"ไม่มีซิม"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"การตั้งค่าเครือข่าย"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"เชื่อมต่อเครือข่ายสาธารณะ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"การเชื่อมต่อเครือข่าย, อินเทอร์เน็ต, ไร้สาย, อินเทอร์เน็ตมือถือ, wifi, wi-fi, wi fi, เครือข่ายมือถือ, อุปกรณ์เคลื่อนที่, ผู้ให้บริการเครือข่ายมือถือ, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"เปิด Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"ปิด Wi-Fi"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"[W Network]"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"ซิม"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"ซิมที่ดาวน์โหลดมา"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"ซิมที่ดาวน์โหลด"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"ใช้งานอยู่"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"ไม่ใช้งาน"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / ค่าเริ่มต้นสำหรับ<xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"สำหรับแอปและบริการทั้งหมด"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"การตั้งค่าเกม"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"เปิดทางลัดสำหรับแดชบอร์ดเกม ฯลฯ"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"ก่อนหน้า"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"ถัดไป"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"พรีวิวสี"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"คำขอเข้าถึงซิมการ์ด"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"อุปกรณ์หนึ่งต้องการเข้าถึงซิมการ์ดของคุณ แตะเพื่อดูรายละเอียด"</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"อนุญาตให้เข้าถึงซิมการ์ดไหม"</string>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 11f60c0..0e5344f 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Naka-cache (client ng gawain)"</item>
     <item msgid="8186970968968646288">"Naka-cache (walang laman)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Teal"</item>
+    <item msgid="7216413848731287689">"Cyan"</item>
     <item msgid="5661027589207588703">"Asul"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Berde"</item>
     <item msgid="6331809026622602308">"Lila"</item>
     <item msgid="6390546163902724700">"Pink"</item>
-    <item msgid="6618900408138432102">"Pula"</item>
+    <item msgid="6500473130620545980">"Orange"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Higit sa 30 araw"</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 4ad652d..443e723 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Isa pa"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Sundan ang icon ng fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Iangat nang iangat ang iyong daliri para idagdag ang iba\'t ibang bahagi ng fingerprint mo"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Pindutin nang matagal sa tuwing gagalaw ang icon ng fingerprint. Makakatulong itong mas makuha ang iyong fingerprint."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Ilagay ang tip ng iyong daliri sa sensor"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Panghuli, ilagay ang mga dulo ng iyong daliri"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Ilagay ang gilid ng iyong fingerprint sa sensor nang matagal, pagkatapos ay ang kabilang gilid"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Makakatulong itong mas makuha ang iyong fingerprint"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Pindutin nang matagal sa tuwing gagalaw ang icon ng fingerprint. Nakakatulong itong i-capture ang iyong buong fingerprint."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Nakakatulong itong i-capture ang iyong buong fingerprint"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Pag-enroll ng fingerprint: <xliff:g id="PERCENTAGE">%d</xliff:g> porsyento"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Naidagdag na ang fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Ngayon, magagamit mo na ang iyong fingerprint para i-unlock ang telepono mo o i-verify na ikaw ito, tulad ng kapag nagsa-sign in ka sa mga app"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Paggamit ng system sa huling 24 na oras"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Paggamit ng system sa <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Paggamit ng app sa <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"am"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"pm"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Kabuuan: wala pang isang minuto"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Background: wala pang isang minuto"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Kabuuan: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"I-trigger ang Assistant sa pamamagitan ng pagpindot nang matagal sa power button"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Menu ng Power at Emergency:\nPindutin nang magkasabay ang Power at Pataas na volume."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Pigilan ang pag-ring:\nNasa menu ng volume ang shortcut."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Tagal ng pagpindot"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Isaayos ang pagkasensitibo sa pamamagitan ng pagpili kung gaano katagal pipindutin ang power button"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Mabilis"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Matagal"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Ipakita ang wallet"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Payagan ang pag-access sa wallet mula sa lock screen at mga mabilisang setting"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Ipakita ang mga kontrol ng device"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Pansamantalang hindi available"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Walang SIM"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Mga kagustuhan sa network"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Kumonekta sa mga pampublikong network"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"koneksyon ng network, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, cell carrier, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"I-on ang Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"I-off ang Wi-Fi"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ network"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"NA-DOWNLOAD NA SIM"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"MGA NA-DOWNLOAD NA SIM"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Aktibo"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Hindi aktibo"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Default para sa <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Para sa lahat ng app at serbisyo"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Mga setting ng laro"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"I-on ang shortcut ng Game Dashboard, atbp."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Nakaraan"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Susunod"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Preview ng kulay"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Kahilingan sa pag-access sa SIM card"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Gustong i-access ng isang device ang iyong SIM card. I-tap para sa mga detalye."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Payagan ang access sa SIM card?"</string>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index a648491..29c460d 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Önbelleğe alındı (etkinlik istemcisi)"</item>
     <item msgid="8186970968968646288">"Önbelleğe alındı (boş)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Camgöbeği"</item>
+    <item msgid="7216413848731287689">"Camgöbeği"</item>
     <item msgid="5661027589207588703">"Mavi"</item>
-    <item msgid="3795787248113275442">"Çivit mavisi"</item>
+    <item msgid="1219738214736244749">"Yeşil"</item>
     <item msgid="6331809026622602308">"Mor"</item>
     <item msgid="6390546163902724700">"Pembe"</item>
-    <item msgid="6618900408138432102">"Kırmızı"</item>
+    <item msgid="6500473130620545980">"Turuncu"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 günden eski"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 2bdc435..38063fa 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Bir kez daha"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Parmak izi simgesini takip edin"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Parmak izinizin tüm farklı noktalarını eklemek için parmağınızı kaldırıp dokundurmaya devam edin"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Parmak izi simgesi her hareket ettiğinde dokunup basılı tutun. Bu şekilde parmak iziniz daha fazla yakalanabilir"</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Parmağınızın ucunu sensöre yerleştirin"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Son olarak parmağınızın kenarlarını yerleştirin"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Parmak izinizin yan tarafını sensöre yerleştirip basılı tuttuktan sonra diğer tarafa geçin"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Bu şekilde parmak iziniz daha fazla yakalanabilir"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Simge her hareket ettiğinde dokunup basılı tutun. Bu şekilde, parmak izinizin tamamı yakalanabilir."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Bu şekilde, parmak izinizin tamamı yakalanabilir"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Parmak izi kaydı yüzde <xliff:g id="PERCENTAGE">%d</xliff:g>"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Parmak izi eklendi"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Artık telefonunuzun kilidini açmak veya uygulamalarda oturum açma gibi işlemlerde kimliğinizi doğrulamak için parmak izinizi kullanabilirsiniz"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Son 24 saatteki sistem kullanımı"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"<xliff:g id="SLOT">%s</xliff:g> için sistem kullanımı"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"<xliff:g id="SLOT">%s</xliff:g> için uygulama kullanımı"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"öö"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"ös"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Toplam: Bir dakikadan az"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Arka planda: Bir dakikadan az"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Toplam: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Asistan\'ı güç düğmesine uzun basarak açın"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Güç ve Acil Durum Menüsü:\nGüç ve sesi artırma tuşlarına aynı anda basın."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Zili çaldırmayı engelle:\nKısayol, ses düzeyi menüsünde mevcut."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Basılı tutma süresi"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Güç düğmesini ne kadar basılı tutacağınızı belirleyerek hassasiyeti ayarlayın"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Kısa"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Uzun"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Cüzdanı göster"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Kilit ekranından ve hızlı ayarlardan cüzdana erişime izin verin"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Cihaz denetimlerini göster"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Geçici olarak kullanılamıyor"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM kart yok"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Ağ tercihleri"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Herkese açık ağlara bağlan"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ağ bağlantısı, internet, kablosuz, veri, wifi, wi-fi, wi fi, hücresel, mobil, hücresel operatör, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Kablosuz bağlantıyı aç"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Kablosuz bağlantıyı kapat"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ ağı"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"İNDİRİLEN SIM"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"İNDİRİLEN SIM\'LER"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Etkin"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Etkin değil"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / <xliff:g id="ID_1">%1$s</xliff:g> için varsayılan"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Tüm uygulamalar ve hizmetler için"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Oyun ayarları"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Oyun Paneli kısayolu gibi işlevleri açın"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Önceki"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Sonraki"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Renk önizleme"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM karta erişim isteği"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Bir cihaz SIM kartınıza erişmek istiyor. Ayrıntılar için dokunun."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"SIM karta erişime izin verilsin mi?"</string>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 38c1435..6200fd1 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Кеш (дії клієнта)"</item>
     <item msgid="8186970968968646288">"Кеш (порожньо)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Бірюзовий"</item>
+    <item msgid="7216413848731287689">"Блакитний"</item>
     <item msgid="5661027589207588703">"Синій"</item>
-    <item msgid="3795787248113275442">"Індиго"</item>
+    <item msgid="1219738214736244749">"Зелений"</item>
     <item msgid="6331809026622602308">"Фіолетовий"</item>
     <item msgid="6390546163902724700">"Рожевий"</item>
-    <item msgid="6618900408138432102">"Червоний"</item>
+    <item msgid="6500473130620545980">"Оранжевий"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Додані понад 30 днів тому"</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index a266c8a..1c06dc8 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -492,11 +492,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Повторіть"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Стежте за значком відбитка пальця"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Піднімайте палець, щоб додати різні частини відбитка"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Натискайте й утримуйте кожного разу, коли значок відбитка пальця рухається. Це допоможе записати відбиток більшої площі пальця."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Прикладіть кінчик пальця до датчика"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Тепер прикладіть краї пальця"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Прикладіть до датчика і трохи потримайте одну сторону кінчика пальця, а потім зробіть те саме з іншою стороною"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Це допоможе записати відбиток більшої площі пальця"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Натискайте й утримуйте кожного разу, коли значок відбитка пальця рухається. Це допоможе зняти відбиток повністю."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Це допоможе зняти відбиток пальця повністю"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Реєстрацію відбитка пальця завершено на стільки відсотків: <xliff:g id="PERCENTAGE">%d</xliff:g>"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Відбиток додано"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Тепер ви можете за допомогою відбитка пальця розблоковувати телефон або підтверджувати особу, наприклад щоб увійти в додатки"</string>
@@ -2953,8 +2950,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Споживання системою за останні 24 години"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Споживання на роботу системи (<xliff:g id="SLOT">%s</xliff:g>)"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Споживання на роботу додатків (<xliff:g id="SLOT">%s</xliff:g>)"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"дп"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"пп"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Усього: менше ніж хвилина"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"У фоновому режимі: менше ніж хвилина"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Усього: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5578,6 +5573,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Асистент активується, коли ви утримуєте кнопку живлення"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Меню кнопки живлення й екстрених викликів:\nНатисніть одночасно кнопки живлення й збільшення гучності."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Вимкнути звук дзвінка:\nШвидкий запуск функції доступний у меню налаштування гучності."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Тривалість утримання"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Скоригуйте чутливість, указавши, скільки часу потрібно втримувати кнопку живлення"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Коротко"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Довго"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Показати гаманець"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Дозволити доступ до гаманця із заблокованого екрана та швидких налаштувань"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Показувати елементи керування пристроями"</string>
@@ -5623,7 +5622,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Тимчасово недоступно"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Немає SIM-карти"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Налаштування мережі"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Підключатися до загальнодоступних мереж"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"з\'єднання з мережею, Інтернет, бездротове, дані, Wi-Fi, wi-fi, wi fi, мобільний, стільниковий, оператор мобільного зв\'язку, 4G, 3G, 2G, LTE"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Увімкнути Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Вимкнути Wi-Fi"</string>
@@ -5641,6 +5639,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"Мережа W+"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM-карта"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"ЗАВАНТАЖЕНА SIM-КАРТА"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"ЗАВАНТАЖЕНІ SIM-КАРТИ"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Активно"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Неактивно"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / За умовчанням (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
@@ -5718,6 +5717,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Для всіх додатків і сервісів"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Налаштування ігор"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Увімкнути ярлик ігрової панелі тощо"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Назад"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Далі"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Попередній перегляд кольору"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Запити на доступ до SIM-карти"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Пристрій хоче отримати доступ до SIM-карти. Натисніть, щоб дізнатися більше."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Дозволити доступ до SIM-карти?"</string>
diff --git a/res/values-ur/arrays.xml b/res/values-ur/arrays.xml
index e2905a6..cab4c4b 100644
--- a/res/values-ur/arrays.xml
+++ b/res/values-ur/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"کیش کی ہوئی (سرگرمی کلائنٹ)"</item>
     <item msgid="8186970968968646288">"کیش کی ہوئی (خالی)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"color/SIM_color_cyan@"</item>
+    <item msgid="177868870612833388">"color/SIM_color_blue800@"</item>
+    <item msgid="1129898906008357171">"color/SIM_color_green800@"</item>
+    <item msgid="4206364087389793587">"color/SIM_color_purple800@"</item>
+    <item msgid="6728943460061940130">"color/SIM_color_pink800@"</item>
+    <item msgid="968332068361935002">"color/SIM_color_orange@"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"نیلگوں سبز"</item>
+    <item msgid="7216413848731287689">"سیان"</item>
     <item msgid="5661027589207588703">"نیلا"</item>
-    <item msgid="3795787248113275442">"گہرا نیلا"</item>
+    <item msgid="1219738214736244749">"سبز"</item>
     <item msgid="6331809026622602308">"جامنی"</item>
     <item msgid="6390546163902724700">"گلابی"</item>
-    <item msgid="6618900408138432102">"سرخ"</item>
+    <item msgid="6500473130620545980">"اورنج"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 دن سے زیادہ پرانی"</item>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index e70ada8..cc9cfa2 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"ایک بار اور چھوئیں"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"فنگر پرنٹ آئیکن کی پیروی کریں"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"اپنے فنگر پرنٹ کے مختلف حصوں کو شامل کرنے کے لیے اپنی انگلی کو اٹھاتے رہیں"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"ہر بار جب فنگر پرنٹ کا آئیکن حرکت کرتا ہے تو اسے ٹچ کریں اور دبائے رکھیں۔ اس سے آپ کے فنگر پرنٹ کے مزید حصوں کو کیپچر کرنے میں مدد ملے گی۔"</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"سینسر پر اپنی انگلی کے سرے کو رکھیں"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"بالآخر، اپنی انگلی کے کناروں کو رکھیں"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"اپنے فنگر پرنٹ کے حصے کو سینسر پر رکھیں اور دبائے رکھیں پھر، دوسرے حصے پر سوئچ کریں"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"اس سے آپ کے فنگر پرنٹ کے مزید حصوں کو کیپچر کرنے میں مدد ملے گی"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"ہر بار جب فنگر پرنٹ کا آئیکن حرکت کرتا ہے تو اسے ٹچ کریں اور دبائے رکھیں۔ اس سے آپ کے مکمل فنگر پرنٹ کو کیپچر کرنے میں مدد ملتی ہے۔"</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"اس سے آپ کے مکمل فنگر پرنٹ کو کیپچر کرنے میں مدد ملتی ہے"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"فنگر پرنٹ اندراج کرنے کی کارروائی <xliff:g id="PERCENTAGE">%d</xliff:g> فیصد مکمل ہو چکی ہے"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"فنگر پرنٹ شامل ہو گیا"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"اب آپ اپنا فون غیر مقفل کرنے یا یہ توثیق کرنے کے لیے کہ یہ آپ ہی ہیں، اپنا فنگر پرنٹ استعمال کر سکتے ہیں جیسے جب آپ ایپس میں سائن ان کرتے ہیں"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"گزشتہ 24 گھنٹے میں سسٹم کا استعمال"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"<xliff:g id="SLOT">%s</xliff:g> کے لیے سسٹم کا استعمال"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"<xliff:g id="SLOT">%s</xliff:g> کے لیے ایپ کا استعمال"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"am"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"pm"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"کُل: ایک منٹ سے کم"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"پس منظر: ایک منٹ سے کم"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"کُل: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"پاور بٹن کو دبائے رکھ کر اسسٹنٹ کو متحرک کریں"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"پاور اور ایمرجنسی مینو:\nایک ہی وقت میں پاور اور والیوم بڑھانے کا بٹن دبائیں۔"</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"گھنٹی بجنے کو روکیں:\nوالیوم مینو میں شارٹ کٹ دستیاب ہے۔"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"دبانے اور ہولڈ رکھنے کا دورانیہ"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"کتنی دیر تک دبائیں رکھنا ہے اس کا انتخاب کر کے حساسیت کو ایڈجسٹ کریں۔ پاور بٹن کو پکڑیں"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"مختصر ویڈیو"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"طویل"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"والٹ دکھائیں"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"مقفل اسکرین اور فوری ترتیبات سے بٹوے تک رسائی کی اجازت دیں"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"آلے کے کنٹرولز دکھائیں"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"عارضی طور پر دستیاب نہیں ہے"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"‏کوئی SIM نہیں ہے"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"نیٹ ورک کی ترجیحات"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"عوامی نیٹ ورکس سے منسلک ہوں"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"‏نیٹ ورک کنکشن، انٹرنیٹ، وائرلیس، ڈیٹا، wifi، wi-fi، wi fi، سیلولر، موبائل، سیل کیریئر، 4g، 3g، 2g، ‏lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"‏Wi-Fi آن کریں"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"‏Wi-Fi آف کریں"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"‏W+ نیٹ ورک"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"‏ڈاؤن لوڈ کردہ SIM"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"‏ڈاؤن لوڈ کردہ SIMs"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"فعال"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"غیر فعال"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / <xliff:g id="ID_1">%1$s</xliff:g> کے لیے ڈیفالٹ"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"تمام ایپس اور سروسز کے لیے"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"گیم کی ترتیبات"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"گیم ڈیش بورڈ شارٹ کٹ آن کریں، وغیرہ"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"پچھلا"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"اگلا"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"رنگ کا پیش منظر"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"‏SIM کارڈ تک رسائی کی درخواست"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"‏ایک آلہ آپ کے SIM کارڈ تک رسائی حاصل کرنا چاہتا ہے۔ تفصیلات کے ليے تھپتھپائيں۔"</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"‏SIM کارڈ تک رسائی کی اجازت دیں؟"</string>
diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml
index 4686298..58bd2de 100644
--- a/res/values-uz/arrays.xml
+++ b/res/values-uz/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Keshlangan (harakat mijozi)"</item>
     <item msgid="8186970968968646288">"Keshlangan (bo‘sh)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Moviy"</item>
+    <item msgid="7216413848731287689">"Zangori"</item>
     <item msgid="5661027589207588703">"Havorang"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Yashil"</item>
     <item msgid="6331809026622602308">"Siyohrang"</item>
     <item msgid="6390546163902724700">"Pushti"</item>
-    <item msgid="6618900408138432102">"Qizil"</item>
+    <item msgid="6500473130620545980">"Toʻq sariq"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 kundan ortiq"</item>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 1fe9a7f..f23d290 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Yana bir marta"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Barmoq izi belgisini kuzating"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Barmoq izingizni butunlay skanerlash uchun uni biroz suring"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Har safar barmoq izi belgisi harakatlanganda bosib turing. Bu barmoq izingizning toʻliq yozib olinishiga yordam beradi."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Barmogʻingiz uchini sensorga joylang"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Endi barmoqlaringiz chetlarini joylang"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Barmoq izingizning yonlarini sensorga joylashtiring va tutib turing, keyin boshqa yonga almashtiring"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Bu barmoq izingizning toʻliq yozib olinishiga yordam beradi"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Har safar barmoq izi belgisi harakatlanganda bosib turing. Bu barmoq izingizni toʻliq yozib olishga yordam beradi."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Bu barmoq izingizni toʻliq yozib olishga yordam beradi"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
@@ -2879,8 +2876,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Oxirgi 24 soat ichida tizimdan foydalanish"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Tizimdan foydalanish: <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Ilovalardan foydalanish: <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"AM"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"PM"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Jami: bir daqiqadan kam"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Orqa fon rejimida: bir daqiqadan kam"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Jami: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5402,6 +5397,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Assistentni ochish uchun quvvat tugmasini bosib turing"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Quvvat va favqulodda chaqiruvlar tugmasi menyusi:\nBir vaqtda quvvat va tovushni balandlatish.tugmalarini bosib turing."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Chaqiruv ovozini oʻchirish:\nTovush menyusida tezkor ishga tushirish funksiyasi mavjud."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Bosib turish davomiyligi"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Quvvat tugmasi qanchalik uzoq bosib turilishini tanlash orqali sezuvchanlikni sozlang"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Qisqa"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Uzun"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Hamyonni chiqarish"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Ekran qulfi va tezkor sozlamalardan hamyonga kirish uchun ruxsat bering"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Qurilma boshqaruv elementlarini chiqarish"</string>
@@ -5447,7 +5446,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Vaqtinchalik mavjud emas"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM kartasiz"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Tarmoqqa ulanish sozlamalari"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Ochiq tarmoqlarga ulanish"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"tarmoq aloqasi, internet, simsiz, aloqa, wifi, wi-fi, wi fi, mobil, mobile, mobil tarmoq operatori, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Wi‑Fi aloqasini yoqish"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Wi-Fi aloqasini uzish"</string>
@@ -5465,6 +5463,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ tarmoq"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"YUKLAB OLINGAN SIM KARTA"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"YUKLAB OLINGAN SIM KARTALAR"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Faol"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Nofaol"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / <xliff:g id="ID_1">%1$s</xliff:g> uchun birlamchi"</string>
@@ -5542,6 +5541,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Barcha ilovalar va xizmatlar uchun"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Oʻyin sozlamalari"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Oʻyinlar boshqaruv paneli va boshqa yorliqlarni yoqish"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Avvalgisi"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Keyingisi"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Ranglarga razm solish"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM kartaga ruxsat soʻrovi"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Qurilma SIM kartangizga ruxsat olmoqchi. Batafsil."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"SIM kartaga ruxsat berilsinmi?"</string>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 69d29c3..8674388 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Được lưu trong bộ nhớ đệm (máy khách hoạt động)"</item>
     <item msgid="8186970968968646288">"Được lưu trong bộ nhớ đệm (trống)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Xanh két"</item>
+    <item msgid="7216413848731287689">"Xanh lục lam"</item>
     <item msgid="5661027589207588703">"Lam"</item>
-    <item msgid="3795787248113275442">"Chàm"</item>
+    <item msgid="1219738214736244749">"Xanh lục"</item>
     <item msgid="6331809026622602308">"Tía"</item>
     <item msgid="6390546163902724700">"Hồng"</item>
-    <item msgid="6618900408138432102">"Đỏ"</item>
+    <item msgid="6500473130620545980">"Cam"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Cách đây hơn 30 ngày"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 2ea1b6e..907df46 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Vui lòng chạm lần nữa"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Đi theo biểu tượng vân tay"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Tiếp tục nhấc ngón tay để thêm các phần khác của vân tay"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Chạm và giữ mỗi khi biểu tượng vân tay di chuyển. Thao tác này giúp ghi lại được nhiều vân tay hơn."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Đặt đầu ngón tay lên cảm biến"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Cuối cùng, đặt các cạnh của ngón tay"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Đặt vân tay ở phần bên của ngón tay lên cảm biến rồi giữ, sau đó chuyển sang phần bên kia"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Thao tác này giúp ghi lại được nhiều vân tay hơn"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Chạm và giữ mỗi khi biểu tượng vân tay di chuyển. Thao tác này giúp chụp toàn bộ vân tay của bạn."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Thao tác này giúp chụp toàn bộ vân tay của bạn"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
@@ -2879,8 +2876,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Mức sử dụng pin của hệ thống trong 24 giờ qua"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Mức sử dụng pin của hệ thống trong <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Mức sử dụng pin của ứng dụng trong <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"sáng"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"chiều"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Tổng: chưa đến 1 phút"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Ở chế độ nền: chưa đến 1 phút"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Tổng: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5402,6 +5397,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Giữ nút nguồn để kích hoạt Trợ lý"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Trình đơn nguồn và Trình đơn khẩn cấp:\nNhấn đồng thời Nút nguồn và Nút tăng âm lượng."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Ngăn đổ chuông:\nPhím tắt có sẵn trong trình đơn âm lượng."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Khoảng thời gian nhấn và giữ"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Điều chỉnh độ nhạy bằng cách chọn khoảng thời gian nhấn và giữ nút nguồn"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Ngắn"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Dài"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Hiện ví"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Cho phép truy cập vào ví từ màn hình khóa và phần cài đặt nhanh"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Hiện các nút điều khiển thiết bị"</string>
@@ -5447,7 +5446,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Tạm thời không sử dụng được"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Không có SIM"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Lựa chọn ưu tiên về mạng"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Kết nối với mạng công cộng"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"kết nối mạng, Internet, không dây, dữ liệu, wifi, wi-fi, wi fi, di động, nhà mạng di động, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Bật Wi‑Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Tắt Wi-Fi"</string>
@@ -5465,6 +5463,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"Mạng W+"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"SIM ĐÃ TẢI XUỐNG"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"SIM ĐÃ TẢI XUỐNG"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Đang hoạt động"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Không hoạt động"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Mặc định cho <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5542,6 +5541,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Đối với tất cả các ứng dụng và dịch vụ"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Cài đặt trò chơi"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Bật lối tắt trên Trang tổng quan trò chơi, v.v."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Trước"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Tiếp theo"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Xem trước màu"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Yêu cầu truy cập vào thẻ SIM"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Một thiết bị muốn truy cập vào thẻ SIM của bạn. Hãy nhấn để xem thông tin chi tiết."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Cho phép truy cập vào thẻ SIM?"</string>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 91a864e..3b9dcf5 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"已缓存（Activity 客户端）"</item>
     <item msgid="8186970968968646288">"已缓存（空）"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"蓝绿色"</item>
+    <item msgid="7216413848731287689">"青色"</item>
     <item msgid="5661027589207588703">"蓝色"</item>
-    <item msgid="3795787248113275442">"靛青色"</item>
+    <item msgid="1219738214736244749">"绿色"</item>
     <item msgid="6331809026622602308">"紫色"</item>
     <item msgid="6390546163902724700">"粉红色"</item>
-    <item msgid="6618900408138432102">"红色"</item>
+    <item msgid="6500473130620545980">"橙色"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"超过 30 天"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 1984c6d..4dddb40 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"再试一次"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"跟随指纹图标重复轻触指纹传感器"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"不时地移开手指，以便传感器更完整地记录下您的指纹"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"每次指纹图标移动时，请轻触并按住它。这有助于捕获您更完整的指纹。"</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"将指尖放在传感器上"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"最后，放上手指边缘"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"将指纹的一侧放在传感器上并按住，然后切换另一侧"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"这有助于捕获您更完整的指纹"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"每次指纹图标移动时，请轻触并按住它。这样做有助于获取您的完整指纹。"</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"这样做有助于获取您的完整指纹"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"指纹注册进度为百分之 <xliff:g id="PERCENTAGE">%d</xliff:g>"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"指纹已添加"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"现在您可以使用指纹来解锁手机或验证自己的身份，例如在登录应用时"</string>
@@ -2877,8 +2874,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"过去 24 小时内的系统耗电量"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"<xliff:g id="SLOT">%s</xliff:g>的系统耗电量"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"<xliff:g id="SLOT">%s</xliff:g>的应用耗电量"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"上午"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"下午"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"总计：不到 1 分钟"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"后台：不到 1 分钟"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"总计：<xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5400,6 +5395,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"长按电源按钮即可启动 Google 助理"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"“电源和急救信息”菜单：\n同时按电源按钮和音量调高按钮。"</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"阻止响铃：\n音量菜单中提供了快捷方式。"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"按住电源按钮的持续时间"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"通过选择按住电源按钮的持续时间来调节灵敏度"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"短"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"长"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"显示电子钱包"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"允许从锁定屏幕和快捷设置使用电子钱包"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"显示设备控制器"</string>
@@ -5445,7 +5444,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"暂时无法使用"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"没有 SIM 卡"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"网络偏好设置"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"连接到公共网络"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"网络连接, 互联网, 无线, 数据, WiFi, Wi-Fi, Wi Fi, WLAN, 移动网络, 移动, 手机运营商, 4G, 3G, 2G, LTE"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"开启 WLAN"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"关闭 WLAN"</string>
@@ -5463,6 +5461,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ 网络"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM 卡"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"已下载的 SIM 卡"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"已下载的 SIM 卡"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"使用中"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"未使用"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" /<xliff:g id="ID_1">%1$s</xliff:g>默认配置"</string>
@@ -5540,6 +5539,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"适用于所有应用和服务"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"游戏设置"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"开启游戏信息中心快捷方式等"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"上一页"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"下一页"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"颜色预览"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM 卡访问请求"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"有一部设备想访问您的 SIM 卡。点按可了解详情。"</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"要允许访问 SIM 卡吗？"</string>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index 74d2bf5..a06b840 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"快取 (活動使用者端)"</item>
     <item msgid="8186970968968646288">"快取 (清空)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"藍綠色"</item>
+    <item msgid="7216413848731287689">"藍綠色"</item>
     <item msgid="5661027589207588703">"藍色"</item>
-    <item msgid="3795787248113275442">"靛藍色"</item>
+    <item msgid="1219738214736244749">"綠色"</item>
     <item msgid="6331809026622602308">"紫色"</item>
     <item msgid="6390546163902724700">"粉紅色"</item>
-    <item msgid="6618900408138432102">"紅色"</item>
+    <item msgid="6500473130620545980">"橙色"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"超過 30 天"</item>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index dcef313..d46b94f 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"再試一次"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"跟從指紋圖示輕觸指紋感應器"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"手指重覆按壓，記錄指紋各個部分"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"每次指紋圖示移動時按住。此操作可擷取您更完整的指紋。"</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"將指尖放在感應器上"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"最後，請放置手指邊緣"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"將指紋一側放在感應器上並按住，然後轉換另一側"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"此操作可擷取您更完整的指紋"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"每次指紋圖示移動時按住。此操作可擷取您的完整指紋。"</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"此操作可擷取您的完整指紋"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
@@ -2880,8 +2877,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"系統在過去 24 小時的電量"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"<xliff:g id="SLOT">%s</xliff:g>的系統電池用量"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"<xliff:g id="SLOT">%s</xliff:g>的應用程式電池用量"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"上午"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"下午"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"總計：不足 1 分鐘"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"背景：不足 1 分鐘"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"總計：<xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5403,6 +5398,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"按住開關按鈕即可啟動「Google 助理」"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"電源和緊急選單：\n同時按下「電源」和「調高音量」。"</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"暫停響鈴：\n音量選單提供快速鍵。"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"按住開關按鈕的時間長度"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"選擇按住開關按鈕的時間長度即可調整靈敏度"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"短"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"長"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"顯示電子錢包"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"允許在上鎖畫面和快速設定使用電子錢包"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"顯示裝置控制"</string>
@@ -5448,7 +5447,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"暫時無法使用"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"沒有 SIM 卡"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"網絡偏好設定"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"連接公共網絡"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"網絡連線, 互聯網, 無線, 數據, Wi-Fi, 流動網絡, 流動裝置, 流動網絡供應商, 4G, 3G, 2G, LTE"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"開啟 Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"關閉 Wi-Fi"</string>
@@ -5466,6 +5464,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ 網絡"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM 卡"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"已下載的 SIM 卡"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"已下載的 SIM 卡"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"已啟用"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"未啟用"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" /<xliff:g id="ID_1">%1$s</xliff:g>的預設設定"</string>
@@ -5543,6 +5542,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"所有應用程式和服務"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"遊戲設定"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"開啟遊戲資訊主頁捷徑等等"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"返回"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"繼續"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"顏色預覽"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM 卡存取要求"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"有裝置想存取 SIM 卡。輕按即可瞭解詳情。"</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"要允許存取 SIM 卡嗎？"</string>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index a23587a..347c447 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"快取 (活動用戶端)"</item>
     <item msgid="8186970968968646288">"快取 (清空)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"藍綠色"</item>
+    <item msgid="7216413848731287689">"青色"</item>
     <item msgid="5661027589207588703">"藍色"</item>
-    <item msgid="3795787248113275442">"靛藍色"</item>
+    <item msgid="1219738214736244749">"綠色"</item>
     <item msgid="6331809026622602308">"紫色"</item>
     <item msgid="6390546163902724700">"粉紅色"</item>
-    <item msgid="6618900408138432102">"紅色"</item>
+    <item msgid="6500473130620545980">"橘色"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"超過 30 天"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 05d211e..3c2cf9f 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -304,7 +304,7 @@
     </plurals>
     <string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"載入中…"</string>
     <string name="location_settings_footer_general" msgid="1040507068701188821">"如果應用程式具有鄰近裝置權限，就能判斷已連結裝置的相對位置。"</string>
-    <string name="location_settings_footer_location_off" msgid="8568995909147566720">"應用程式和服務的位置存取權已關閉。當你撥打或傳訊息到緊急電話號碼時，系統仍會將你的裝置位置資訊傳送給緊急應變人員。"</string>
+    <string name="location_settings_footer_location_off" msgid="8568995909147566720">"應用程式和服務的位置存取權已關閉。當你撥打緊急電話號碼時 (或是傳送訊息給對方時)，系統仍會將你的裝置位置資訊傳送給緊急應變人員。"</string>
     <string name="location_settings_footer_learn_more_content_description" msgid="5329024810729665156">"進一步瞭解位置資訊設定。"</string>
     <string name="account_settings_title" msgid="9138880127246241885">"帳戶"</string>
     <string name="security_settings_title" msgid="6710768415432791970">"安全性"</string>
@@ -448,7 +448,7 @@
     <string name="security_settings_biometric_preference_summary_none_enrolled" msgid="6941188982863819389">"輕觸即可設定"</string>
     <string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"已新增臉孔和指紋"</string>
     <string name="security_settings_biometric_preference_summary_both_fp_single" msgid="684409535278676426">"已新增臉孔和指紋"</string>
-    <string name="biometric_settings_intro" msgid="4263069383955676756">"設定人臉解鎖和指紋解鎖功能時，如果你戴著口罩或人在昏暗的地方，手機會要求你提供指紋"</string>
+    <string name="biometric_settings_intro" msgid="4263069383955676756">"如果你設定了人臉解鎖和指紋解鎖功能，當你戴著口罩或人在昏暗的地方時，手機會要求你使用指紋解鎖"</string>
     <string name="biometric_settings_category_ways_to_unlock" msgid="3384767901580915266">"解鎖方式"</string>
     <string name="biometric_settings_category_ways_to_use" msgid="2730401752914580200">"臉孔和指紋的用途"</string>
     <string name="biometric_settings_use_biometric_unlock_phone" msgid="2002278066540969480">"將手機解鎖"</string>
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"再一次"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"依照指紋圖示重複按下手指"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"重覆按壓指紋感應器，以建立完整的指紋檔案"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"請依照指紋圖示的移動方式重複按下手指。這樣做可以擷取更多指紋。"</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"將指尖放上感應器"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"最後，請將手指邊緣放上感應器"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"將指紋的一側放上感應器並按住，然後再換另一側"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"這樣做可以擷取更多指紋"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"請依照指紋圖示的移動方式重複按下手指。這麼做可擷取你的完整指紋。"</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"這麼做可擷取你的完整指紋"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
@@ -636,7 +633,7 @@
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"螢幕鎖定"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5799070517574360310">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / 休眠後立即啟動"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4572132216801894216">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / 休眠 <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g>後"</string>
-    <string name="unlock_set_unlock_launch_picker_title_profile" msgid="7631371082326055429">"工作資料夾鎖定方式"</string>
+    <string name="unlock_set_unlock_launch_picker_title_profile" msgid="7631371082326055429">"工作資料夾鎖定"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="4746783679112447948">"變更鎖定畫面"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="6023813780512501969">"變更或停用圖案、PIN 或密碼安全性"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="1699993191343299179">"選擇你要鎖定螢幕的方式"</string>
@@ -2879,8 +2876,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"系統在過去 24 小時的電池用量"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"<xliff:g id="SLOT">%s</xliff:g>的系統電池用量"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"<xliff:g id="SLOT">%s</xliff:g>的應用程式電池用量"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"上午"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"下午"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"總計：不到 1 分鐘"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"背景：不到 1 分鐘"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"總計：<xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5402,6 +5397,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"按住電源按鈕一段時間即可啟動 Google 助理"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"電源按鈕和緊急功能選單：\n同時按下電源鍵和調高音量鍵。"</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"暫停響鈴：\n音量按鈕選單裡有這項功能的捷徑。"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"按住電源鍵的時間長度"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"選擇按住電源鍵的時間長度即可調整靈敏度"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"短"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"長"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"顯示電子錢包"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"允許從螢幕鎖定畫面和快速設定選單中使用電子錢包"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"顯示裝置控制"</string>
@@ -5447,7 +5446,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"暫時無法使用"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"沒有 SIM 卡"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"網路偏好設定"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"連線至公用網路"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"網路連線, 網際網路, 無線, 行動數據, wifi, wi-fi, wi fi, 行動網路, 行動, 電信業者, 4g, 3g, 2g, lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"開啟 Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"關閉 Wi-Fi"</string>
@@ -5465,6 +5463,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"W+ 網路"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM 卡"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"已下載的 SIM 卡"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"已下載的 SIM 卡"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"已啟用"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"未啟用"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / <xliff:g id="ID_1">%1$s</xliff:g>的預設設定"</string>
@@ -5542,6 +5541,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"適用於所有應用程式和服務"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"遊戲設定"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"開啟遊戲資訊主頁捷徑等等"</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"返回"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"繼續"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"顏色預覽"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM 卡存取要求"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"有裝置想要存取 SIM 卡。輕觸即可瞭解詳情。"</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"要允許存取 SIM 卡嗎？"</string>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index c498737..e3bd1fe 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Kulondoloziwe (iklayenti lomsebenzi)"</item>
     <item msgid="8186970968968646288">"Kulondoloziwe (lutho)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Okuluhlaza ngokujiyile"</item>
+    <item msgid="7216413848731287689">"I-Cyan"</item>
     <item msgid="5661027589207588703">"Okuluhlaza okwesibhakabhaka"</item>
-    <item msgid="3795787248113275442">"I-Indigo"</item>
+    <item msgid="1219738214736244749">"Okuluhlaza"</item>
     <item msgid="6331809026622602308">"Phephuli"</item>
     <item msgid="6390546163902724700">"Ophinki"</item>
-    <item msgid="6618900408138432102">"Okubomvu"</item>
+    <item msgid="6500473130620545980">"Olintshi"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Ngaphezulu kobudala obuyizinsuku ezingu-30"</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index d5591dc..4fc0d84 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -484,11 +484,8 @@
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Kanye futhi"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Landela isithonjana sezigxivizo zeminwe"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Qhubeka nokuphakamisa umunwe wakho ukuze ungeze izingxenye ezahlukahlukene zezigxiviso zeminwe zakho"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Thinta uphinde ubambe isikhathi lapho isithonjana sesigxivizo somunwe sinyakaza khona. Lokhu kusiza ukuthatha iningi lesigxivizo sakho somunwe."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Beka ithiphu yomunwe wakho kunzwa"</string>
-    <string name="security_settings_udfps_enroll_edge_title" msgid="2969257985923971906">"Ekugcineni, beka imiphetho yomunwe wakho"</string>
-    <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Beka uhlangothi lwesigxivizo sakho somunwe kunzwa uphinde ubambe, bese ushintshela kolunye uhlangothi"</string>
-    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"Lokhu kusiza ukuthatha iningi lwesigxivizo sakho somunwe"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="8982595794258965437">"Thinta uphinde ubambe isikhathi ngasinye lapho isithonjana sezigxivizo zomunwe sihamba. Lokhu kusiza ukuthatha izigxivizo zakho zeminwe eziphelele."</string>
+    <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="7869449488918552551">"Lokhu kusiza ukuthatha izigxivizo zakho zeminwe eziphelele"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Iphesenti elingu-<xliff:g id="PERCENTAGE">%d</xliff:g> lokubhalisela izigxivizo zeminwe"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Izigxivizo zeminwe zingeziwe"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Manje ungasebenzisa isigxivizo sakho seminwe ukuze uvule ifoni yakho noma uqinisekise ukuthi unguwe, njengalapho ungena khona ngemvume kuma-app"</string>
@@ -2878,8 +2875,6 @@
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Ukusetshenziswa kwesistimu emahoreni angama-24 adlule"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Ukusetshenziswa kwesistimu nge-<xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"Ukusetshenziswa kwe-app nge-<xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_time_am" msgid="7783773965475697655">"am"</string>
-    <string name="battery_usage_time_pm" msgid="1534468528902328570">"pm"</string>
     <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Ingqikithi: ngaphansi komzuzu"</string>
     <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Ingemuva: ngaphansi komzuzu"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Inani: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -5401,6 +5396,10 @@
     <string name="power_menu_long_press_for_assist_summary" msgid="8251928804984560312">"Cupha Umsizi ngokubamba inkinobho yamandla"</string>
     <string name="power_menu_power_volume_up_hint" msgid="1733051433583045623">"Imenyu Yamandla Nesimo Esiphuthumayo:\nCindezela Amandla Nevolumu Phezulu ngesikhathi esifanayo."</string>
     <string name="power_menu_power_prevent_ringing_hint" msgid="5786494894009727654">"Nqabela ukukhalisa:\nIsifushaniso sitholakala kwimenyu yevulumu."</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_title" msgid="1626808509158422185">"Isikhathi sokucindezela futhi ubambe"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Lungisa ukuzwela ngokukhetha ukuthi uyicindezela futhi ubambe isikhathi esingakanani inkinobho yamandla"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Okufushane"</string>
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Kude"</string>
     <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Bonisa i-wallet"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="5388868513484652431">"Vumela ukufinyelela ku-wallet kusikrini sokukhiya namasethingi asheshayo"</string>
     <string name="lockscreen_privacy_controls_setting_toggle" msgid="7445725343949588613">"Bonisa izilawuli zensiza"</string>
@@ -5446,7 +5445,6 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Akutholakali okwesikhashana"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Ayikho i-SIM"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Okuncamelayo kwenethiwekhi"</string>
-    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Xhuma kumanethiwekhi asesidlangalaleni"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"uxhumano lenethiwekhi, i-inthanethi, okungenantambo, idatha, i-wifi, i-wi-fi, i-wi fi, iselula, iselula, inkampani yekholi, i-4g, i-3g, i-2g, i-lte"</string>
     <string name="turn_on_wifi" msgid="4868116014727533668">"Vula i-Wi-Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Vala i-WiFi"</string>
@@ -5464,6 +5462,7 @@
     <string name="carrier_wifi_network_title" msgid="5461382943873831770">"Inethiwekhi ye-W+"</string>
     <string name="sim_category_title" msgid="2341314000964710495">"SIM"</string>
     <string name="downloaded_sim_category_title" msgid="8611467223348446658">"I-SIM EDAWUNILODIWE"</string>
+    <string name="downloaded_sims_category_title" msgid="8779223441781763315">"AMA-SIM ADAWUNILODIWE"</string>
     <string name="sim_category_active_sim" msgid="1503823567818544012">"Kuyasebenza"</string>
     <string name="sim_category_inactive_sim" msgid="4068899490133820881">"Akusebenzi"</string>
     <string name="sim_category_default_active_sim" msgid="1208194173387987231">" / Okuzenzakalelayo kwe-<xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -5541,6 +5540,9 @@
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Kwawo wonke ama-app namasevisi"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Amasethingi egeyimu"</string>
     <string name="game_settings_summary" msgid="2548056479103747555">"Vula isinqamuleli Sedeshibhodi Yegeyimu, njjl."</string>
+    <string name="previous_page_content_description" msgid="6438292457923282991">"Okwangaphambilini"</string>
+    <string name="next_page_content_description" msgid="1641835099813416294">"Okulandelayo"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Ukubuka kuqala umbala"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"Isicelo sokufinyelela se-SIM card"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"Idivayisi ifuna ukufinyelela i-SIM card yakho. Thepha ukuze uthole imininingwane"</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Vumela ukufinyelela ku-SIM card?"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 7d6745c..97c6a54 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1179,14 +1179,24 @@
         <item>Cached (empty)</item>
     </string-array>
 
+    <!-- Array of color for sim color for multi-sim in light mode -->
+    <string-array name="sim_color_light">
+        <item>@color/SIM_color_cyan</item>
+        <item>@color/SIM_color_blue800</item>
+        <item>@color/SIM_color_green800</item>
+        <item>@color/SIM_color_purple800</item>
+        <item>@color/SIM_color_pink800</item>
+        <item>@color/SIM_color_orange</item>
+    </string-array>
+
     <!-- Array of titles for sim color for multi-sim -->
     <string-array name="color_picker">
-        <item>Teal</item>
+        <item>Cyan</item>
         <item>Blue</item>
-        <item>Indigo</item>
+        <item>Green</item>
         <item>Purple</item>
         <item>Pink</item>
-        <item>Red</item>
+        <item>Orange</item>
     </string-array>
 
     <!-- Automatic storage management settings. The amount of days for the automatic storage manager
diff --git a/res/values/colors.xml b/res/values/colors.xml
index adee07c..2114b96 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -184,13 +184,21 @@
     <color name="SIM_color_pink">#ffc2185b</color> <!-- Material Pink 700 -->
     <color name="SIM_color_red">#ffd32f2f</color> <!-- Material Red 700 -->
 
+    <!-- SIM colors updated for GAR -->
+    <color name="SIM_color_cyan">#ff006D74</color> <!-- Material Custom Cyan -->
+    <color name="SIM_color_blue800">#ff185ABC</color> <!-- Material Blue 800 -->
+    <color name="SIM_color_green800">#ff137333</color> <!-- Material Green 800 -->
+    <color name="SIM_color_purple800">#ff7627bb</color> <!-- Material Purple 800 -->
+    <color name="SIM_color_pink800">#ffb80672</color> <!-- Material Pink 800 -->
+    <color name="SIM_color_orange">#ff995400</color> <!-- Material Custom Orange -->
+
     <!-- Dark mode SIM colors -->
-    <color name="SIM_dark_mode_color_teal">#ff80cbc4</color> <!-- Material Teal 200 -->
-    <color name="SIM_dark_mode_color_blue">#ff90caf9</color> <!-- Material Blue 200 -->
-    <color name="SIM_dark_mode_color_indigo">#ffc5cae9</color> <!-- Material Indigo 100 -->
-    <color name="SIM_dark_mode_color_purple">#ffe1bee7</color> <!-- Material Purple 100 -->
-    <color name="SIM_dark_mode_color_pink">#fff48fb1</color> <!-- Material Pink 200 -->
-    <color name="SIM_dark_mode_color_red">#ffef9a9a</color> <!-- Material Red 200 -->
+    <color name="SIM_dark_mode_color_cyan">#ff4DD0E1</color> <!-- Material Cyan 300 -->
+    <color name="SIM_dark_mode_color_blue">#ff8AB4F8</color> <!-- Material Blue 300 -->
+    <color name="SIM_dark_mode_color_green">#ff81C995</color> <!-- Material Green 300 -->
+    <color name="SIM_dark_mode_color_purple">#ffC58AF9</color> <!-- Material Purple 300 -->
+    <color name="SIM_dark_mode_color_pink">#ffff8bcb</color> <!-- Material Pink 300 -->
+    <color name="SIM_dark_mode_color_orange">#fffcad70</color> <!-- Material Orange 300 -->
 
     <!-- Top app bar colors -->
     <color name="color_surface_header">@*android:color/surface_header_light</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 1b8179a..7a75883 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -437,7 +437,7 @@
     <dimen name="chartview_text_padding">6dp</dimen>
     <dimen name="chartview_divider_width">1dp</dimen>
     <dimen name="chartview_divider_height">4dp</dimen>
-    <dimen name="chartview_trapezoid_radius">3dp</dimen>
+    <dimen name="chartview_trapezoid_radius">5dp</dimen>
     <dimen name="chartview_trapezoid_margin_start">1dp</dimen>
     <dimen name="chartview_trapezoid_margin_bottom">2dp</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 802a284..74b8d7f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -726,6 +726,7 @@
     <string name="security_dashboard_summary">Screen lock, Find My Device, app security</string>
 
     <!-- Face enrollment and settings --><skip />
+    <!-- Note: Update FaceEnrollParentalConsent.CONSENT_STRING_RESOURCES when any _consent_ strings are added or removed. -->
     <!-- Message shown in summary field when face unlock is set up. [CHAR LIMIT=40] -->
     <string name="security_settings_face_preference_summary">Face added</string>
     <!-- Message shown in summary field when Face Unlock is not set up. [CHAR LIMIT=54] -->
@@ -879,6 +880,7 @@
     <string name="security_settings_face_settings_context_subtitle">Use Face Unlock to unlock your phone</string>
 
     <!-- Fingerprint enrollment and settings --><skip />
+    <!-- Note: Update FingerprintEnrollParentalConsent.CONSENT_STRING_RESOURCES when any _consent_ strings are added or removed. -->
     <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
     <string name="security_settings_fingerprint_preference_title">Fingerprint</string>
     <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
@@ -6158,6 +6160,12 @@
     <string name="battery_tip_limited_temporarily_title">Charging temporarily limited</string>
     <!-- Summary for the battery limited temporarily tip [CHAR LIMIT=NONE] -->
     <string name="battery_tip_limited_temporarily_summary">To preserve your battery. Learn more.</string>
+    <!-- Text of battery limited temporarily tip resume charge button. [CHAR LIMIT=NONE] -->
+    <string name="battery_tip_limited_temporarily_dialog_resume_charge">Resume charging</string>
+    <!-- Message of battery limited temporarily tip. [CHAR LIMIT=NONE] -->
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="default">In certain conditions, like high temperatures and long charging periods, charging may be limited to <xliff:g id="percent" example="50%">%1$s</xliff:g> to help preserve battery health.\n\nWhen those conditions end, your phone will automatically charge normally.</string>
+    <!-- Message of battery limited temporarily tip. [CHAR LIMIT=NONE] -->
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet">In certain conditions, like high temperatures and long charging periods, charging may be limited to <xliff:g id="percent" example="50%">%1$s</xliff:g> to help preserve battery health.\n\nWhen those conditions end, your tablet will automatically charge normally.</string>
     <!-- Message for battery tip dialog to show the status about the battery [CHAR LIMIT=NONE] -->
     <string name="battery_tip_dialog_message" product="default">Because you’ve used your phone more than usual, your battery may run out sooner than it normally would.\n\nApps using most battery:</string>
     <!-- Message for battery tip dialog to show the status about the battery [CHAR LIMIT=NONE] -->
@@ -6620,10 +6628,6 @@
     <string name="battery_system_usage_for">System usage for <xliff:g id="slot">%s</xliff:g></string>
     <!-- [CHAR_LIMIT=NONE] Battery app usage section header -->
     <string name="battery_app_usage_for">App usage for <xliff:g id="slot">%s</xliff:g></string>
-    <!-- [CHAR_LIMIT=NONE] Battery usage section header for a specific time slot -->
-    <string name="battery_usage_time_am">am</string>
-    <!-- [CHAR_LIMIT=NONE] Battery usage section header for a specific time slot -->
-    <string name="battery_usage_time_pm">pm</string>
     <!-- [CHAR_LIMIT=NONE] Battery usage item for total usage time less than a minute -->
     <string name="battery_usage_total_less_than_one_minute">Total: less than a min</string>
     <!-- [CHAR_LIMIT=NONE] Battery usage item for total background time less than a minute -->
@@ -7956,9 +7960,13 @@
     <!-- Enhaced 4G LTE Mode title for carriers who want to show 4G Calling.  [CHAR LIMIT=50] -->
     <string name="enhanced_4g_lte_mode_title_4g_calling">4G Calling</string>
     <!-- Enhaced 4G LTE Mode summary.  [CHAR LIMIT=100] -->
-    <string name="enhanced_4g_lte_mode_summary">Use LTE services to improve voice and other communications (recommended)</string>
+    <string name="enhanced_4g_lte_mode_summary">Use LTE services to improve voice calls (recommended)</string>
     <!-- Enhaced 4G LTE Mode summary for 4g calling.  [CHAR LIMIT=100] -->
-    <string name="enhanced_4g_lte_mode_summary_4g_calling">Use 4G services to improve voice and other communications (recommended)</string>
+    <string name="enhanced_4g_lte_mode_summary_4g_calling">Use 4G services to improve voice calls (recommended)</string>
+    <!-- NR advanced calling(VoNR or Vo5G) title.  [CHAR LIMIT=50] -->
+    <string name="nr_advanced_calling_title">Vo5G</string>
+    <!-- NR advanced calling(VoNR or Vo5G) summary.  [CHAR LIMIT=NONE] -->
+    <string name="nr_advanced_calling_summary">Use 5G for voice calls</string>
     <!-- Title of a preference determining whether or not the user has allowed the device to share
          their contacts' phone numbers with their carrier in order to implement contact discovery,
          which is a service that exchanges contacts with the carrier to determine if your
@@ -8353,6 +8361,9 @@
     <!-- List of synonyms for the enhance 4G LTE titles, used to match in settings search [CHAR LIMIT=NONE] -->
     <string name="keywords_enhance_4g_lte">volte, advanced calling, 4g calling</string>
 
+    <!-- List of synonyms for the NR advanced calling(VoNR or Vo5G) titles, used to match in settings search [CHAR LIMIT=NONE] -->
+    <string name="keywords_nr_advanced_calling">vo5g, vonr, advanced calling, 5g calling</string>
+
     <!-- List of synonyms for add language, used to match in settings search [CHAR LIMIT=NONE] -->
     <string name="keywords_add_language">add language, add a language</string>
 
@@ -9331,7 +9342,7 @@
     <string name="notification_listener_security_warning_summary">
         <xliff:g id="notification_listener_name">%1$s</xliff:g> will be able to read all notifications,
         including personal information such as contact names and the text of messages you receive.
-        This app will also be able to dismiss notifications or take action on buttons in notifications, including answering phone calls.
+        This app will also be able to snooze or dismiss notifications or take action on buttons in notifications, including answering phone calls.
         \n\nThis will also give the app the ability to turn Do Not Disturb on or off and change related settings.
     </string>
     <string name="notification_listener_disable_warning_summary">
@@ -13226,6 +13237,15 @@
     <!-- Power menu explanation where to find prevent ringing option. [CHAR LIMIT=NONE] -->
     <string name="power_menu_power_prevent_ringing_hint">Prevent ringing:\nShortcut available in the volume menu.</string>
 
+    <!-- Power menu title of the seekbar setting controlling duration of how long the power button must be held to invoke assistant. [CHAR LIMIT=NONE]-->
+    <string name="power_menu_long_press_for_assist_sensitivity_title">Press &amp; hold duration</string>
+    <!-- Power menu summary of the seekbar setting controlling duration of how long the power button must be held to invoke assistant. [CHAR LIMIT=NONE]-->
+    <string name="power_menu_long_press_for_assist_sensitivity_summary">Adjust sensitivity by choosing how long to press &amp; hold the power button</string>
+    <!-- Label at the lowest end of duration slider for long press power invocation of assistant. [CHAR LIMIT=30] -->
+    <string name="power_menu_long_press_for_assist_sensitivity_low_label">Short</string>
+    <!-- Label at the highest end of duration slider for long press power invocation of assistant. [CHAR LIMIT=30] -->
+    <string name="power_menu_long_press_for_assist_sensitivity_high_label">Long</string>
+
     <!-- Wallet (formerly Cards and passes) toggle name [CHAR LIMIT=60] -->
     <string name="lockscreen_privacy_wallet_setting_toggle">Show wallet</string>
     <!-- Wallet (formerly Cards and passes) summary [CHAR LIMIT=NONE] -->
@@ -13329,8 +13349,6 @@
     <string name="calls_sms_no_sim">No SIM</string>
     <!-- Network & internet preferences title [CHAR LIMIT=NONE] -->
     <string name="network_and_internet_preferences_title">Network preferences</string>
-    <!-- Network & internet preferences summary [CHAR LIMIT=NONE] -->
-    <string name="network_and_internet_preferences_summary">Connect to public networks</string>
     <!-- Search keywords for "Internet" settings [CHAR_LIMIT=NONE] -->
     <string name="keywords_internet">network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, cell carrier, 4g, 3g, 2g, lte</string>
     <!-- Slice title text for turning on the Wi-Fi networks. [CHAR LIMIT=40] -->
@@ -13363,8 +13381,10 @@
     <string name="carrier_wifi_network_title">W+ network</string>
     <!-- Provider Model: title of SIM category -->
     <string name="sim_category_title">SIM</string>
-    <!-- Provider Model: title of Downloaded category. [CHAR LIMIT=50] -->
+    <!-- Provider Model: title of Downloaded SIM category. [CHAR LIMIT=50] -->
     <string name="downloaded_sim_category_title">DOWNLOADED SIM</string>
+    <!-- Provider Model: title of Downloaded SIMs category. [CHAR LIMIT=50] -->
+    <string name="downloaded_sims_category_title">DOWNLOADED SIMS</string>
     <!-- Provider Model: summary of Active in SIM category. [CHAR LIMIT=50] -->
     <string name="sim_category_active_sim">Active</string>
     <!-- Provider Model: summary of Inactive in SIM category. [CHAR LIMIT=50] -->
@@ -13548,6 +13568,15 @@
     <!-- Summary for Game settings entry. [CHAR_LIMIT=NONE] -->
     <string name="game_settings_summary">Turn on Game Dashboard shortcut, etc</string>
 
+    <!-- Content description of the previous button to bring user to the previous preview page. -->
+    <string name="previous_page_content_description">Previous</string>
+
+    <!-- Content description of the next button to bring user to the next preview page. -->
+    <string name="next_page_content_description">Next</string>
+
+    <!-- Content description of preview pager in colors preview -->
+    <string name="colors_viewpager_content_description">Color preview</string>
+
     <!-- Bluetooth sim card permission alert for notification title [CHAR LIMIT=none] -->
     <string name="bluetooth_sim_card_access_notification_title">SIM card access request</string>
     <!-- Bluetooth sim card permission alert for notification content [CHAR LIMIT=none] -->
diff --git a/res/xml/connected_devices_advanced.xml b/res/xml/connected_devices_advanced.xml
index 3ff7d99..85e4a76 100644
--- a/res/xml/connected_devices_advanced.xml
+++ b/res/xml/connected_devices_advanced.xml
@@ -65,6 +65,13 @@
         android:icon="@drawable/ic_folder_vd_theme_24"
         android:title="@string/bluetooth_show_files_received_via_bluetooth"/>
 
+    <SwitchPreference
+        android:key="uwb_settings"
+        android:title="@string/uwb_settings_title"
+        android:order="100"
+        android:summary="@string/summary_placeholder"
+        settings:controller="com.android.settings.uwb.UwbPreferenceController"/>
+
     <PreferenceCategory
         android:key="dashboard_tile_placeholder"
         android:order="-8"/>
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 6213516..a0d670f 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -109,11 +109,6 @@
             android:title="@string/color_temperature"
             android:summary="@string/color_temperature_desc" />
 
-        <SwitchPreference
-            android:key="ota_disable_automatic_update"
-            android:title="@string/ota_disable_automatic_update"
-            android:summary="@string/ota_disable_automatic_update_summary" />
-
         <Preference android:key="dsu_loader"
                     android:title="@string/dsu_loader_title" />
 
diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml
index 79f84d3..7d1ff09 100644
--- a/res/xml/mobile_network_settings.xml
+++ b/res/xml/mobile_network_settings.xml
@@ -247,6 +247,13 @@
             android:summary="@string/enable_2g_summary"
             settings:controller="com.android.settings.network.telephony.Enable2gPreferenceController" />
 
+        <SwitchPreference
+            android:key="nr_advanced_calling"
+            android:title="@string/nr_advanced_calling_title"
+            android:persistent="false"
+            android:summary="@string/nr_advanced_calling_summary"
+            settings:keywords="@string/keywords_nr_advanced_calling"
+            settings:controller="com.android.settings.network.telephony.NrAdvancedCallingPreferenceController"/>
     </PreferenceCategory>
 
     <Preference
diff --git a/res/xml/network_provider_settings.xml b/res/xml/network_provider_settings.xml
index 9e8befa..9cab924 100644
--- a/res/xml/network_provider_settings.xml
+++ b/res/xml/network_provider_settings.xml
@@ -70,7 +70,6 @@
     <Preference
         android:key="configure_wifi_settings"
         android:title="@string/network_and_internet_preferences_title"
-        android:summary="@string/network_and_internet_preferences_summary"
         settings:allowDividerAbove="true"
         android:fragment="com.android.settings.wifi.ConfigureWifiSettings"/>
 
diff --git a/res/xml/power_menu_settings.xml b/res/xml/power_menu_settings.xml
index caaeb97..121a2da 100644
--- a/res/xml/power_menu_settings.xml
+++ b/res/xml/power_menu_settings.xml
@@ -22,11 +22,21 @@
         android:title="@string/power_menu_long_press_for_assist"
         android:summary="@string/power_menu_long_press_for_assist_summary"
         settings:controller="com.android.settings.gestures.LongPressPowerButtonPreferenceController"
-        />
+    />
+
+    <com.android.settings.widget.LabeledSeekBarPreference
+        android:key="gesture_power_menu_long_press_for_assist_sensitivity"
+        android:title="@string/power_menu_long_press_for_assist_sensitivity_title"
+        android:summary="@string/power_menu_long_press_for_assist_sensitivity_summary"
+        android:selectable="true"
+        settings:textStart="@string/power_menu_long_press_for_assist_sensitivity_low_label"
+        settings:textEnd="@string/power_menu_long_press_for_assist_sensitivity_high_label"
+        settings:controller="com.android.settings.gestures.LongPressPowerSensitivityPreferenceController"
+    />
 
     <com.android.settingslib.widget.FooterPreference
         android:key="power_menu_power_volume_up_hint"
         android:title="@string/power_menu_power_volume_up_hint"
         android:selectable="false"
-        settings:searchable="false" />
+        settings:searchable="false"/>
 </PreferenceScreen>
diff --git a/res/xml/smart_battery_detail.xml b/res/xml/smart_battery_detail.xml
index 9c0aac5..9795125 100644
--- a/res/xml/smart_battery_detail.xml
+++ b/res/xml/smart_battery_detail.xml
@@ -22,7 +22,7 @@
     android:title="@string/smart_battery_manager_title"
     settings:keywords="@string/keywords_battery_adaptive_preferences">
 
-    <com.android.settingslib.widget.IllustrationPreferencee
+    <com.android.settingslib.widget.IllustrationPreference
         android:key="auto_awesome_battery"
         settings:lottie_rawRes="@raw/auto_awesome_battery_lottie" />
 
diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml
index 9228ddd..21a5c15 100644
--- a/res/xml/system_dashboard_fragment.xml
+++ b/res/xml/system_dashboard_fragment.xml
@@ -65,6 +65,14 @@
         <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS"/>
     </Preference>
 
+    <SwitchPreference
+        android:key="ota_disable_automatic_update"
+        android:title="@string/ota_disable_automatic_update"
+        android:summary="@string/ota_disable_automatic_update_summary"
+        android:icon="@drawable/ic_system_update"
+        android:order="-57"
+        settings:controller="com.android.settings.system.DisableAutomaticUpdatesPreferenceController"/>
+
     <Preference
         android:key="reset_dashboard"
         android:title="@string/reset_dashboard_title"
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 404207d..cc9542b 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -90,6 +90,8 @@
     public static class WifiSettingsActivity extends SettingsActivity { /* empty */ }
     public static class WifiSettings2Activity extends SettingsActivity { /* empty */ }
     public static class NetworkProviderSettingsActivity extends SettingsActivity { /* empty */ }
+    /** Activity for the Wi-Fi network details settings. */
+    public static class WifiDetailsSettingsActivity extends SettingsActivity { /* empty */ }
     public static class WifiP2pSettingsActivity extends SettingsActivity { /* empty */ }
     public static class AvailableVirtualKeyboardActivity extends SettingsActivity { /* empty */ }
     public static class KeyboardLayoutPickerActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/biometrics/ParentalConsentHelper.java b/src/com/android/settings/biometrics/ParentalConsentHelper.java
index 6c4004e..e0e082b 100644
--- a/src/com/android/settings/biometrics/ParentalConsentHelper.java
+++ b/src/com/android/settings/biometrics/ParentalConsentHelper.java
@@ -48,6 +48,10 @@
     private static final String KEY_FINGERPRINT_CONSENT = "fingerprint";
     private static final String KEY_IRIS_CONSENT = "iris";
 
+    private static final String KEY_FACE_CONSENT_STRINGS = "face_strings";
+    private static final String KEY_FINGERPRINT_CONSENT_STRINGS = "fingerprint_strings";
+    private static final String KEY_IRIS_CONSENT_STRINGS = "iris_strings";
+
     private final boolean mRequireFace;
     private final boolean mRequireFingerprint;
 
@@ -152,9 +156,14 @@
     public Bundle getConsentResult() {
         final Bundle result = new Bundle();
         result.putBoolean(KEY_FACE_CONSENT, mConsentFace != null ? mConsentFace : false);
+        result.putIntArray(KEY_FACE_CONSENT_STRINGS,
+                FaceEnrollParentalConsent.CONSENT_STRING_RESOURCES);
         result.putBoolean(KEY_FINGERPRINT_CONSENT,
                 mConsentFingerprint != null ? mConsentFingerprint : false);
+        result.putIntArray(KEY_FINGERPRINT_CONSENT_STRINGS,
+                FingerprintEnrollParentalConsent.CONSENT_STRING_RESOURCES);
         result.putBoolean(KEY_IRIS_CONSENT, false);
+        result.putIntArray(KEY_IRIS_CONSENT_STRINGS, new int[0]);
         return result;
     }
 
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollParentalConsent.java b/src/com/android/settings/biometrics/face/FaceEnrollParentalConsent.java
index 183e05e..54466f9 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollParentalConsent.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollParentalConsent.java
@@ -33,6 +33,21 @@
  */
 public class FaceEnrollParentalConsent extends FaceEnrollIntroduction {
 
+    /**
+     * List of string resources to log when recording the result of this activity in gms.
+     * This must be updated when any strings are added/removed.
+     */
+    public static final int[] CONSENT_STRING_RESOURCES = new int[] {
+            R.string.security_settings_face_enroll_consent_introduction_title,
+            R.string.security_settings_face_enroll_introduction_consent_message,
+            R.string.security_settings_face_enroll_introduction_info_consent_glasses,
+            R.string.security_settings_face_enroll_introduction_info_consent_looking,
+            R.string.security_settings_face_enroll_introduction_info_consent_gaze,
+            R.string.security_settings_face_enroll_introduction_how_consent_message,
+            R.string.security_settings_face_enroll_introduction_control_consent_title,
+            R.string.security_settings_face_enroll_introduction_control_consent_message
+    };
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollParentalConsent.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollParentalConsent.java
index a95a912..22212f2 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollParentalConsent.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollParentalConsent.java
@@ -33,6 +33,20 @@
  */
 public class FingerprintEnrollParentalConsent extends FingerprintEnrollIntroduction {
 
+    /**
+     * List of string resources to log when recording the result of this activity in gms.
+     * This must be updated when any strings are added/removed.
+     */
+    public static final int[] CONSENT_STRING_RESOURCES = new int[] {
+            R.string.security_settings_fingerprint_enroll_consent_introduction_title,
+            R.string.security_settings_fingerprint_enroll_introduction_consent_message,
+            R.string.security_settings_fingerprint_enroll_introduction_footer_title_consent_1,
+            R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_2,
+            R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_3,
+            R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_4,
+            R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5
+    };
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
diff --git a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
index 5851b50..b60f1b6 100644
--- a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
+++ b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
@@ -103,8 +103,10 @@
             new BluetoothAdapter.OnMetadataChangedListener() {
                 @Override
                 public void onMetadataChanged(BluetoothDevice device, int key, byte[] value) {
-                    Log.i(TAG, String.format("Metadata updated in Device %s: %d = %s.", device, key,
-                            value == null ? null : new String(value)));
+                    if (DEBUG) {
+                        Log.d(TAG, String.format("Metadata updated in Device %s: %d = %s.", device,
+                                key, value == null ? null : new String(value)));
+                    }
                     refresh();
                 }
             };
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
index 9790670..0abe042 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
@@ -198,8 +198,9 @@
 
         @Override
         public void onTetheringStarted() {
-            Log.d(TAG, "onTetheringStarted()");
             // Set default usb functions again to make internal data persistent
+            mCurrentFunctions = mUsbBackend.getCurrentFunctions();
+            Log.d(TAG, "onTetheringStarted() : mCurrentFunctions " + mCurrentFunctions);
             mUsbBackend.setDefaultUsbFunctions(mCurrentFunctions);
         }
 
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index d0fb7ab..458aadb 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -159,6 +159,7 @@
 import com.android.settings.wifi.WifiSettings;
 import com.android.settings.wifi.calling.WifiCallingDisclaimerFragment;
 import com.android.settings.wifi.calling.WifiCallingSettings;
+import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
 import com.android.settings.wifi.p2p.WifiP2pSettings;
 import com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2;
 import com.android.settings.wifi.tether.WifiTetherSettings;
@@ -173,6 +174,7 @@
             AdvancedConnectedDeviceDashboardFragment.class.getName(),
             CreateShortcut.class.getName(),
             WifiSettings.class.getName(),
+            WifiNetworkDetailsFragment.class.getName(),
             ConfigureWifiSettings.class.getName(),
             SavedAccessPointsWifiSettings2.class.getName(),
             AllInOneTetherSettings.class.getName(),
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index fbab1fd..10160a7 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -481,7 +481,6 @@
         controllers.add(new PictureColorModePreferenceController(context, lifecycle));
         controllers.add(new WebViewAppPreferenceController(context));
         controllers.add(new CoolColorTemperaturePreferenceController(context));
-        controllers.add(new DisableAutomaticUpdatesPreferenceController(context));
         controllers.add(new SelectDSUPreferenceController(context));
         controllers.add(new AdbPreferenceController(context, fragment));
         controllers.add(new ClearAdbKeysPreferenceController(context, fragment));
diff --git a/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java b/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java
deleted file mode 100644
index f10e171..0000000
--- a/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source 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 com.android.settings.development;
-
-import android.content.Context;
-import android.provider.Settings;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
-public class DisableAutomaticUpdatesPreferenceController extends
-        DeveloperOptionsPreferenceController implements
-        Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
-
-    private static final String OTA_DISABLE_AUTOMATIC_UPDATE_KEY = "ota_disable_automatic_update";
-
-    // We use the "disabled status" in code, but show the opposite text
-    // "Automatic system updates" on screen. So a value 0 indicates the
-    // automatic update is enabled.
-    @VisibleForTesting
-    final static int DISABLE_UPDATES_SETTING = 1;
-    @VisibleForTesting
-    final static int ENABLE_UPDATES_SETTING = 0;
-
-    public DisableAutomaticUpdatesPreferenceController(Context context) {
-        super(context);
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return OTA_DISABLE_AUTOMATIC_UPDATE_KEY;
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        final boolean updatesEnabled = (Boolean) newValue;
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE,
-                updatesEnabled ? ENABLE_UPDATES_SETTING : DISABLE_UPDATES_SETTING);
-        return true;
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        final int updatesEnabled = Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE, 0 /* default */);
-
-        ((SwitchPreference) mPreference).setChecked(updatesEnabled != DISABLE_UPDATES_SETTING);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchDisabled() {
-        super.onDeveloperOptionsSwitchDisabled();
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE, DISABLE_UPDATES_SETTING);
-        ((SwitchPreference) mPreference).setChecked(false);
-    }
-}
diff --git a/src/com/android/settings/display/ColorModePreferenceFragment.java b/src/com/android/settings/display/ColorModePreferenceFragment.java
index b8fa0b9..ce33e67 100644
--- a/src/com/android/settings/display/ColorModePreferenceFragment.java
+++ b/src/com/android/settings/display/ColorModePreferenceFragment.java
@@ -28,12 +28,18 @@
 import android.graphics.drawable.Drawable;
 import android.hardware.display.ColorDisplayManager;
 import android.net.Uri;
+import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.provider.Settings.Secure;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.PreferenceScreen;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 
 import com.android.settings.R;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -43,6 +49,7 @@
 import com.android.settingslib.widget.LayoutPreference;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -54,10 +61,25 @@
 
     private static final int COLOR_MODE_FALLBACK = COLOR_MODE_NATURAL;
 
+    static final String PAGE_VIEWER_SELECTION_INDEX = "page_viewer_selection_index";
+
+    private static final int DOT_INDICATOR_SIZE = 12;
+    private static final int DOT_INDICATOR_LEFT_PADDING = 6;
+    private static final int DOT_INDICATOR_RIGHT_PADDING = 6;
+
     private ContentObserver mContentObserver;
     private ColorDisplayManager mColorDisplayManager;
     private Resources mResources;
 
+    private View mViewArrowPrevious;
+    private View mViewArrowNext;
+    private ViewPager mViewPager;
+
+    private ArrayList<View> mPageList;
+
+    private ImageView[] mDotIndicators;
+    private View[] mViewPagerImages;
+
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
@@ -86,6 +108,16 @@
     }
 
     @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (savedInstanceState != null) {
+            final int selectedPosition = savedInstanceState.getInt(PAGE_VIEWER_SELECTION_INDEX);
+            mViewPager.setCurrentItem(selectedPosition);
+            updateIndicator(selectedPosition);
+        }
+    }
+
+    @Override
     public void onDetach() {
         if (mContentObserver != null) {
             getContext().getContentResolver().unregisterContentObserver(mContentObserver);
@@ -95,6 +127,12 @@
     }
 
     @Override
+    public void onSaveInstanceState(Bundle outState){
+        super.onSaveInstanceState(outState);
+        outState.putInt(PAGE_VIEWER_SELECTION_INDEX, mViewPager.getCurrentItem());
+    }
+
+    @Override
     protected int getPreferenceScreenResId() {
         return R.xml.color_mode_settings;
     }
@@ -105,11 +143,69 @@
         screen.addPreference(preview);
     }
 
+    @VisibleForTesting
+    public ArrayList<Integer> getViewPagerResource() {
+        return new ArrayList<Integer>(
+                Arrays.asList(
+                        R.layout.color_mode_view1,
+                        R.layout.color_mode_view2,
+                        R.layout.color_mode_view3));
+    }
+
+    void addViewPager(LayoutPreference preview) {
+        final ArrayList<Integer> tmpviewPagerList = getViewPagerResource();
+        mViewPager = preview.findViewById(R.id.viewpager);
+
+        mViewPagerImages = new View[3];
+        for (int idx = 0; idx < tmpviewPagerList.size(); idx++) {
+            mViewPagerImages[idx] =
+                    getLayoutInflater().inflate(tmpviewPagerList.get(idx), null /* root */);
+        }
+
+        mPageList = new ArrayList<View>();
+        mPageList.add(mViewPagerImages[0]);
+        mPageList.add(mViewPagerImages[1]);
+        mPageList.add(mViewPagerImages[2]);
+
+        mViewPager.setAdapter(new ColorPagerAdapter(mPageList));
+
+        mViewArrowPrevious = preview.findViewById(R.id.arrow_previous);
+        mViewArrowPrevious.setOnClickListener(v -> {
+            final int previousPos = mViewPager.getCurrentItem() - 1;
+            mViewPager.setCurrentItem(previousPos, true);
+        });
+
+        mViewArrowNext = preview.findViewById(R.id.arrow_next);
+        mViewArrowNext.setOnClickListener(v -> {
+            final int nextPos = mViewPager.getCurrentItem() + 1;
+            mViewPager.setCurrentItem(nextPos, true);
+        });
+
+        mViewPager.addOnPageChangeListener(createPageListener());
+
+        final ViewGroup viewGroup = (ViewGroup) preview.findViewById(R.id.viewGroup);
+        mDotIndicators = new ImageView[mPageList.size()];
+        for (int i = 0; i < mPageList.size(); i++) {
+            final ImageView imageView = new ImageView(getContext());
+            final ViewGroup.MarginLayoutParams lp =
+                    new ViewGroup.MarginLayoutParams(DOT_INDICATOR_SIZE, DOT_INDICATOR_SIZE);
+            lp.setMargins(DOT_INDICATOR_LEFT_PADDING, 0, DOT_INDICATOR_RIGHT_PADDING, 0);
+            imageView.setLayoutParams(lp);
+            mDotIndicators[i] = imageView;
+
+            viewGroup.addView(mDotIndicators[i]);
+        }
+
+        updateIndicator(mViewPager.getCurrentItem());
+    }
+
     @Override
     protected void addStaticPreferences(PreferenceScreen screen) {
         final LayoutPreference preview = new LayoutPreference(screen.getContext(),
                 R.layout.color_mode_preview);
         configureAndInstallPreview(preview, screen);
+
+        addViewPager(preview);
     }
 
     @Override
@@ -207,6 +303,88 @@
         }
     }
 
+    private ViewPager.OnPageChangeListener createPageListener() {
+        return new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(
+                    int position, float positionOffset, int positionOffsetPixels) {
+                if (positionOffset != 0) {
+                    for (int idx = 0; idx < mPageList.size(); idx++) {
+                        mViewPagerImages[idx].setVisibility(View.VISIBLE);
+                    }
+                } else {
+                    mViewPagerImages[position].setContentDescription(
+                            getContext().getString(R.string.colors_viewpager_content_description));
+                    updateIndicator(position);
+                }
+            }
+
+            @Override
+            public void onPageSelected(int position) {}
+
+            @Override
+            public void onPageScrollStateChanged(int state) {}
+        };
+    }
+
+    private void updateIndicator(int position) {
+        for (int i = 0; i < mPageList.size(); i++) {
+            if (position == i) {
+                mDotIndicators[i].setBackgroundResource(
+                        R.drawable.ic_color_page_indicator_focused);
+
+                mViewPagerImages[i].setVisibility(View.VISIBLE);
+            } else {
+                mDotIndicators[i].setBackgroundResource(
+                        R.drawable.ic_color_page_indicator_unfocused);
+
+                mViewPagerImages[i].setVisibility(View.INVISIBLE);
+            }
+        }
+
+        if (position == 0) {
+            mViewArrowPrevious.setVisibility(View.INVISIBLE);
+            mViewArrowNext.setVisibility(View.VISIBLE);
+        } else if (position == (mPageList.size() - 1)) {
+            mViewArrowPrevious.setVisibility(View.VISIBLE);
+            mViewArrowNext.setVisibility(View.INVISIBLE);
+        } else {
+            mViewArrowPrevious.setVisibility(View.VISIBLE);
+            mViewArrowNext.setVisibility(View.VISIBLE);
+        }
+    }
+
+    static class ColorPagerAdapter extends PagerAdapter {
+        private final ArrayList<View> mPageViewList;
+
+        ColorPagerAdapter(ArrayList<View> pageViewList) {
+            mPageViewList = pageViewList;
+        }
+
+        @Override
+        public void destroyItem(ViewGroup container, int position, Object object) {
+            if (mPageViewList.get(position) != null) {
+                container.removeView(mPageViewList.get(position));
+            }
+        }
+
+        @Override
+        public Object instantiateItem(ViewGroup container, int position) {
+            container.addView(mPageViewList.get(position));
+            return mPageViewList.get(position);
+        }
+
+        @Override
+        public int getCount() {
+            return mPageViewList.size();
+        }
+
+        @Override
+        public boolean isViewFromObject(View view, Object object) {
+            return object == view;
+        }
+    }
+
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider(R.xml.color_mode_settings) {
 
diff --git a/src/com/android/settings/display/SmartAutoRotatePreferenceController.java b/src/com/android/settings/display/SmartAutoRotatePreferenceController.java
index f8d5f96..849fbe7 100644
--- a/src/com/android/settings/display/SmartAutoRotatePreferenceController.java
+++ b/src/com/android/settings/display/SmartAutoRotatePreferenceController.java
@@ -22,6 +22,8 @@
 import static com.android.settings.display.SmartAutoRotateController.hasSufficientPermission;
 import static com.android.settings.display.SmartAutoRotateController.isRotationResolverServiceAvailable;
 
+import android.text.TextUtils;
+import android.app.settings.SettingsEnums;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -37,7 +39,9 @@
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.view.RotationPolicy;
 import com.android.settings.R;
-import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.TogglePreferenceController;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
@@ -45,12 +49,10 @@
 /**
  * SmartAutoRotatePreferenceController provides auto rotate summary in display settings
  */
-public class SmartAutoRotatePreferenceController extends BasePreferenceController
+public class SmartAutoRotatePreferenceController extends TogglePreferenceController
         implements LifecycleObserver, OnStart, OnStop {
 
-    private RotationPolicy.RotationPolicyListener mRotationPolicyListener;
-    private Preference mPreference;
-
+    private final MetricsFeatureProvider mMetricsFeatureProvider;
     private final SensorPrivacyManager mPrivacyManager;
     private final PowerManager mPowerManager;
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@@ -60,12 +62,16 @@
         }
     };
 
+    private RotationPolicy.RotationPolicyListener mRotationPolicyListener;
+    private Preference mPreference;
+
     public SmartAutoRotatePreferenceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
         mPrivacyManager = SensorPrivacyManager.getInstance(context);
         mPrivacyManager
                 .addSensorPrivacyListener(CAMERA, (sensor, enabled) -> refreshSummary(mPreference));
         mPowerManager = context.getSystemService(PowerManager.class);
+        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
     }
 
     @Override
@@ -75,12 +81,28 @@
     }
 
     @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(), "auto_rotate");
+    }
+
+    @Override
+    public boolean isPublicSlice() {
+        return true;
+    }
+
+    @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
         mPreference = screen.findPreference(getPreferenceKey());
     }
 
     @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        refreshSummary(mPreference);
+    }
+
+    @Override
     public void onStart() {
         mContext.registerReceiver(mReceiver,
                 new IntentFilter(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED));
@@ -89,7 +111,7 @@
                 @Override
                 public void onChange() {
                     if (mPreference != null) {
-                        refreshSummary(mPreference);
+                        updateState(mPreference);
                     }
                 }
             };
@@ -122,6 +144,20 @@
     }
 
     @Override
+    public boolean isChecked() {
+        return !RotationPolicy.isRotationLocked(mContext);
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        final boolean isLocked = !isChecked;
+        mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_ROTATION_LOCK,
+                isLocked);
+        RotationPolicy.setRotationLock(mContext, isLocked);
+        return true;
+    }
+
+    @Override
     public CharSequence getSummary() {
         int activeStringId = R.string.auto_rotate_option_off;
         if (!RotationPolicy.isRotationLocked(mContext)) {
diff --git a/src/com/android/settings/fuelgauge/BatteryChartView.java b/src/com/android/settings/fuelgauge/BatteryChartView.java
index a98c644..7bc60b2 100644
--- a/src/com/android/settings/fuelgauge/BatteryChartView.java
+++ b/src/com/android/settings/fuelgauge/BatteryChartView.java
@@ -57,7 +57,8 @@
         Arrays.asList("SwitchAccessService", "TalkBackService", "JustSpeakService");
 
     private static final int DEFAULT_TRAPEZOID_COUNT = 12;
-    private static final int DEFAULT_TIMESTAMP_COUNT = 5;
+    private static final int DEFAULT_TIMESTAMP_COUNT = 4;
+    private static final int TIMESTAMP_GAPS_COUNT = DEFAULT_TIMESTAMP_COUNT - 1;
     private static final int DIVIDER_COLOR = Color.parseColor("#CDCCC5");
     private static final long UPDATE_STATE_DELAYED_TIME = 500L;
 
@@ -91,7 +92,7 @@
         new Rect[] {new Rect(), new Rect(), new Rect()};
     // For drawing the timestamp information.
     private final Rect[] mTimestampsBounds =
-        new Rect[] {new Rect(), new Rect(), new Rect(), new Rect(), new Rect()};
+        new Rect[] {new Rect(), new Rect(), new Rect(), new Rect()};
 
     @VisibleForTesting
     Handler mHandler = new Handler();
@@ -198,13 +199,14 @@
         if (mTimestamps == null) {
             mTimestamps = new String[DEFAULT_TIMESTAMP_COUNT];
         }
-        final long timeSlotOffset = DateUtils.HOUR_IN_MILLIS * 6;
+        final long timeSlotOffset =
+            DateUtils.HOUR_IN_MILLIS * (/*total 24 hours*/ 24 / TIMESTAMP_GAPS_COUNT);
         final boolean is24HourFormat = DateFormat.is24HourFormat(getContext());
         for (int index = 0; index < DEFAULT_TIMESTAMP_COUNT; index++) {
             mTimestamps[index] =
                 ConvertUtils.utcToLocalTimeHour(
                     getContext(),
-                    latestTimestamp - (4 - index) * timeSlotOffset,
+                    latestTimestamp - (TIMESTAMP_GAPS_COUNT - index) * timeSlotOffset,
                     is24HourFormat);
         }
         requestLayout();
@@ -426,8 +428,9 @@
             final float[] xOffsets = new float[DEFAULT_TIMESTAMP_COUNT];
             final float baselineX = mDividerWidth * .5f;
             final float offsetX = mDividerWidth + unitWidth;
+            final int slotBarOffset = (/*total 12 bars*/ 12) / TIMESTAMP_GAPS_COUNT;
             for (int index = 0; index < DEFAULT_TIMESTAMP_COUNT; index++) {
-                xOffsets[index] = baselineX + index * offsetX * 3;
+                xOffsets[index] = baselineX + index * offsetX * slotBarOffset;
             }
             drawTimestamp(canvas, xOffsets);
         }
@@ -439,13 +442,15 @@
             mTimestamps[0],
             xOffsets[0] - mTimestampsBounds[0].left,
             getTimestampY(0), mTextPaint);
+        final int latestIndex = DEFAULT_TIMESTAMP_COUNT - 1;
         // Draws the last timestamp info.
         canvas.drawText(
-            mTimestamps[4],
-            xOffsets[4] - mTimestampsBounds[4].width() - mTimestampsBounds[4].left,
-            getTimestampY(4), mTextPaint);
+            mTimestamps[latestIndex],
+            xOffsets[latestIndex] - mTimestampsBounds[latestIndex].width()
+                    - mTimestampsBounds[latestIndex].left,
+            getTimestampY(latestIndex), mTextPaint);
         // Draws the rest of timestamp info since it is located in the center.
-        for (int index = 1; index <= 3; index++) {
+        for (int index = 1; index <= DEFAULT_TIMESTAMP_COUNT - 2; index++) {
             canvas.drawText(
                 mTimestamps[index],
                 xOffsets[index] -
diff --git a/src/com/android/settings/fuelgauge/ConvertUtils.java b/src/com/android/settings/fuelgauge/ConvertUtils.java
index da84631..a5a58ad 100644
--- a/src/com/android/settings/fuelgauge/ConvertUtils.java
+++ b/src/com/android/settings/fuelgauge/ConvertUtils.java
@@ -19,6 +19,7 @@
 import android.os.BatteryUsageStats;
 import android.os.LocaleList;
 import android.os.UserHandle;
+import android.text.format.DateFormat;
 import android.text.format.DateUtils;
 import android.util.Log;
 
@@ -28,10 +29,8 @@
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import java.text.SimpleDateFormat;
 import java.time.Duration;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -78,19 +77,6 @@
     public static final int CONSUMER_TYPE_USER_BATTERY = 2;
     public static final int CONSUMER_TYPE_SYSTEM_BATTERY = 3;
 
-    // For language is changed.
-    @VisibleForTesting static Locale sLocale;
-    @VisibleForTesting static Locale sLocaleForHour;
-    // For time zone is changed.
-    @VisibleForTesting static String sZoneId;
-    @VisibleForTesting static String sZoneIdForHour;
-    private static boolean sIs24HourFormat;
-
-    @VisibleForTesting
-    static SimpleDateFormat sSimpleDateFormat;
-    @VisibleForTesting
-    static SimpleDateFormat sSimpleDateFormatForHour;
-
     private ConvertUtils() {}
 
     public static ContentValues convert(
@@ -138,36 +124,21 @@
 
     /** Converts UTC timestamp to human readable local time string. */
     public static String utcToLocalTime(Context context, long timestamp) {
-        final Locale currentLocale = getLocale(context);
-        final String currentZoneId = TimeZone.getDefault().getID();
-        if (!currentZoneId.equals(sZoneId)
-                || !currentLocale.equals(sLocale)
-                || sSimpleDateFormat == null) {
-            sLocale = currentLocale;
-            sZoneId = currentZoneId;
-            sSimpleDateFormat =
-                new SimpleDateFormat("MMM dd,yyyy HH:mm:ss", currentLocale);
-        }
-        return sSimpleDateFormat.format(new Date(timestamp));
+        final Locale locale = getLocale(context);
+        final String pattern =
+            DateFormat.getBestDateTimePattern(locale, "MMM dd,yyyy HH:mm:ss");
+        return DateFormat.format(pattern, timestamp).toString();
     }
 
     /** Converts UTC timestamp to local time hour data. */
     public static String utcToLocalTimeHour(
             Context context, long timestamp, boolean is24HourFormat) {
-        final Locale currentLocale = getLocale(context);
-        final String currentZoneId = TimeZone.getDefault().getID();
-        if (!currentZoneId.equals(sZoneIdForHour)
-                || !currentLocale.equals(sLocaleForHour)
-                || sIs24HourFormat != is24HourFormat
-                || sSimpleDateFormatForHour == null) {
-            sLocaleForHour = currentLocale;
-            sZoneIdForHour = currentZoneId;
-            sIs24HourFormat = is24HourFormat;
-            sSimpleDateFormatForHour = new SimpleDateFormat(
-                    sIs24HourFormat ? "HH" : "h", currentLocale);
-        }
-        return sSimpleDateFormatForHour.format(new Date(timestamp))
-            .toLowerCase(currentLocale);
+        final Locale locale = getLocale(context);
+        // e.g. for 12-hour format: 9 pm
+        // e.g. for 24-hour format: 09:00
+        final String skeleton = is24HourFormat ? "HHm" : "ha";
+        final String pattern = DateFormat.getBestDateTimePattern(locale, skeleton);
+        return DateFormat.format(pattern, timestamp).toString().toLowerCase(locale);
     }
 
     /** Gets indexed battery usage data for each corresponding time slot. */
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
index eff538f..bab8811 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
@@ -139,6 +139,11 @@
     boolean isChartGraphSlotsEnabled(Context context);
 
     /**
+     * Gets a intent for one time bypass charge limited to resume charging.
+     */
+    Intent getResumeChargeIntent();
+
+    /**
      * Returns battery history data with corresponding timestamp key.
      */
     Map<Long, Map<String, BatteryHistEntry>> getBatteryHistory(Context context);
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
index 7f1bef0..208a478 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
@@ -166,6 +166,11 @@
     }
 
     @Override
+    public Intent getResumeChargeIntent() {
+        return null;
+    }
+
+    @Override
     public Map<Long, Map<String, BatteryHistEntry>> getBatteryHistory(Context context) {
         return null;
     }
diff --git a/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java b/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
index f75fccc..7caad60 100644
--- a/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
+++ b/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
@@ -32,10 +32,11 @@
 
 public class RequestIgnoreBatteryOptimizations extends AlertActivity implements
         DialogInterface.OnClickListener {
-    static final String TAG = "RequestIgnoreBatteryOptimizations";
+    private static final String TAG = "RequestIgnoreBatteryOptimizations";
+    private static final boolean DEBUG = false;
 
     private PowerWhitelistManager mPowerWhitelistManager;
-    String mPackageName;
+    private String mPackageName;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -45,14 +46,14 @@
 
         Uri data = getIntent().getData();
         if (data == null) {
-            Log.w(TAG, "No data supplied for IGNORE_BATTERY_OPTIMIZATION_SETTINGS in: "
+            debugLog("No data supplied for IGNORE_BATTERY_OPTIMIZATION_SETTINGS in: "
                     + getIntent());
             finish();
             return;
         }
         mPackageName = data.getSchemeSpecificPart();
         if (mPackageName == null) {
-            Log.w(TAG, "No data supplied for IGNORE_BATTERY_OPTIMIZATION_SETTINGS in: "
+            debugLog("No data supplied for IGNORE_BATTERY_OPTIMIZATION_SETTINGS in: "
                     + getIntent());
             finish();
             return;
@@ -60,7 +61,7 @@
 
         PowerManager power = getSystemService(PowerManager.class);
         if (power.isIgnoringBatteryOptimizations(mPackageName)) {
-            Log.i(TAG, "Not should prompt, already ignoring optimizations: " + mPackageName);
+            debugLog("Not should prompt, already ignoring optimizations: " + mPackageName);
             finish();
             return;
         }
@@ -69,7 +70,7 @@
         try {
             ai = getPackageManager().getApplicationInfo(mPackageName, 0);
         } catch (PackageManager.NameNotFoundException e) {
-            Log.w(TAG, "Requested package doesn't exist: " + mPackageName);
+            debugLog("Requested package doesn't exist: " + mPackageName);
             finish();
             return;
         }
@@ -77,7 +78,7 @@
         if (getPackageManager().checkPermission(
                 Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS, mPackageName)
                 != PackageManager.PERMISSION_GRANTED) {
-            Log.w(TAG, "Requested package " + mPackageName + " does not hold permission "
+            debugLog("Requested package " + mPackageName + " does not hold permission "
                     + Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
             finish();
             return;
@@ -105,10 +106,13 @@
         switch (which) {
             case BUTTON_POSITIVE:
                 mPowerWhitelistManager.addToWhitelist(mPackageName);
-                setResult(RESULT_OK);
                 break;
             case BUTTON_NEGATIVE:
                 break;
         }
     }
+
+    private static void debugLog(String debugContent) {
+        if (DEBUG) Log.w(TAG, debugContent);
+    }
 }
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java
index 58038cd..e9e5d68 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java
@@ -20,6 +20,9 @@
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.BatteryManager;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 
@@ -40,6 +43,7 @@
 import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip;
 import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip;
 
+import java.text.NumberFormat;
 import java.util.List;
 
 /**
@@ -50,6 +54,7 @@
 
     private static final String ARG_BATTERY_TIP = "battery_tip";
     private static final String ARG_METRICS_KEY = "metrics_key";
+    private static final double CHARGE_LIMIT_LEVEL = 0.8f;
 
     @VisibleForTesting
     BatteryTip mBatteryTip;
@@ -138,6 +143,28 @@
                         .setPositiveButton(R.string.battery_tip_unrestrict_app_dialog_ok, this)
                         .setNegativeButton(R.string.battery_tip_unrestrict_app_dialog_cancel, null)
                         .create();
+            case BatteryTip.TipType.BATTERY_DEFENDER:
+                mMetricsFeatureProvider.action(context,
+                        SettingsEnums.ACTION_TIP_BATTERY_DEFENDER, mMetricsKey);
+                final String percentage =
+                        NumberFormat.getPercentInstance().format(CHARGE_LIMIT_LEVEL);
+                final String message = context.getString(
+                        R.string.battery_tip_limited_temporarily_dialog_msg, percentage);
+                final boolean isPluggedIn = isPluggedIn();
+                final AlertDialog.Builder dialogBuilder =
+                        new AlertDialog.Builder(context)
+                                .setTitle(R.string.battery_tip_limited_temporarily_title)
+                                .setMessage(message);
+                if (isPluggedIn) {
+                    dialogBuilder
+                            .setPositiveButton(
+                                    R.string.battery_tip_limited_temporarily_dialog_resume_charge,
+                                    this)
+                            .setNegativeButton(R.string.okay, null);
+                } else {
+                    dialogBuilder.setPositiveButton(R.string.okay, null);
+                }
+                return dialogBuilder.create();
             default:
                 throw new IllegalArgumentException("unknown type " + mBatteryTip.getType());
         }
@@ -163,4 +190,11 @@
         lsn.onBatteryTipHandled(mBatteryTip);
     }
 
+    private boolean isPluggedIn() {
+        final Intent batteryIntent = getContext().registerReceiver(null /* receiver */,
+                new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+        return batteryIntent != null && batteryIntent.getIntExtra(
+                BatteryManager.EXTRA_PLUGGED, 0) != 0;
+    }
+
 }
diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/BatteryDefenderAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/BatteryDefenderAction.java
index 24cddcd..af16952 100644
--- a/src/com/android/settings/fuelgauge/batterytip/actions/BatteryDefenderAction.java
+++ b/src/com/android/settings/fuelgauge/batterytip/actions/BatteryDefenderAction.java
@@ -16,12 +16,11 @@
 
 package com.android.settings.fuelgauge.batterytip.actions;
 
-import android.app.settings.SettingsEnums;
 import android.content.Intent;
 
-import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settingslib.HelpUtils;
+import com.android.settings.overlay.FeatureFactory;
+import android.os.AsyncTask;
 
 /**
  * Action to open the Support Center article
@@ -34,19 +33,13 @@
         mSettingsActivity = settingsActivity;
     }
 
-    /**
-     * Handle the action when user clicks positive button
-     */
     @Override
     public void handlePositiveAction(int metricsKey) {
-        mMetricsFeatureProvider.action(mContext,
-                SettingsEnums.ACTION_TIP_BATTERY_DEFENDER, metricsKey);
-        final Intent intent = HelpUtils.getHelpIntent(
-                mContext,
-                mContext.getString(R.string.help_url_battery_defender),
-                getClass().getName());
+        final Intent intent = FeatureFactory.getFactory(mContext)
+                .getPowerUsageFeatureProvider(mContext).getResumeChargeIntent();
         if (intent != null) {
-            mSettingsActivity.startActivityForResult(intent, 0);
+            // Post intent to background thread to avoid UI flaky
+            AsyncTask.execute(() -> mContext.sendBroadcast(intent));
         }
     }
 }
diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetector.java
index dc33026..5befa33 100644
--- a/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetector.java
+++ b/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetector.java
@@ -17,7 +17,6 @@
 package com.android.settings.fuelgauge.batterytip.detectors;
 
 import com.android.settings.fuelgauge.BatteryInfo;
-import com.android.settings.fuelgauge.BatteryUtils;
 import com.android.settings.fuelgauge.batterytip.tips.BatteryDefenderTip;
 import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
 
@@ -34,7 +33,7 @@
     @Override
     public BatteryTip detect() {
         final int state =
-                BatteryUtils.isBatteryDefenderOn(mBatteryInfo)
+                mBatteryInfo.isOverheated
                     ? BatteryTip.StateType.NEW
                     : BatteryTip.StateType.INVISIBLE;
         return new BatteryDefenderTip(state);
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java
index 242be24..a2890ad 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java
@@ -29,7 +29,7 @@
 public class BatteryDefenderTip extends BatteryTip {
 
     public BatteryDefenderTip(@StateType int state) {
-        super(TipType.BATTERY_DEFENDER, state, false /* showDialog */);
+        super(TipType.BATTERY_DEFENDER, state, true /* showDialog */);
     }
 
     private BatteryDefenderTip(Parcel in) {
diff --git a/src/com/android/settings/gestures/LongPressPowerButtonPreferenceController.java b/src/com/android/settings/gestures/LongPressPowerButtonPreferenceController.java
index a52be15..44494ee 100644
--- a/src/com/android/settings/gestures/LongPressPowerButtonPreferenceController.java
+++ b/src/com/android/settings/gestures/LongPressPowerButtonPreferenceController.java
@@ -16,6 +16,11 @@
 
 package com.android.settings.gestures;
 
+import static com.android.settings.gestures.PowerMenuSettingsUtils.LONG_PRESS_POWER_ASSISTANT_VALUE;
+import static com.android.settings.gestures.PowerMenuSettingsUtils.LONG_PRESS_POWER_GLOBAL_ACTIONS;
+import static com.android.settings.gestures.PowerMenuSettingsUtils.POWER_BUTTON_LONG_PRESS_DEFAULT_VALUE_RESOURCE;
+import static com.android.settings.gestures.PowerMenuSettingsUtils.POWER_BUTTON_LONG_PRESS_SETTING;
+
 import android.content.Context;
 import android.provider.Settings;
 
@@ -33,8 +38,6 @@
  */
 public class LongPressPowerButtonPreferenceController extends TogglePreferenceController {
 
-    private static final String POWER_BUTTON_LONG_PRESS_SETTING =
-            Settings.Global.POWER_BUTTON_LONG_PRESS;
     private static final String KEY_CHORD_POWER_VOLUME_UP_SETTING =
             Settings.Global.KEY_CHORD_POWER_VOLUME_UP;
 
@@ -42,19 +45,6 @@
     private static final String ASSIST_SWITCH_KEY = "gesture_power_menu_long_press_for_assist";
 
     /**
-     * Values used for long press power button behaviour when Assist setting is enabled.
-     *
-     * {@link com.android.server.policy.PhoneWindowManager#LONG_PRESS_POWER_GLOBAL_ACTIONS} for
-     * source of the value.
-     */
-    @VisibleForTesting
-    static final int LONG_PRESS_POWER_NO_ACTION = 0;
-    @VisibleForTesting
-    static final int LONG_PRESS_POWER_GLOBAL_ACTIONS = 1;
-    @VisibleForTesting
-    static final int LONG_PRESS_POWER_ASSISTANT_VALUE = 5; // Settings.Secure.ASSISTANT
-
-    /**
      * Values used for volume key chord behaviour when Assist setting is enabled.
      *
      * Values based on config_keyChordPowerVolumeUp in
@@ -67,15 +57,6 @@
     @VisibleForTesting
     static final int KEY_CHORD_POWER_VOLUME_UP_GLOBAL_ACTIONS = 2;
 
-    /**
-     * Value used for long press power button behaviour when the Assist setting is disabled.
-     *
-     * If this value matches Assist setting, then it falls back to Global Actions panel or
-     * power menu, depending on their respective settings.
-     */
-    private static final int POWER_BUTTON_LONG_PRESS_DEFAULT_VALUE_RESOURCE =
-            com.android.internal.R.integer.config_longPressOnPowerBehavior;
-
     private static final int KEY_CHORD_POWER_VOLUME_UP_DEFAULT_VALUE_RESOURCE =
             com.android.internal.R.integer.config_keyChordPowerVolumeUp;
 
@@ -101,7 +82,7 @@
 
     @Override
     public CharSequence getSummary() {
-        final int powerButtonValue = getPowerButtonValue();
+        final int powerButtonValue = PowerMenuSettingsUtils.getPowerButtonSettingValue(mContext);
         if (powerButtonValue == LONG_PRESS_POWER_ASSISTANT_VALUE) {
             return mContext.getString(R.string.power_menu_summary_long_press_for_assist_enabled);
         } else if (powerButtonValue == LONG_PRESS_POWER_GLOBAL_ACTIONS) {
@@ -122,7 +103,7 @@
 
     @Override
     public boolean isChecked() {
-        return getPowerButtonValue() == LONG_PRESS_POWER_ASSISTANT_VALUE;
+        return PowerMenuSettingsUtils.isLongPressPowerForAssistEnabled(mContext);
     }
 
     @Override
@@ -159,12 +140,6 @@
         }
     }
 
-    private int getPowerButtonValue() {
-        return Settings.Global.getInt(mContext.getContentResolver(),
-                POWER_BUTTON_LONG_PRESS_SETTING,
-                mContext.getResources().getInteger(POWER_BUTTON_LONG_PRESS_DEFAULT_VALUE_RESOURCE));
-    }
-
     private static boolean isPowerMenuKeyChordEnabled(Context context) {
         return Settings.Global.getInt(context.getContentResolver(),
                 KEY_CHORD_POWER_VOLUME_UP_SETTING,
diff --git a/src/com/android/settings/gestures/LongPressPowerSensitivityPreferenceController.java b/src/com/android/settings/gestures/LongPressPowerSensitivityPreferenceController.java
new file mode 100644
index 0000000..a1d681c
--- /dev/null
+++ b/src/com/android/settings/gestures/LongPressPowerSensitivityPreferenceController.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2021 The Android Open Source 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 com.android.settings.gestures;
+
+import android.content.Context;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.provider.Settings;
+
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.SliderPreferenceController;
+import com.android.settings.widget.LabeledSeekBarPreference;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+/** Handles changes to the long press power button sensitivity slider. */
+public class LongPressPowerSensitivityPreferenceController extends
+        SliderPreferenceController implements
+        LifecycleObserver, OnStart, OnStop {
+
+    private final ContentObserver mPowerButtonObserver = new ContentObserver(Handler.getMain()) {
+        @Override
+        public void onChange(boolean selfChange) {
+            if (mPreference != null) {
+                updateState(mPreference);
+            }
+        }
+    };
+
+    @Nullable
+    private final int[] mSensitivityValues;
+
+    @Nullable
+    private LabeledSeekBarPreference mPreference;
+
+    public LongPressPowerSensitivityPreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+        mSensitivityValues = context.getResources().getIntArray(
+                com.android.internal.R.array.config_longPressOnPowerDurationSettings);
+    }
+
+    @Override
+    public void onStart() {
+        mContext.getContentResolver().registerContentObserver(
+                Settings.Global.getUriFor(PowerMenuSettingsUtils.POWER_BUTTON_LONG_PRESS_SETTING),
+                false, mPowerButtonObserver);
+    }
+
+    @Override
+    public void onStop() {
+        mContext.getContentResolver().unregisterContentObserver(mPowerButtonObserver);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+        if (mPreference != null) {
+            mPreference.setContinuousUpdates(false);
+            mPreference.setHapticFeedbackMode(
+                    LabeledSeekBarPreference.HAPTIC_FEEDBACK_MODE_ON_TICKS);
+            mPreference.setMin(getMin());
+            mPreference.setMax(getMax());
+        }
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        final LabeledSeekBarPreference pref = (LabeledSeekBarPreference) preference;
+        pref.setEnabled(
+                isAvailable() && PowerMenuSettingsUtils.isLongPressPowerForAssistEnabled(mContext));
+        pref.setProgress(getSliderPosition());
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (mSensitivityValues == null || mSensitivityValues.length < 2) {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+
+        if (!PowerMenuSettingsUtils.isLongPressPowerForAssistEnabled(mContext)) {
+            return DISABLED_DEPENDENT_SETTING;
+        }
+
+        return AVAILABLE;
+    }
+
+    @Override
+    public int getSliderPosition() {
+        return mSensitivityValues == null ? 0 : closestValueIndex(mSensitivityValues,
+                getCurrentSensitivityValue());
+    }
+
+    @Override
+    public boolean setSliderPosition(int position) {
+        if (mSensitivityValues == null || position < 0 || position >= mSensitivityValues.length) {
+            return false;
+        }
+        return Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.POWER_BUTTON_LONG_PRESS_DURATION_MS,
+                mSensitivityValues[position]);
+    }
+
+    @Override
+    public int getMax() {
+        if (mSensitivityValues == null || mSensitivityValues.length == 0) {
+            return 0;
+        }
+        return mSensitivityValues.length - 1;
+    }
+
+    @Override
+    public int getMin() {
+        return 0;
+    }
+
+    private int getCurrentSensitivityValue() {
+        return Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.POWER_BUTTON_LONG_PRESS_DURATION_MS,
+                mContext.getResources().getInteger(
+                        com.android.internal.R.integer.config_longPressOnPowerDurationMs));
+    }
+
+    private static int closestValueIndex(int[] values, int needle) {
+        int minDistance = Integer.MAX_VALUE;
+        int valueIndex = 0;
+        for (int i = 0; i < values.length; i++) {
+            int diff = Math.abs(values[i] - needle);
+            if (diff < minDistance) {
+                minDistance = diff;
+                valueIndex = i;
+            }
+        }
+        return valueIndex;
+    }
+}
diff --git a/src/com/android/settings/gestures/OneHandedActionPullDownPrefController.java b/src/com/android/settings/gestures/OneHandedActionPullDownPrefController.java
index e17165b..26b3763 100644
--- a/src/com/android/settings/gestures/OneHandedActionPullDownPrefController.java
+++ b/src/com/android/settings/gestures/OneHandedActionPullDownPrefController.java
@@ -93,7 +93,8 @@
             return;
         }
         if (uri.equals(OneHandedSettingsUtils.ONE_HANDED_MODE_ENABLED_URI)
-                || uri.equals(OneHandedSettingsUtils.SHORTCUT_ENABLED_URI)) {
+                || uri.equals(OneHandedSettingsUtils.SOFTWARE_SHORTCUT_ENABLED_URI)
+                || uri.equals(OneHandedSettingsUtils.HARDWARE_SHORTCUT_ENABLED_URI)) {
             mPreference.setEnabled(OneHandedSettingsUtils.canEnableController(mContext));
         } else if (uri.equals(OneHandedSettingsUtils.SHOW_NOTIFICATION_ENABLED_URI)) {
             updateState(mPreference);
diff --git a/src/com/android/settings/gestures/OneHandedActionShowNotificationPrefController.java b/src/com/android/settings/gestures/OneHandedActionShowNotificationPrefController.java
index 9f56a14..524c135 100644
--- a/src/com/android/settings/gestures/OneHandedActionShowNotificationPrefController.java
+++ b/src/com/android/settings/gestures/OneHandedActionShowNotificationPrefController.java
@@ -93,7 +93,8 @@
             return;
         }
         if (uri.equals(OneHandedSettingsUtils.ONE_HANDED_MODE_ENABLED_URI)
-                || uri.equals(OneHandedSettingsUtils.SHORTCUT_ENABLED_URI)) {
+                || uri.equals(OneHandedSettingsUtils.SOFTWARE_SHORTCUT_ENABLED_URI)
+                || uri.equals(OneHandedSettingsUtils.HARDWARE_SHORTCUT_ENABLED_URI)) {
             mPreference.setEnabled(OneHandedSettingsUtils.canEnableController(mContext));
         } else if (uri.equals(OneHandedSettingsUtils.SHOW_NOTIFICATION_ENABLED_URI)) {
             updateState(mPreference);
diff --git a/src/com/android/settings/gestures/OneHandedSettingsUtils.java b/src/com/android/settings/gestures/OneHandedSettingsUtils.java
index f058689..04898dc 100644
--- a/src/com/android/settings/gestures/OneHandedSettingsUtils.java
+++ b/src/com/android/settings/gestures/OneHandedSettingsUtils.java
@@ -27,6 +27,7 @@
 import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.provider.Settings;
+import android.text.TextUtils;
 
 import androidx.annotation.VisibleForTesting;
 
@@ -45,8 +46,10 @@
             Settings.Secure.getUriFor(Settings.Secure.ONE_HANDED_MODE_ENABLED);
     static final Uri SHOW_NOTIFICATION_ENABLED_URI =
             Settings.Secure.getUriFor(Settings.Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED);
-    static final Uri SHORTCUT_ENABLED_URI =
+    static final Uri SOFTWARE_SHORTCUT_ENABLED_URI =
             Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS);
+    static final Uri HARDWARE_SHORTCUT_ENABLED_URI =
+            Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE);
 
     public enum OneHandedTimeout {
         NEVER(0), SHORT(4), MEDIUM(8), LONG(12);
@@ -238,9 +241,20 @@
      * @return true if user enabled one-handed shortcut in settings, false otherwise.
      */
     public static boolean getShortcutEnabled(Context context) {
-        final String targets = Settings.Secure.getStringForUser(context.getContentResolver(),
+        // Checks SOFTWARE_SHORTCUT_KEY
+        final String targetsSW = Settings.Secure.getStringForUser(context.getContentResolver(),
                 Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS, sCurrentUserId);
-        return targets != null ? targets.contains(ONE_HANDED_MODE_TARGET_NAME) : false;
+        if (!TextUtils.isEmpty(targetsSW) && targetsSW.contains(ONE_HANDED_MODE_TARGET_NAME)) {
+            return true;
+        }
+
+        // Checks HARDWARE_SHORTCUT_KEY
+        final String targetsHW = Settings.Secure.getStringForUser(context.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE, sCurrentUserId);
+        if (!TextUtils.isEmpty(targetsHW) && targetsHW.contains(ONE_HANDED_MODE_TARGET_NAME)) {
+            return true;
+        }
+        return false;
     }
 
     /**
@@ -285,7 +299,8 @@
             final ContentResolver resolver = mContext.getContentResolver();
             resolver.registerContentObserver(ONE_HANDED_MODE_ENABLED_URI, true, this);
             resolver.registerContentObserver(SHOW_NOTIFICATION_ENABLED_URI, true, this);
-            resolver.registerContentObserver(SHORTCUT_ENABLED_URI, true, this);
+            resolver.registerContentObserver(SOFTWARE_SHORTCUT_ENABLED_URI, true, this);
+            resolver.registerContentObserver(HARDWARE_SHORTCUT_ENABLED_URI, true, this);
         }
 
         @Override
diff --git a/src/com/android/settings/gestures/PowerMenuPreferenceController.java b/src/com/android/settings/gestures/PowerMenuPreferenceController.java
index 0d5f810..b4f97aa 100644
--- a/src/com/android/settings/gestures/PowerMenuPreferenceController.java
+++ b/src/com/android/settings/gestures/PowerMenuPreferenceController.java
@@ -16,30 +16,23 @@
 
 package com.android.settings.gestures;
 
-import android.content.Context;
-import android.provider.Settings;
+import static com.android.settings.gestures.PowerMenuSettingsUtils.LONG_PRESS_POWER_ASSISTANT_VALUE;
+import static com.android.settings.gestures.PowerMenuSettingsUtils.LONG_PRESS_POWER_GLOBAL_ACTIONS;
 
-import com.android.internal.annotations.VisibleForTesting;
+import android.content.Context;
+
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 
 public class PowerMenuPreferenceController extends BasePreferenceController {
 
-    private static final String POWER_BUTTON_LONG_PRESS_SETTING =
-            Settings.Global.POWER_BUTTON_LONG_PRESS;
-
-    @VisibleForTesting
-    static final int LONG_PRESS_POWER_GLOBAL_ACTIONS = 1;
-    @VisibleForTesting
-    static final int LONG_PRESS_POWER_ASSISTANT_VALUE = 5;
-
     public PowerMenuPreferenceController(Context context, String key) {
         super(context, key);
     }
 
     @Override
     public CharSequence getSummary() {
-        final int powerButtonValue = getPowerButtonLongPressValue(mContext);
+        final int powerButtonValue = PowerMenuSettingsUtils.getPowerButtonSettingValue(mContext);
         if (powerButtonValue == LONG_PRESS_POWER_ASSISTANT_VALUE) {
             return mContext.getText(R.string.power_menu_summary_long_press_for_assist_enabled);
         } else if (powerButtonValue == LONG_PRESS_POWER_GLOBAL_ACTIONS) {
@@ -60,11 +53,4 @@
         return mContext.getResources().getBoolean(
                 com.android.internal.R.bool.config_longPressOnPowerForAssistantSettingAvailable);
     }
-
-    private static int getPowerButtonLongPressValue(Context context) {
-        return Settings.Global.getInt(context.getContentResolver(),
-                POWER_BUTTON_LONG_PRESS_SETTING,
-                context.getResources().getInteger(
-                        com.android.internal.R.integer.config_longPressOnPowerBehavior));
-    }
 }
diff --git a/src/com/android/settings/gestures/PowerMenuSettingsUtils.java b/src/com/android/settings/gestures/PowerMenuSettingsUtils.java
new file mode 100644
index 0000000..444b7c1
--- /dev/null
+++ b/src/com/android/settings/gestures/PowerMenuSettingsUtils.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2021 The Android Open Source 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 com.android.settings.gestures;
+
+import android.content.Context;
+import android.provider.Settings;
+
+/** Common code for long press power settings shared between controllers. */
+final class PowerMenuSettingsUtils {
+
+    /**
+     * Setting storing the current behaviour of long press power.
+     */
+    public static final String POWER_BUTTON_LONG_PRESS_SETTING =
+            Settings.Global.POWER_BUTTON_LONG_PRESS;
+
+    /**
+     * Value used for long press power button behaviour when the Assist setting is disabled.
+     *
+     * If this value matches Assist setting, then it falls back to Global Actions panel or
+     * power menu, depending on their respective settings.
+     */
+    public static final int POWER_BUTTON_LONG_PRESS_DEFAULT_VALUE_RESOURCE =
+            com.android.internal.R.integer.config_longPressOnPowerBehavior;
+
+    /**
+     * Values used for long press power button behaviour when Assist setting is enabled.
+     *
+     * {@link com.android.server.policy.PhoneWindowManager#LONG_PRESS_POWER_GLOBAL_ACTIONS} for
+     * source of the value.
+     */
+    static final int LONG_PRESS_POWER_NO_ACTION = 0;
+    static final int LONG_PRESS_POWER_GLOBAL_ACTIONS = 1;
+    static final int LONG_PRESS_POWER_ASSISTANT_VALUE = 5; // Settings.Secure.ASSISTANT
+
+    /**
+     * @return current value of power button behaviour.
+     */
+    public static int getPowerButtonSettingValue(Context context) {
+        return Settings.Global.getInt(context.getContentResolver(),
+                POWER_BUTTON_LONG_PRESS_SETTING,
+                context.getResources().getInteger(POWER_BUTTON_LONG_PRESS_DEFAULT_VALUE_RESOURCE));
+    }
+
+    /**
+     * @return true if long press power for assist is currently enabled.
+     */
+    public static boolean isLongPressPowerForAssistEnabled(Context context) {
+        return getPowerButtonSettingValue(context) == LONG_PRESS_POWER_ASSISTANT_VALUE;
+    }
+
+    private PowerMenuSettingsUtils() {
+    }
+}
diff --git a/src/com/android/settings/network/NetworkProviderCallsSmsController.java b/src/com/android/settings/network/NetworkProviderCallsSmsController.java
index f83418b..c8b1c49 100644
--- a/src/com/android/settings/network/NetworkProviderCallsSmsController.java
+++ b/src/com/android/settings/network/NetworkProviderCallsSmsController.java
@@ -24,6 +24,7 @@
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.view.View;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.lifecycle.LifecycleObserver;
@@ -44,12 +45,14 @@
 
     private static final String TAG = "NetworkProviderCallsSmsController";
     private static final String KEY = "calls_and_sms";
+    private static final String RTL_MARK = "\u200F";
 
     private UserManager mUserManager;
     private SubscriptionManager mSubscriptionManager;
     private SubscriptionsChangeListener mSubscriptionsChangeListener;
     private TelephonyManager mTelephonyManager;
     private RestrictedPreference mPreference;
+    private boolean mIsRtlMode;
 
     /**
      * The summary text and click behavior of the "Calls & SMS" item on the
@@ -61,6 +64,8 @@
         mUserManager = context.getSystemService(UserManager.class);
         mSubscriptionManager = context.getSystemService(SubscriptionManager.class);
         mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
+        mIsRtlMode = context.getResources().getConfiguration().getLayoutDirection()
+                == View.LAYOUT_DIRECTION_RTL;
         if (lifecycle != null) {
             mSubscriptionsChangeListener = new SubscriptionsChangeListener(context, this);
             lifecycle.addObserver(this);
@@ -121,6 +126,10 @@
                 if (subInfo != subs.get(subs.size() - 1)) {
                     summary.append(", ");
                 }
+
+                if (mIsRtlMode) {
+                    summary.insert(0, RTL_MARK).insert(summary.length(), RTL_MARK);
+                }
             }
             return summary;
         }
@@ -152,12 +161,12 @@
     }
 
     @VisibleForTesting
-    protected int getDefaultVoiceSubscriptionId(){
+    protected int getDefaultVoiceSubscriptionId() {
         return SubscriptionManager.getDefaultVoiceSubscriptionId();
     }
 
     @VisibleForTesting
-    protected int getDefaultSmsSubscriptionId(){
+    protected int getDefaultSmsSubscriptionId() {
         return SubscriptionManager.getDefaultSmsSubscriptionId();
     }
 
diff --git a/src/com/android/settings/network/NetworkProviderDownloadedSimsCategoryController.java b/src/com/android/settings/network/NetworkProviderDownloadedSimsCategoryController.java
index 199740f..f7c70f2 100644
--- a/src/com/android/settings/network/NetworkProviderDownloadedSimsCategoryController.java
+++ b/src/com/android/settings/network/NetworkProviderDownloadedSimsCategoryController.java
@@ -3,9 +3,11 @@
 import android.content.Context;
 
 import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.R;
 import com.android.settings.widget.PreferenceCategoryController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -15,6 +17,7 @@
 
     private static final String KEY_PREFERENCE_CATEGORY_DOWNLOADED_SIM =
             "provider_model_downloaded_sim_category";
+    private PreferenceCategory mPreferenceCategory;
     private NetworkProviderDownloadedSimListController mNetworkProviderDownloadedSimListController;
 
     public NetworkProviderDownloadedSimsCategoryController(Context context, String key) {
@@ -44,9 +47,19 @@
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
-        PreferenceCategory preferenceCategory = screen.findPreference(
+        mPreferenceCategory = screen.findPreference(
                 KEY_PREFERENCE_CATEGORY_DOWNLOADED_SIM);
-        preferenceCategory.setVisible(isAvailable());
+        mPreferenceCategory.setVisible(isAvailable());
         mNetworkProviderDownloadedSimListController.displayPreference(screen);
     }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        int count = mPreferenceCategory.getPreferenceCount();
+        String title = mContext.getString(count > 1
+                ? R.string.downloaded_sims_category_title
+                : R.string.downloaded_sim_category_title);
+        mPreferenceCategory.setTitle(title);
+    }
 }
diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java
index 35a34d4..88211ad 100644
--- a/src/com/android/settings/network/NetworkProviderSettings.java
+++ b/src/com/android/settings/network/NetworkProviderSettings.java
@@ -71,7 +71,7 @@
 import com.android.settings.wifi.WifiDialog2;
 import com.android.settings.wifi.WifiPickerTrackerHelper;
 import com.android.settings.wifi.WifiUtils;
-import com.android.settings.wifi.details2.WifiNetworkDetailsFragment2;
+import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
 import com.android.settings.wifi.dpp.WifiDppUtils;
 import com.android.settingslib.HelpUtils;
 import com.android.settingslib.RestrictedLockUtils;
@@ -710,6 +710,11 @@
             Log.i(TAG, "onWifiStateChanged called with wifi state: " + wifiState);
         }
 
+        if (isFinishingOrDestroyed()) {
+            Log.w(TAG, "onWifiStateChanged shouldn't run when fragment is finishing or destroyed");
+            return;
+        }
+
         switch (wifiState) {
             case WifiManager.WIFI_STATE_ENABLED:
                 updateWifiEntryPreferences();
@@ -924,11 +929,11 @@
                         : context.getText(R.string.pref_title_network_details);
 
         final Bundle bundle = new Bundle();
-        bundle.putString(WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY, wifiEntry.getKey());
+        bundle.putString(WifiNetworkDetailsFragment.KEY_CHOSEN_WIFIENTRY_KEY, wifiEntry.getKey());
 
         new SubSettingLauncher(context)
                 .setTitleText(title)
-                .setDestination(WifiNetworkDetailsFragment2.class.getName())
+                .setDestination(WifiNetworkDetailsFragment.class.getName())
                 .setArguments(bundle)
                 .setSourceMetricsCategory(getMetricsCategory())
                 .launch();
@@ -961,12 +966,10 @@
 
     @VisibleForTesting
     void setAdditionalSettingsSummaries() {
-        if (!FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) {
-            mConfigureWifiSettingsPreference.setSummary(getString(
-                    isWifiWakeupEnabled()
-                            ? R.string.wifi_configure_settings_preference_summary_wakeup_on
-                            : R.string.wifi_configure_settings_preference_summary_wakeup_off));
-        }
+        mConfigureWifiSettingsPreference.setSummary(getString(
+                isWifiWakeupEnabled()
+                        ? R.string.wifi_configure_settings_preference_summary_wakeup_on
+                        : R.string.wifi_configure_settings_preference_summary_wakeup_off));
 
         final int numSavedNetworks = mWifiPickerTracker.getNumSavedNetworks();
         final int numSavedSubscriptions = mWifiPickerTracker.getNumSavedSubscriptions();
@@ -981,6 +984,11 @@
 
     private String getSavedNetworkSettingsSummaryText(
             int numSavedNetworks, int numSavedSubscriptions) {
+        if (getResources() == null) {
+            Log.w(TAG, "getSavedNetworkSettingsSummaryText shouldn't run if resource is not ready");
+            return null;
+        }
+
         if (numSavedSubscriptions == 0) {
             return getResources().getQuantityString(R.plurals.wifi_saved_access_points_summary,
                     numSavedNetworks, numSavedNetworks);
@@ -1174,7 +1182,7 @@
 
     private void launchConfigNewNetworkFragment(WifiEntry wifiEntry) {
         final Bundle bundle = new Bundle();
-        bundle.putString(WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY,
+        bundle.putString(WifiNetworkDetailsFragment.KEY_CHOSEN_WIFIENTRY_KEY,
                 wifiEntry.getKey());
         new SubSettingLauncher(getContext())
                 .setTitleText(wifiEntry.getTitle())
diff --git a/src/com/android/settings/network/SubscriptionsPreferenceController.java b/src/com/android/settings/network/SubscriptionsPreferenceController.java
index 8e9e946..36c55e2 100644
--- a/src/com/android/settings/network/SubscriptionsPreferenceController.java
+++ b/src/com/android/settings/network/SubscriptionsPreferenceController.java
@@ -311,7 +311,8 @@
             numLevels += 1;
         }
 
-        Drawable icon = mSubsPrefCtrlInjector.getIcon(mContext, level, numLevels, false);
+        Drawable icon = mSubsPrefCtrlInjector.getIcon(mContext, level, numLevels,
+                !mTelephonyManager.isDataEnabled());
         final boolean isActiveCellularNetwork =
                 mSubsPrefCtrlInjector.isActiveCellularNetwork(mContext);
         if (isActiveCellularNetwork || (mWifiPickerTrackerHelper != null)
diff --git a/src/com/android/settings/network/telephony/CallsDefaultSubscriptionController.java b/src/com/android/settings/network/telephony/CallsDefaultSubscriptionController.java
index 36b19ba..16ac8f7 100644
--- a/src/com/android/settings/network/telephony/CallsDefaultSubscriptionController.java
+++ b/src/com/android/settings/network/telephony/CallsDefaultSubscriptionController.java
@@ -46,7 +46,7 @@
     @Override
     public CharSequence getSummary() {
         if (Utils.isProviderModelEnabled(mContext)) {
-            return MobileNetworkUtils.getPreferredStatus(mContext, mManager, true);
+            return MobileNetworkUtils.getPreferredStatus(isRtlMode(), mContext, mManager, true);
         } else {
             return super.getSummary();
         }
diff --git a/src/com/android/settings/network/telephony/DefaultSubscriptionController.java b/src/com/android/settings/network/telephony/DefaultSubscriptionController.java
index 4fb6cff7..d21d584 100644
--- a/src/com/android/settings/network/telephony/DefaultSubscriptionController.java
+++ b/src/com/android/settings/network/telephony/DefaultSubscriptionController.java
@@ -26,6 +26,7 @@
 import android.telecom.TelecomManager;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
+import android.view.View;
 
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleObserver;
@@ -62,11 +63,14 @@
     private static final ComponentName PSTN_CONNECTION_SERVICE_COMPONENT =
             new ComponentName("com.android.phone",
                     "com.android.services.telephony.TelephonyConnectionService");
+    private boolean mIsRtlMode;
 
     public DefaultSubscriptionController(Context context, String preferenceKey) {
         super(context, preferenceKey);
         mManager = context.getSystemService(SubscriptionManager.class);
         mChangeListener = new SubscriptionsChangeListener(context, this);
+        mIsRtlMode = context.getResources().getConfiguration().getLayoutDirection()
+                == View.LAYOUT_DIRECTION_RTL;
     }
 
     public void init(Lifecycle lifecycle) {
@@ -285,4 +289,8 @@
             refreshSummary(mPreference);
         }
     }
+
+    boolean isRtlMode() {
+        return mIsRtlMode;
+    }
 }
diff --git a/src/com/android/settings/network/telephony/MobileNetworkActivity.java b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
index c6fe39c..efb5f8c 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkActivity.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
@@ -39,7 +39,6 @@
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.Lifecycle;
 
-import com.android.internal.util.CollectionUtils;
 import com.android.settings.R;
 import com.android.settings.core.SettingsBaseActivity;
 import com.android.settings.network.ProxySubscriptionManager;
@@ -48,6 +47,7 @@
 import com.android.settings.network.helper.SubscriptionAnnotation;
 
 import java.util.List;
+import java.util.function.Function;
 
 /**
  * Activity for displaying MobileNetworkSettings
@@ -64,15 +64,14 @@
     @VisibleForTesting
     ProxySubscriptionManager mProxySubscriptionMgr;
 
-    private int mCurSubscriptionId;
+    private int mCurSubscriptionId = SUB_ID_NULL;
 
     // This flag forces subscription information fragment to be re-created.
     // Otherwise, fragment will be kept when subscription id has not been changed.
     //
     // Set initial value to true allows subscription information fragment to be re-created when
     // Activity re-create occur.
-    private boolean mFragmentForceReload = true;
-    private boolean mPendingSubscriptionChange = false;
+    private boolean mPendingSubscriptionChange = true;
 
     @Override
     protected void onNewIntent(Intent intent) {
@@ -80,21 +79,25 @@
         validate(intent);
         setIntent(intent);
 
-        int updateSubscriptionIndex = SUB_ID_NULL;
+        int updateSubscriptionIndex = mCurSubscriptionId;
         if (intent != null) {
             updateSubscriptionIndex = intent.getIntExtra(Settings.EXTRA_SUB_ID, SUB_ID_NULL);
         }
+        SubscriptionInfo info = getSubscriptionOrDefault(updateSubscriptionIndex);
+        if (info == null) {
+            Log.d(TAG, "Invalid subId request " + mCurSubscriptionId
+                    + " -> " + updateSubscriptionIndex);
+            return;
+        }
+
         int oldSubId = mCurSubscriptionId;
-        mCurSubscriptionId = updateSubscriptionIndex;
-        mFragmentForceReload = (mCurSubscriptionId == oldSubId);
-        final SubscriptionInfo info = getSubscription();
         updateSubscriptions(info, null);
 
         // If the subscription has changed or the new intent doesnt contain the opt in action,
         // remove the old discovery dialog. If the activity is being recreated, we will see
         // onCreate -> onNewIntent, so the dialog will first be recreated for the old subscription
         // and then removed.
-        if (updateSubscriptionIndex != oldSubId || !doesIntentContainOptInAction(intent)) {
+        if (mCurSubscriptionId != oldSubId || !doesIntentContainOptInAction(intent)) {
             removeContactDiscoveryDialog(oldSubId);
         }
         // evaluate showing the new discovery dialog if this intent contains an action to show the
@@ -135,7 +138,13 @@
         // perform registration after mCurSubscriptionId been configured.
         registerActiveSubscriptionsListener();
 
-        final SubscriptionInfo subscription = getSubscription();
+        SubscriptionInfo subscription = getSubscriptionOrDefault(mCurSubscriptionId);
+        if (subscription == null) {
+            Log.d(TAG, "Invalid subId request " + mCurSubscriptionId);
+            tryToFinishActivity();
+            return;
+        }
+
         maybeShowContactDiscoveryDialog(subscription);
 
         updateSubscriptions(subscription, null);
@@ -158,39 +167,81 @@
      * Implementation of ProxySubscriptionManager.OnActiveSubscriptionChangedListener
      */
     public void onChanged() {
+        mPendingSubscriptionChange = false;
+
+        if (mCurSubscriptionId == SUB_ID_NULL) {
+            return;
+        }
+
         if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) {
             mPendingSubscriptionChange = true;
             return;
         }
-        SubscriptionInfo info = getSubscription();
-        int oldSubIndex = mCurSubscriptionId;
-        updateSubscriptions(info, null);
 
-        // Remove the dialog if the subscription associated with this activity changes.
-        if (info == null) {
-            // Close the activity when subscription removed
-            if ((oldSubIndex != SUB_ID_NULL)
-                    && (!isFinishing()) && (!isDestroyed())) {
-                finish();
+        SubscriptionInfo subInfo = getSubscription(mCurSubscriptionId, null);
+        if (subInfo != null) {
+            if (mCurSubscriptionId != subInfo.getSubscriptionId()) {
+                // update based on subscription status change
+                removeContactDiscoveryDialog(mCurSubscriptionId);
+                updateSubscriptions(subInfo, null);
             }
             return;
         }
-        int subIndex = info.getSubscriptionId();
-        if (subIndex != oldSubIndex) {
-            removeContactDiscoveryDialog(oldSubIndex);
+
+        Log.w(TAG, "subId missing: " + mCurSubscriptionId);
+
+        // When UI is not the active one, avoid from destroy it immediately
+        // but wait until onResume() to see if subscription back online again.
+        // This is to avoid from glitch behavior of subscription which changes
+        // the UI when UI is considered as in the background or only partly
+        // visible.
+        if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) {
+            mPendingSubscriptionChange = true;
+            return;
+        }
+
+        // Subscription could be missing
+        tryToFinishActivity();
+    }
+
+    protected void runSubscriptionUpdate(Runnable onUpdateRemaining) {
+        SubscriptionInfo subInfo = getSubscription(mCurSubscriptionId, null);
+        if (subInfo == null) {
+            tryToFinishActivity();
+            return;
+        }
+        if (mCurSubscriptionId != subInfo.getSubscriptionId()) {
+            removeContactDiscoveryDialog(mCurSubscriptionId);
+            updateSubscriptions(subInfo, null);
+        }
+        onUpdateRemaining.run();
+    }
+
+    protected void tryToFinishActivity() {
+        if ((!isFinishing()) && (!isDestroyed())) {
+            finish();
         }
     }
 
     @Override
     protected void onStart() {
         getProxySubscriptionManager().setLifecycle(getLifecycle());
-        super.onStart();
-        // updateSubscriptions doesn't need to be called, onChanged will always be called after we
-        // register a listener.
         if (mPendingSubscriptionChange) {
             mPendingSubscriptionChange = false;
-            onChanged();
+            runSubscriptionUpdate(() -> super.onStart());
+            return;
         }
+        super.onStart();
+    }
+
+    @Override
+    protected void onResume() {
+        if (mPendingSubscriptionChange) {
+            mPendingSubscriptionChange = false;
+            runSubscriptionUpdate(() -> super.onResume());
+            return;
+        }
+        super.onResume();
     }
 
     @Override
@@ -235,30 +286,49 @@
         }
 
         mCurSubscriptionId = subscriptionIndex;
-        mFragmentForceReload = false;
+    }
+
+    /**
+     * Select one of the subscription as the default subscription.
+     * @param subAnnoList a list of {@link SubscriptionAnnotation}
+     * @return ideally the {@link SubscriptionAnnotation} as expected
+     */
+    protected SubscriptionAnnotation defaultSubscriptionSelection(
+            List<SubscriptionAnnotation> subAnnoList) {
+        return (subAnnoList == null) ? null :
+                subAnnoList.stream()
+                .filter(SubscriptionAnnotation::isDisplayAllowed)
+                .filter(SubscriptionAnnotation::isActive)
+                .findFirst().orElse(null);
+    }
+
+    protected SubscriptionInfo getSubscriptionOrDefault(int subscriptionId) {
+        return getSubscription(subscriptionId,
+                (subscriptionId != SUB_ID_NULL) ? null : (
+                    subAnnoList -> defaultSubscriptionSelection(subAnnoList)
+                ));
     }
 
     /**
      * Get the current subscription to display. First check whether intent has {@link
-     * Settings#EXTRA_SUB_ID} and if so find the subscription with that id. If not, just return the
-     * first one in the mSubscriptionInfos list since it is already sorted by sim slot.
+     * Settings#EXTRA_SUB_ID} and if so find the subscription with that id.
+     * If not, select default one based on {@link Function} provided.
+     *
+     * @param preferredSubscriptionId preferred subscription id
+     * @param selectionOfDefault when true current subscription is absent
      */
     @VisibleForTesting
-    SubscriptionInfo getSubscription() {
+    protected SubscriptionInfo getSubscription(int preferredSubscriptionId,
+            Function<List<SubscriptionAnnotation>, SubscriptionAnnotation> selectionOfDefault) {
         List<SubscriptionAnnotation> subList =
                 (new SelectableSubscriptions(this, true)).call();
-        SubscriptionAnnotation currentSubInfo = null;
-        if (mCurSubscriptionId != SUB_ID_NULL) {
-            currentSubInfo = subList.stream()
-                    .filter(SubscriptionAnnotation::isDisplayAllowed)
-                    .filter(subAnno -> (subAnno.getSubscriptionId() == mCurSubscriptionId))
-                    .findFirst().orElse(null);
-        }
-        if (currentSubInfo == null) {
-            currentSubInfo = subList.stream()
-                    .filter(SubscriptionAnnotation::isDisplayAllowed)
-                    .filter(SubscriptionAnnotation::isActive)
-                    .findFirst().orElse(null);
+        Log.d(TAG, "get subId=" + preferredSubscriptionId + " from " + subList);
+        SubscriptionAnnotation currentSubInfo = subList.stream()
+                .filter(SubscriptionAnnotation::isDisplayAllowed)
+                .filter(subAnno -> (subAnno.getSubscriptionId() == preferredSubscriptionId))
+                .findFirst().orElse(null);
+        if ((currentSubInfo == null) && (selectionOfDefault != null)) {
+            currentSubInfo = selectionOfDefault.apply(subList);
         }
         return (currentSubInfo == null) ? null : currentSubInfo.getSubInfo();
     }
@@ -285,10 +355,6 @@
 
         final String fragmentTag = buildFragmentTag(subId);
         if (fragmentManager.findFragmentByTag(fragmentTag) != null) {
-            if (!mFragmentForceReload) {
-                Log.d(TAG, "Keep current fragment: " + fragmentTag);
-                return;
-            }
             Log.d(TAG, "Construct fragment: " + fragmentTag);
         }
 
diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
index adf399f..ba80a8c 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
@@ -193,6 +193,7 @@
                 .addListener(videoCallingPreferenceController);
         use(ContactDiscoveryPreferenceController.class).init(getParentFragmentManager(), mSubId,
                 getLifecycle());
+        use(NrAdvancedCallingPreferenceController.class).init(mSubId);
     }
 
     @Override
diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
index 1898484..ebf77a0 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
@@ -84,6 +84,8 @@
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 public class MobileNetworkUtils {
 
@@ -99,6 +101,7 @@
             "esim.enable_esim_system_ui_by_default";
     private static final String LEGACY_ACTION_CONFIGURE_PHONE_ACCOUNT =
             "android.telecom.action.CONNECTION_SERVICE_CONFIGURE";
+    private static final String RTL_MARK = "\u200F";
 
     // The following constants are used to draw signal icon.
     public static final int NO_CELL_DATA_TYPE_ICON = 0;
@@ -257,9 +260,16 @@
     public static boolean showEuiccSettings(Context context) {
         long timeForAccess = SystemClock.elapsedRealtime();
         try {
-            return ((Future<Boolean>) ThreadUtils.postOnBackgroundThread(()
-                    -> showEuiccSettingsDetecting(context))).get();
-        } catch (ExecutionException | InterruptedException exception) {
+            Boolean isShow = ((Future<Boolean>) ThreadUtils.postOnBackgroundThread(() -> {
+                        try {
+                            return showEuiccSettingsDetecting(context);
+                        } catch (Exception threadException) {
+                            Log.w(TAG, "Accessing Euicc failure", threadException);
+                        }
+                        return Boolean.FALSE;
+                    })).get(3, TimeUnit.SECONDS);
+            return ((isShow != null) && isShow.booleanValue());
+        } catch (ExecutionException | InterruptedException | TimeoutException exception) {
             timeForAccess = SystemClock.elapsedRealtime() - timeForAccess;
             Log.w(TAG, "Accessing Euicc takes too long: +" + timeForAccess + "ms");
         }
@@ -278,7 +288,7 @@
         final ContentResolver cr = context.getContentResolver();
         final boolean esimIgnoredDevice =
                 Arrays.asList(TextUtils.split(SystemProperties.get(KEY_ESIM_CID_IGNORE, ""), ","))
-                        .contains(SystemProperties.get(KEY_CID, null));
+                        .contains(SystemProperties.get(KEY_CID));
         final boolean enabledEsimUiByDefault =
                 SystemProperties.getBoolean(KEY_ENABLE_ESIM_UI_BY_DEFAULT, true);
         final boolean euiccProvisioned =
@@ -922,7 +932,7 @@
     /**
      * Returns preferred status of Calls & SMS separately when Provider Model is enabled.
      */
-    public static CharSequence getPreferredStatus(Context context,
+    public static CharSequence getPreferredStatus(boolean isRtlMode, Context context,
             SubscriptionManager subscriptionManager, boolean isPreferredCallStatus) {
         final List<SubscriptionInfo> subs = SubscriptionUtil.getActiveSubscriptions(
                 subscriptionManager);
@@ -956,6 +966,10 @@
                 if (subInfo != subs.get(subs.size() - 1)) {
                     summary.append(", ");
                 }
+
+                if (isRtlMode) {
+                    summary.insert(0, RTL_MARK).insert(summary.length(), RTL_MARK);
+                }
             }
             return summary;
         } else {
diff --git a/src/com/android/settings/network/telephony/NrAdvancedCallingPreferenceController.java b/src/com/android/settings/network/telephony/NrAdvancedCallingPreferenceController.java
new file mode 100644
index 0000000..7615fe3
--- /dev/null
+++ b/src/com/android/settings/network/telephony/NrAdvancedCallingPreferenceController.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright (C) 2021 The Android Open Source 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 com.android.settings.network.telephony;
+
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyCallback;
+import android.telephony.TelephonyManager;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import com.android.internal.telephony.util.ArrayUtils;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+/**
+ * Preference controller for "Enhanced 4G LTE"
+ */
+public class NrAdvancedCallingPreferenceController extends TelephonyTogglePreferenceController
+        implements LifecycleObserver, OnStart, OnStop {
+
+    private static final String TAG = "VoNrSettings";
+
+    @VisibleForTesting
+    Preference mPreference;
+    private TelephonyManager mTelephonyManager;
+    private PhoneCallStateTelephonyCallback mTelephonyCallback;
+    private boolean mIsVonrVisibleFromCarrierConfig = false;
+    private boolean mIsNrEnableFromCarrierConfig = false;
+    private boolean mHas5gCapability = false;
+    private Integer mCallState;
+
+    public NrAdvancedCallingPreferenceController(Context context, String key) {
+        super(context, key);
+        mTelephonyManager = context.getSystemService(TelephonyManager.class);
+    }
+
+    /**
+     * Initial this PreferenceController.
+     * @param subId The subscription Id.
+     * @return This PreferenceController.
+     */
+    public NrAdvancedCallingPreferenceController init(int subId) {
+        Log.d(TAG, "init: ");
+        if (mTelephonyCallback == null) {
+            mTelephonyCallback = new PhoneCallStateTelephonyCallback();
+        }
+
+        mSubId = subId;
+
+        if (mTelephonyManager == null) {
+            mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
+        }
+        if (SubscriptionManager.isValidSubscriptionId(subId)) {
+            mTelephonyManager = mTelephonyManager.createForSubscriptionId(subId);
+        }
+        long supportedRadioBitmask = mTelephonyManager.getSupportedRadioAccessFamily();
+        mHas5gCapability =
+                (supportedRadioBitmask & TelephonyManager.NETWORK_TYPE_BITMASK_NR) > 0;
+
+        PersistableBundle carrierConfig = getCarrierConfigForSubId(subId);
+        if (carrierConfig == null) {
+            return this;
+        }
+        mIsVonrVisibleFromCarrierConfig = carrierConfig.getBoolean(
+                CarrierConfigManager.KEY_VONR_SETTING_VISIBILITY_BOOL);
+
+        int[] nrAvailabilities = carrierConfig.getIntArray(
+                CarrierConfigManager.KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY);
+        mIsNrEnableFromCarrierConfig = !ArrayUtils.isEmpty(nrAvailabilities);
+
+        Log.d(TAG, "mHas5gCapability: " + mHas5gCapability
+                + ",mIsNrEnabledFromCarrierConfig: " + mIsNrEnableFromCarrierConfig
+                + ",mIsVonrVisibleFromCarrierConfig: " + mIsVonrVisibleFromCarrierConfig);
+        return this;
+    }
+
+    @Override
+    public int getAvailabilityStatus(int subId) {
+        init(subId);
+
+        if (mHas5gCapability && mIsNrEnableFromCarrierConfig && mIsVonrVisibleFromCarrierConfig) {
+            return AVAILABLE;
+        }
+        return CONDITIONALLY_UNAVAILABLE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public void onStart() {
+        if (mTelephonyCallback == null) {
+            return;
+        }
+        mTelephonyCallback.register(mTelephonyManager);
+    }
+
+    @Override
+    public void onStop() {
+        if (mTelephonyCallback == null) {
+            return;
+        }
+        mTelephonyCallback.unregister();
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        if (preference == null) {
+            return;
+        }
+        final SwitchPreference switchPreference = (SwitchPreference) preference;
+        switchPreference.setEnabled(isUserControlAllowed());
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {
+            return false;
+        }
+        Log.d(TAG, "setChecked: " + isChecked);
+        int result = mTelephonyManager.setVoNrEnabled(isChecked);
+        if (result == TelephonyManager.ENABLE_VONR_SUCCESS) {
+            return true;
+        }
+        Log.d(TAG, "Fail to set VoNR result= " + result + ". subId=" + mSubId);
+        return false;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return mTelephonyManager.isVoNrEnabled();
+    }
+
+    @VisibleForTesting
+    protected boolean isCallStateIdle() {
+        return (mCallState != null) && (mCallState == TelephonyManager.CALL_STATE_IDLE);
+    }
+
+    private boolean isUserControlAllowed() {
+        return isCallStateIdle();
+    }
+
+    private class PhoneCallStateTelephonyCallback extends TelephonyCallback implements
+            TelephonyCallback.CallStateListener {
+
+        private TelephonyManager mLocalTelephonyManager;
+
+        @Override
+        public void onCallStateChanged(int state) {
+            mCallState = state;
+            updateState(mPreference);
+        }
+
+        public void register(TelephonyManager telephonyManager) {
+            mLocalTelephonyManager = telephonyManager;
+
+            // assign current call state so that it helps to show correct preference state even
+            // before first onCallStateChanged() by initial registration.
+            mCallState = mLocalTelephonyManager.getCallState();
+            mLocalTelephonyManager.registerTelephonyCallback(
+                    mContext.getMainExecutor(), mTelephonyCallback);
+        }
+
+        public void unregister() {
+            mCallState = null;
+            if (mLocalTelephonyManager != null) {
+                mLocalTelephonyManager.unregisterTelephonyCallback(this);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java b/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
index c782b66..8e65605 100644
--- a/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
+++ b/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
@@ -52,6 +52,7 @@
 
 import com.google.common.collect.ImmutableMap;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -108,18 +109,18 @@
         mSubId = getArguments().getInt(KEY_SUBSCRIPTION_ID);
         Resources res = context.getResources();
         mLightDarkMap = ImmutableMap.<Integer, Integer>builder()
-                .put(res.getInteger(R.color.SIM_color_teal),
-                        res.getInteger(R.color.SIM_dark_mode_color_teal))
-                .put(res.getInteger(R.color.SIM_color_blue),
+                .put(res.getInteger(R.color.SIM_color_cyan),
+                        res.getInteger(R.color.SIM_dark_mode_color_cyan))
+                .put(res.getInteger(R.color.SIM_color_blue800),
                         res.getInteger(R.color.SIM_dark_mode_color_blue))
-                .put(res.getInteger(R.color.SIM_color_indigo),
-                        res.getInteger(R.color.SIM_dark_mode_color_indigo))
-                .put(res.getInteger(R.color.SIM_color_purple),
+                .put(res.getInteger(R.color.SIM_color_green800),
+                        res.getInteger(R.color.SIM_dark_mode_color_green))
+                .put(res.getInteger(R.color.SIM_color_purple800),
                         res.getInteger(R.color.SIM_dark_mode_color_purple))
-                .put(res.getInteger(R.color.SIM_color_pink),
+                .put(res.getInteger(R.color.SIM_color_pink800),
                         res.getInteger(R.color.SIM_dark_mode_color_pink))
-                .put(res.getInteger(R.color.SIM_color_red),
-                        res.getInteger(R.color.SIM_dark_mode_color_red))
+                .put(res.getInteger(R.color.SIM_color_orange),
+                        res.getInteger(R.color.SIM_dark_mode_color_orange))
                 .build();
     }
 
@@ -175,12 +176,7 @@
         final ColorAdapter adapter = new ColorAdapter(getContext(),
                 R.layout.dialog_mobile_network_color_picker_item, mColors);
         mColorSpinner.setAdapter(adapter);
-        for (int i = 0; i < mColors.length; i++) {
-            if (mColors[i].getColor() == info.getIconTint()) {
-                mColorSpinner.setSelection(i);
-                break;
-            }
-        }
+        mColorSpinner.setSelection(getSimColorIndex(info.getIconTint()));
 
         final TextView operatorName = view.findViewById(R.id.operator_name_value);
         mTelephonyManager = mTelephonyManager.createForSubscriptionId(mSubId);
@@ -239,7 +235,7 @@
 
     private Color[] getColors() {
         final Resources res = getContext().getResources();
-        final int[] colorInts = res.getIntArray(com.android.internal.R.array.sim_colors);
+        final int[] colorInts = res.getIntArray(R.array.sim_color_light);
         final String[] colorStrings = res.getStringArray(R.array.color_picker);
         final int iconSize = res.getDimensionPixelSize(R.dimen.color_swatch_size);
         final int strokeWidth = res.getDimensionPixelSize(R.dimen.color_swatch_stroke_width);
@@ -286,4 +282,31 @@
     private int getDarkColor(int lightColor) {
         return mLightDarkMap.getOrDefault(lightColor, lightColor);
     }
+
+    /*
+    * Get the color index from previous color that defined in Android OS
+    * (frameworks/base/core/res/res/values/arrays.xml). If can't find the color, continue to look
+    * for it in the new color plattee. If not, give it the first index.
+    */
+
+    private int getSimColorIndex(int color) {
+        int index = -1;
+        final int[] previousSimColorInts =
+                getContext().getResources().getIntArray(com.android.internal.R.array.sim_colors);
+        for (int i = 0; i < previousSimColorInts.length; i++) {
+            if (previousSimColorInts[i] == color) {
+                index = i;
+            }
+        }
+
+        if (index == -1) {
+            for (int i = 0; i < mColors.length; i++) {
+                if (mColors[i].getColor() == color) {
+                    index = i;
+                }
+            }
+        }
+
+        return index == -1 ? 0 : index;
+    }
 }
diff --git a/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java b/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java
index ca8c0f6..a73c621 100644
--- a/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java
+++ b/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java
@@ -62,7 +62,7 @@
     @Override
     public CharSequence getSummary() {
         if (Utils.isProviderModelEnabled(mContext)) {
-            return MobileNetworkUtils.getPreferredStatus(mContext, mManager, false);
+            return MobileNetworkUtils.getPreferredStatus(isRtlMode(), mContext, mManager, false);
         } else {
             return super.getSummary();
         }
diff --git a/src/com/android/settings/notification/app/RecentConversationsPreferenceController.java b/src/com/android/settings/notification/app/RecentConversationsPreferenceController.java
index 4984fad..1ceb45c 100644
--- a/src/com/android/settings/notification/app/RecentConversationsPreferenceController.java
+++ b/src/com/android/settings/notification/app/RecentConversationsPreferenceController.java
@@ -233,8 +233,13 @@
                 private final Collator sCollator = Collator.getInstance();
                 @Override
                 public int compare(ConversationChannel o1, ConversationChannel o2) {
-                    int labelComparison = sCollator.compare(o1.getShortcutInfo().getLabel(),
-                            o2.getShortcutInfo().getLabel());
+                    int labelComparison = 0;
+                    if (o1.getShortcutInfo().getLabel() != null
+                            && o2.getShortcutInfo().getLabel() != null) {
+                        labelComparison = sCollator.compare(
+                                o1.getShortcutInfo().getLabel().toString(),
+                                o2.getShortcutInfo().getLabel().toString());
+                    }
 
                     if (labelComparison == 0) {
                         return o1.getNotificationChannel().getId().compareTo(
diff --git a/src/com/android/settings/notification/history/NotificationHistoryActivity.java b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
index 1d663fc..ec09a9f 100644
--- a/src/com/android/settings/notification/history/NotificationHistoryActivity.java
+++ b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
@@ -163,7 +163,7 @@
             View viewForPackage = LayoutInflater.from(this)
                     .inflate(R.layout.notification_history_app_layout, null);
 
-            final View container = viewForPackage.findViewById(R.id.notification_list);
+            final View container = viewForPackage.findViewById(R.id.notification_list_wrapper);
             container.setVisibility(View.GONE);
             View header = viewForPackage.findViewById(R.id.app_header);
             NotificationExpandButton expand = viewForPackage.findViewById(
diff --git a/src/com/android/settings/notification/history/NotificationHistoryAdapter.java b/src/com/android/settings/notification/history/NotificationHistoryAdapter.java
index 0683ef7..96bc14a 100644
--- a/src/com/android/settings/notification/history/NotificationHistoryAdapter.java
+++ b/src/com/android/settings/notification/history/NotificationHistoryAdapter.java
@@ -72,6 +72,11 @@
     }
 
     @Override
+    public long getItemId(int position) {
+        return mValues.get(position).hashCode();
+    }
+
+    @Override
     public void onBindViewHolder(final @NonNull NotificationHistoryViewHolder holder,
             int position) {
         final HistoricalNotification hn = mValues.get(position);
@@ -85,7 +90,6 @@
                     .putExtra(EXTRA_APP_PACKAGE, hn.getPackage())
                     .putExtra(EXTRA_CHANNEL_ID, hn.getChannelId())
                     .putExtra(EXTRA_CONVERSATION_ID, hn.getConversationId());
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             holder.itemView.getContext().startActivityAsUser(intent, UserHandle.of(hn.getUserId()));
         };
         holder.itemView.setOnClickListener(onClick);
diff --git a/src/com/android/settings/notification/history/NotificationHistoryRecyclerView.java b/src/com/android/settings/notification/history/NotificationHistoryRecyclerView.java
index 06c74bc..224c31d 100644
--- a/src/com/android/settings/notification/history/NotificationHistoryRecyclerView.java
+++ b/src/com/android/settings/notification/history/NotificationHistoryRecyclerView.java
@@ -40,7 +40,6 @@
         ItemTouchHelper touchHelper = new ItemTouchHelper(
                 new DismissTouchHelper(0, ItemTouchHelper.START | ItemTouchHelper.END));
         touchHelper.attachToRecyclerView(this);
-        setNestedScrollingEnabled(false);
     }
 
     public void setOnItemSwipeDeleteListener(OnItemSwipeDeleteListener listener) {
diff --git a/src/com/android/settings/notification/history/NotificationSbnAdapter.java b/src/com/android/settings/notification/history/NotificationSbnAdapter.java
index e032854..7eca3b7 100644
--- a/src/com/android/settings/notification/history/NotificationSbnAdapter.java
+++ b/src/com/android/settings/notification/history/NotificationSbnAdapter.java
@@ -133,7 +133,6 @@
                         .putExtra(EXTRA_APP_PACKAGE, sbn.getPackageName())
                         .putExtra(EXTRA_CHANNEL_ID, sbn.getNotification().getChannelId())
                         .putExtra(EXTRA_CONVERSATION_ID, sbn.getNotification().getShortcutId());
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 holder.itemView.getContext().startActivityAsUser(intent, UserHandle.of(userId));
                 return true;
             });
diff --git a/src/com/android/settings/panel/InternetConnectivityPanel.java b/src/com/android/settings/panel/InternetConnectivityPanel.java
deleted file mode 100644
index ae6f2e0..0000000
--- a/src/com/android/settings/panel/InternetConnectivityPanel.java
+++ /dev/null
@@ -1,425 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source 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 com.android.settings.panel;
-
-import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
-import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
-
-import android.app.settings.SettingsEnums;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.Uri;
-import android.net.wifi.ScanResult;
-import android.net.wifi.WifiManager;
-import android.os.Handler;
-import android.os.HandlerExecutor;
-import android.os.Looper;
-import android.provider.Settings;
-import android.telephony.ServiceState;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyCallback;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-import android.util.Log;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.lifecycle.LifecycleObserver;
-import androidx.lifecycle.OnLifecycleEvent;
-
-import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settings.network.AirplaneModePreferenceController;
-import com.android.settings.network.InternetUpdater;
-import com.android.settings.network.ProviderModelSliceHelper;
-import com.android.settings.network.SubscriptionsChangeListener;
-import com.android.settings.network.telephony.DataConnectivityListener;
-import com.android.settings.slices.CustomSliceRegistry;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Represents the Internet Connectivity Panel.
- */
-public class InternetConnectivityPanel implements PanelContent, LifecycleObserver,
-        InternetUpdater.InternetChangeListener, DataConnectivityListener.Client,
-        SubscriptionsChangeListener.SubscriptionsChangeListenerClient {
-    private static final String TAG = "InternetConnectivityPanel";
-    private static final int SUBTITLE_TEXT_NONE = -1;
-    private static final int SUBTITLE_TEXT_WIFI_IS_OFF = R.string.wifi_is_off;
-    private static final int SUBTITLE_TEXT_TAP_A_NETWORK_TO_CONNECT =
-            R.string.tap_a_network_to_connect;
-    private static final int SUBTITLE_TEXT_SEARCHING_FOR_NETWORKS =
-            R.string.wifi_empty_list_wifi_on;
-    private static final int SUBTITLE_TEXT_NON_CARRIER_NETWORK_UNAVAILABLE =
-            R.string.non_carrier_network_unavailable;
-    private static final int SUBTITLE_TEXT_ALL_CARRIER_NETWORK_UNAVAILABLE =
-            R.string.all_network_unavailable;
-
-    private final Context mContext;
-    private final WifiManager mWifiManager;
-    private final IntentFilter mWifiStateFilter;
-    private final NetworkProviderTelephonyCallback mTelephonyCallback;
-    private final BroadcastReceiver mWifiStateReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (intent == null) {
-                return;
-            }
-
-            if (TextUtils.equals(intent.getAction(), WifiManager.SCAN_RESULTS_AVAILABLE_ACTION)) {
-                updateProgressBar();
-                updatePanelTitle();
-                return;
-            }
-
-            if (TextUtils.equals(intent.getAction(), WifiManager.NETWORK_STATE_CHANGED_ACTION)) {
-                updateProgressBar();
-                updatePanelTitle();
-            }
-        }
-    };
-
-    @VisibleForTesting
-    boolean mIsProviderModelEnabled;
-    @VisibleForTesting
-    InternetUpdater mInternetUpdater;
-    @VisibleForTesting
-    ProviderModelSliceHelper mProviderModelSliceHelper;
-
-    private int mSubtitle = SUBTITLE_TEXT_NONE;
-    private PanelContentCallback mCallback;
-    private TelephonyManager mTelephonyManager;
-    private SubscriptionsChangeListener mSubscriptionsListener;
-    private DataConnectivityListener mConnectivityListener;
-    private int mDefaultDataSubid = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
-
-    // Wi-Fi scanning progress bar
-    protected HandlerInjector mHandlerInjector;
-    protected boolean mIsProgressBarVisible;
-    protected boolean mIsScanningSubTitleShownOnce;
-    protected Runnable mHideProgressBarRunnable = () -> {
-        setProgressBarVisible(false);
-    };
-    protected Runnable mHideScanningSubTitleRunnable = () -> {
-        mIsScanningSubTitleShownOnce = true;
-        updatePanelTitle();
-    };
-
-    /**
-     * Wrapper for testing compatibility.
-     */
-    @VisibleForTesting
-    static class HandlerInjector {
-        protected final Handler mHandler;
-
-        HandlerInjector(Context context) {
-            mHandler = context.getMainThreadHandler();
-        }
-
-        public void postDelay(Runnable runnable) {
-            mHandler.postDelayed(runnable, 2000 /* delay millis */);
-        }
-
-        public void removeCallbacks(Runnable runnable) {
-            mHandler.removeCallbacks(runnable);
-        }
-    }
-
-    private InternetConnectivityPanel(Context context) {
-        mContext = context.getApplicationContext();
-        mHandlerInjector = new HandlerInjector(context);
-        mIsProviderModelEnabled = Utils.isProviderModelEnabled(mContext);
-        mInternetUpdater = new InternetUpdater(context, null /* Lifecycle */, this);
-
-        mSubscriptionsListener = new SubscriptionsChangeListener(context, this);
-        mConnectivityListener = new DataConnectivityListener(context, this);
-        mTelephonyCallback = new NetworkProviderTelephonyCallback();
-        mDefaultDataSubid = getDefaultDataSubscriptionId();
-        mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
-
-        mWifiManager = mContext.getSystemService(WifiManager.class);
-        mWifiStateFilter = new IntentFilter(WifiManager.NETWORK_STATE_CHANGED_ACTION);
-        mWifiStateFilter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION);
-
-        mProviderModelSliceHelper = new ProviderModelSliceHelper(mContext, null);
-    }
-
-    /** create the panel */
-    public static InternetConnectivityPanel create(Context context) {
-        return new InternetConnectivityPanel(context);
-    }
-
-    /** @OnLifecycleEvent(ON_RESUME) */
-    @OnLifecycleEvent(ON_RESUME)
-    public void onResume() {
-        if (!mIsProviderModelEnabled) {
-            return;
-        }
-        mInternetUpdater.onResume();
-        mSubscriptionsListener.start();
-        mConnectivityListener.start();
-        mTelephonyManager.registerTelephonyCallback(
-                new HandlerExecutor(new Handler(Looper.getMainLooper())), mTelephonyCallback);
-        mContext.registerReceiver(mWifiStateReceiver, mWifiStateFilter);
-        updateProgressBar();
-        updatePanelTitle();
-    }
-
-    /** @OnLifecycleEvent(ON_PAUSE) */
-    @OnLifecycleEvent(ON_PAUSE)
-    public void onPause() {
-        if (!mIsProviderModelEnabled) {
-            return;
-        }
-        mInternetUpdater.onPause();
-        mSubscriptionsListener.stop();
-        mConnectivityListener.stop();
-        mTelephonyManager.unregisterTelephonyCallback(mTelephonyCallback);
-        mContext.unregisterReceiver(mWifiStateReceiver);
-        mHandlerInjector.removeCallbacks(mHideProgressBarRunnable);
-        mHandlerInjector.removeCallbacks(mHideScanningSubTitleRunnable);
-    }
-
-    /**
-     * @return a string for the title of the Panel.
-     */
-    @Override
-    public CharSequence getTitle() {
-        if (mIsProviderModelEnabled) {
-            return mContext.getText(mInternetUpdater.isAirplaneModeOn()
-                    ? R.string.airplane_mode : R.string.provider_internet_settings);
-        }
-        return mContext.getText(R.string.internet_connectivity_panel_title);
-    }
-
-    /**
-     * @return a string for the subtitle of the Panel.
-     */
-    @Override
-    public CharSequence getSubTitle() {
-        if (mIsProviderModelEnabled && mSubtitle != SUBTITLE_TEXT_NONE) {
-            return mContext.getText(mSubtitle);
-        }
-        return null;
-    }
-
-    @Override
-    public List<Uri> getSlices() {
-        final List<Uri> uris = new ArrayList<>();
-        if (mIsProviderModelEnabled) {
-            uris.add(CustomSliceRegistry.PROVIDER_MODEL_SLICE_URI);
-        } else {
-            uris.add(CustomSliceRegistry.WIFI_SLICE_URI);
-            uris.add(CustomSliceRegistry.MOBILE_DATA_SLICE_URI);
-            uris.add(AirplaneModePreferenceController.SLICE_URI);
-        }
-        return uris;
-    }
-
-    @Override
-    public Intent getSeeMoreIntent() {
-        // Disable the see more button for provider model design.
-        if (mIsProviderModelEnabled) {
-            return null;
-        }
-
-        // Don't remove the see more intent for non-provider model design. This intent will be
-        // used when isCustomizedButtonUsed() returns false.
-        return new Intent(Settings.ACTION_WIRELESS_SETTINGS)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-    }
-
-    @Override
-    public boolean isProgressBarVisible() {
-        return mIsProgressBarVisible;
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.PANEL_INTERNET_CONNECTIVITY;
-    }
-
-    @Override
-    public void registerCallback(PanelContentCallback callback) {
-        mCallback = callback;
-    }
-
-    /**
-     * Called when airplane mode state is changed.
-     */
-    @Override
-    public void onAirplaneModeChanged(boolean isAirplaneModeOn) {
-        log("onAirplaneModeChanged: isAirplaneModeOn:" + isAirplaneModeOn);
-        updatePanelTitle();
-    }
-
-    /**
-     * Called when Wi-Fi enabled is changed.
-     */
-    @Override
-    public void onWifiEnabledChanged(boolean enabled) {
-        log("onWifiEnabledChanged: enabled:" + enabled);
-        updatePanelTitle();
-    }
-
-    @Override
-    public void onSubscriptionsChanged() {
-        final int defaultDataSubId = getDefaultDataSubscriptionId();
-        log("onSubscriptionsChanged: defaultDataSubId:" + defaultDataSubId);
-        if (mDefaultDataSubid == defaultDataSubId) {
-            return;
-        }
-        if (SubscriptionManager.isUsableSubscriptionId(defaultDataSubId)) {
-            mTelephonyManager.unregisterTelephonyCallback(mTelephonyCallback);
-            mTelephonyManager.registerTelephonyCallback(
-                    new HandlerExecutor(new Handler(Looper.getMainLooper())), mTelephonyCallback);
-        }
-        updatePanelTitle();
-    }
-
-    @Override
-    public void onDataConnectivityChange() {
-        log("onDataConnectivityChange");
-        updatePanelTitle();
-    }
-
-    @VisibleForTesting
-    void updatePanelTitle() {
-        if (mCallback == null) {
-            return;
-        }
-        updateSubtitleText();
-        mCallback.onHeaderChanged();
-    }
-
-    @VisibleForTesting
-    int getDefaultDataSubscriptionId() {
-        return SubscriptionManager.getDefaultDataSubscriptionId();
-    }
-
-    private void updateSubtitleText() {
-        mSubtitle = SUBTITLE_TEXT_NONE;
-        if (!mInternetUpdater.isWifiEnabled()) {
-            if (!mInternetUpdater.isAirplaneModeOn()) {
-                // When the airplane mode is off and Wi-Fi is disabled.
-                //   Sub-Title: Wi-Fi is off
-                log("Airplane mode off + Wi-Fi off.");
-                mSubtitle = SUBTITLE_TEXT_WIFI_IS_OFF;
-            }
-            return;
-        }
-
-        if (mInternetUpdater.isAirplaneModeOn()) {
-            return;
-        }
-
-        final List<ScanResult> wifiList = mWifiManager.getScanResults();
-        if (wifiList != null && wifiList.size() != 0) {
-            // When the Wi-Fi scan result is not empty
-            //   Sub-Title: Tap a network to connect
-            mSubtitle = SUBTITLE_TEXT_TAP_A_NETWORK_TO_CONNECT;
-            return;
-        }
-
-        if (!mIsScanningSubTitleShownOnce && mIsProgressBarVisible) {
-            // When the Wi-Fi scan result callback is received
-            //   Sub-Title: Searching for networks...
-            mSubtitle = SUBTITLE_TEXT_SEARCHING_FOR_NETWORKS;
-            return;
-        }
-
-        // Sub-Title:
-        // show non_carrier_network_unavailable
-        //   - while Wi-Fi on + no Wi-Fi item
-        //   - while Wi-Fi on + no Wi-Fi item + mobile data off
-        // show all_network_unavailable:
-        //   - while Wi-Fi on + no Wi-Fi item + no carrier item
-        //   - while Wi-Fi on + no Wi-Fi item + service is out of service
-        //   - while Wi-Fi on + no Wi-Fi item + mobile data on + no carrier data.
-        log("No Wi-Fi item.");
-        if (!mProviderModelSliceHelper.hasCarrier()
-                || (!mProviderModelSliceHelper.isVoiceStateInService()
-                && !mProviderModelSliceHelper.isDataStateInService())) {
-            log("no carrier or service is out of service.");
-            mSubtitle = SUBTITLE_TEXT_ALL_CARRIER_NETWORK_UNAVAILABLE;
-            return;
-        }
-        if (!mProviderModelSliceHelper.isMobileDataEnabled()) {
-            log("mobile data off");
-            mSubtitle = SUBTITLE_TEXT_NON_CARRIER_NETWORK_UNAVAILABLE;
-            return;
-        }
-        if (!mProviderModelSliceHelper.isDataSimActive()) {
-            log("no carrier data.");
-            mSubtitle = SUBTITLE_TEXT_ALL_CARRIER_NETWORK_UNAVAILABLE;
-            return;
-        }
-        mSubtitle = SUBTITLE_TEXT_NON_CARRIER_NETWORK_UNAVAILABLE;
-    }
-
-    protected void updateProgressBar() {
-        if (mWifiManager == null || !mInternetUpdater.isWifiEnabled()) {
-            setProgressBarVisible(false);
-            return;
-        }
-
-        setProgressBarVisible(true);
-        List<ScanResult> wifiScanResults = mWifiManager.getScanResults();
-        if (wifiScanResults != null && wifiScanResults.size() > 0) {
-            mHandlerInjector.postDelay(mHideProgressBarRunnable);
-        } else if (!mIsScanningSubTitleShownOnce) {
-            mHandlerInjector.postDelay(mHideScanningSubTitleRunnable);
-        }
-    }
-
-    protected void setProgressBarVisible(boolean visible) {
-        if (mIsProgressBarVisible == visible) {
-            return;
-        }
-        mIsProgressBarVisible = visible;
-
-        if (mCallback == null) {
-            return;
-        }
-        mCallback.onProgressBarVisibleChanged();
-        updatePanelTitle();
-    }
-
-    private class NetworkProviderTelephonyCallback extends TelephonyCallback implements
-            TelephonyCallback.DataConnectionStateListener,
-            TelephonyCallback.ServiceStateListener {
-        @Override
-        public void onServiceStateChanged(ServiceState state) {
-            log("onServiceStateChanged voiceState=" + state.getState()
-                    + " dataState=" + state.getDataRegistrationState());
-            updatePanelTitle();
-        }
-
-        @Override
-        public void onDataConnectionStateChanged(int state, int networkType) {
-            log("onDataConnectionStateChanged: networkType=" + networkType + " state=" + state);
-            updatePanelTitle();
-        }
-    }
-
-    private static void log(String s) {
-        Log.d(TAG, s);
-    }
-}
diff --git a/src/com/android/settings/panel/PanelFeatureProviderImpl.java b/src/com/android/settings/panel/PanelFeatureProviderImpl.java
index ca30952..a73881b 100644
--- a/src/com/android/settings/panel/PanelFeatureProviderImpl.java
+++ b/src/com/android/settings/panel/PanelFeatureProviderImpl.java
@@ -17,11 +17,14 @@
 package com.android.settings.panel;
 
 import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 import android.provider.Settings;
 
 public class PanelFeatureProviderImpl implements PanelFeatureProvider {
 
+    private static final String SYSTEMUI_PACKAGE_NAME = "com.android.systemui";
+
     @Override
     public PanelContent getPanel(Context context, Bundle bundle) {
         if (context == null) {
@@ -35,7 +38,12 @@
 
         switch (panelType) {
             case Settings.Panel.ACTION_INTERNET_CONNECTIVITY:
-                return InternetConnectivityPanel.create(context);
+                // Redirect to the internet dialog in SystemUI.
+                Intent intent = new Intent(Settings.Panel.ACTION_INTERNET_CONNECTIVITY);
+                intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND)
+                        .setPackage(SYSTEMUI_PACKAGE_NAME);
+                context.sendBroadcast(intent);
+                return null;
             case Settings.Panel.ACTION_NFC:
                 return NfcPanel.create(context);
             case Settings.Panel.ACTION_WIFI:
diff --git a/src/com/android/settings/password/ChooseLockGenericController.java b/src/com/android/settings/password/ChooseLockGenericController.java
index 1b951d4..cd9eb2f 100644
--- a/src/com/android/settings/password/ChooseLockGenericController.java
+++ b/src/com/android/settings/password/ChooseLockGenericController.java
@@ -190,7 +190,8 @@
      * requirements. The lock's visibility ({@link #isScreenLockVisible}) is not considered here.
      */
     public boolean isScreenLockEnabled(ScreenLockType type) {
-        return type.maxQuality >= upgradeQuality(PASSWORD_QUALITY_UNSPECIFIED);
+        return !mLockPatternUtils.isCredentialsDisabledForUser(mUserId)
+                && type.maxQuality >= upgradeQuality(PASSWORD_QUALITY_UNSPECIFIED);
     }
 
     /**
diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java
index 252b6c0..e5457ae 100644
--- a/src/com/android/settings/sim/SimDialogActivity.java
+++ b/src/com/android/settings/sim/SimDialogActivity.java
@@ -24,6 +24,7 @@
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;
+import android.view.WindowManager;
 import android.widget.Toast;
 
 import androidx.fragment.app.Fragment;
@@ -59,6 +60,8 @@
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        getWindow().addSystemFlags(
+                WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
         showOrUpdateDialog();
     }
 
diff --git a/src/com/android/settings/sim/smartForwarding/DisableSmartForwardingTask.java b/src/com/android/settings/sim/smartForwarding/DisableSmartForwardingTask.java
index 45333ec..d483dd1 100644
--- a/src/com/android/settings/sim/smartForwarding/DisableSmartForwardingTask.java
+++ b/src/com/android/settings/sim/smartForwarding/DisableSmartForwardingTask.java
@@ -19,6 +19,7 @@
 import static com.android.settings.sim.smartForwarding.SmartForwardingUtils.TAG;
 
 import android.telephony.CallForwardingInfo;
+import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
@@ -37,17 +38,29 @@
     @Override
     public void run() {
         for (int i = 0; i < tm.getActiveModemCount(); i++) {
-            if (callWaitingStatus != null) {
+            int subId = getSubId(i);
+            if (callWaitingStatus != null
+                    && subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
                 Log.d(TAG, "Restore call waiting to " + callWaitingStatus[i]);
-                tm.setCallWaitingEnabled(callWaitingStatus[i], null, null);
+                tm.createForSubscriptionId(subId)
+                        .setCallWaitingEnabled(callWaitingStatus[i], null, null);
             }
 
             if (callForwardingInfo != null
                     && callForwardingInfo[i] != null
-                    && callForwardingInfo[i].getTimeoutSeconds() > 0) {
-                Log.d(TAG, "Restore call waiting to " + callForwardingInfo);
-                tm.setCallForwarding(callForwardingInfo[i], null, null);
+                    && subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+                Log.d(TAG, "Restore call forwarding to " + callForwardingInfo[i]);
+                tm.createForSubscriptionId(subId)
+                        .setCallForwarding(callForwardingInfo[i], null, null);
             }
         }
     }
+
+    private int getSubId(int slotIndex) {
+        int[] subId = SubscriptionManager.getSubId(slotIndex);
+        if (subId != null && subId.length > 0) {
+            return subId[0];
+        }
+        return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+    }
 }
diff --git a/src/com/android/settings/system/DisableAutomaticUpdatesPreferenceController.java b/src/com/android/settings/system/DisableAutomaticUpdatesPreferenceController.java
new file mode 100644
index 0000000..a8f7fb1
--- /dev/null
+++ b/src/com/android/settings/system/DisableAutomaticUpdatesPreferenceController.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2017 The Android Open Source 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 com.android.settings.system;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.annotation.VisibleForTesting;
+
+import com.android.settings.core.TogglePreferenceController;
+
+/** A controller maintains the state of Automatic System Update feature. */
+public class DisableAutomaticUpdatesPreferenceController extends TogglePreferenceController {
+
+    // We use the "disabled status" in code, but show the opposite text
+    // "Automatic system updates" on screen. So a value 0 indicates the
+    // automatic update is enabled.
+    @VisibleForTesting
+    static final int DISABLE_UPDATES_SETTING = 1;
+    @VisibleForTesting
+    static final int ENABLE_UPDATES_SETTING = 0;
+
+    public DisableAutomaticUpdatesPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE, ENABLE_UPDATES_SETTING /* default */)
+                == ENABLE_UPDATES_SETTING;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE,
+                isChecked ? ENABLE_UPDATES_SETTING : DISABLE_UPDATES_SETTING);
+    }
+}
diff --git a/src/com/android/settings/uwb/UwbPreferenceController.java b/src/com/android/settings/uwb/UwbPreferenceController.java
index 15979b5..877c9f2 100644
--- a/src/com/android/settings/uwb/UwbPreferenceController.java
+++ b/src/com/android/settings/uwb/UwbPreferenceController.java
@@ -57,7 +57,9 @@
     public UwbPreferenceController(Context context, String key) {
         super(context, key);
         mExecutor = Executors.newSingleThreadExecutor();
-        mUwbManager = context.getSystemService(UwbManager.class);
+        if (isUwbSupportedOnDevice()) {
+            mUwbManager = context.getSystemService(UwbManager.class);
+        }
         mAirplaneModeOn = Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.AIRPLANE_MODE_ON, 0) == 1;
         mAirplaneModeChangedReceiver = new BroadcastReceiver() {
diff --git a/src/com/android/settings/widget/LabeledSeekBarPreference.java b/src/com/android/settings/widget/LabeledSeekBarPreference.java
index 3a9ac18..b34ea19 100644
--- a/src/com/android/settings/widget/LabeledSeekBarPreference.java
+++ b/src/com/android/settings/widget/LabeledSeekBarPreference.java
@@ -20,9 +20,11 @@
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
+import android.view.View;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
 import androidx.core.content.res.TypedArrayUtils;
 import androidx.preference.PreferenceViewHolder;
 
@@ -35,6 +37,8 @@
     private final int mTextEndId;
     private final int mTickMarkId;
     private OnPreferenceChangeListener mStopListener;
+    @Nullable
+    private CharSequence mSummary;
 
     public LabeledSeekBarPreference(Context context, AttributeSet attrs, int defStyleAttr,
             int defStyleRes) {
@@ -52,6 +56,7 @@
                 R.string.summary_placeholder);
         mTickMarkId = styledAttrs.getResourceId(
                 R.styleable.LabeledSeekBarPreference_tickMark, /* defValue= */ 0);
+        mSummary = styledAttrs.getText(R.styleable.Preference_android_summary);
         styledAttrs.recycle();
     }
 
@@ -76,6 +81,15 @@
                     com.android.internal.R.id.seekbar);
             seekBar.setTickMark(tickMark);
         }
+
+        final TextView summary = (TextView) holder.findViewById(android.R.id.summary);
+        if (mSummary != null) {
+            summary.setText(mSummary);
+            summary.setVisibility(View.VISIBLE);
+        } else {
+            summary.setText(null);
+            summary.setVisibility(View.GONE);
+        }
     }
 
     public void setOnPreferenceChangeStopListener(OnPreferenceChangeListener listener) {
@@ -90,5 +104,24 @@
             mStopListener.onPreferenceChange(this, seekBar.getProgress());
         }
     }
+
+    @Override
+    public void setSummary(CharSequence summary) {
+        super.setSummary(summary);
+        mSummary = summary;
+        notifyChanged();
+    }
+
+    @Override
+    public void setSummary(int summaryResId) {
+        super.setSummary(summaryResId);
+        mSummary = getContext().getText(summaryResId);
+        notifyChanged();
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        return mSummary;
+    }
 }
 
diff --git a/src/com/android/settings/wifi/ConfigureWifiEntryFragment.java b/src/com/android/settings/wifi/ConfigureWifiEntryFragment.java
index d2f5090..469ca1d 100644
--- a/src/com/android/settings/wifi/ConfigureWifiEntryFragment.java
+++ b/src/com/android/settings/wifi/ConfigureWifiEntryFragment.java
@@ -38,7 +38,7 @@
 import com.android.settings.R;
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.wifi.details2.WifiNetworkDetailsFragment2;
+import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
 import com.android.wifitrackerlib.NetworkDetailsTracker;
 import com.android.wifitrackerlib.WifiEntry;
 
@@ -238,6 +238,6 @@
                         MAX_SCAN_AGE_MILLIS,
                         SCAN_INTERVAL_MILLIS,
                         getArguments().getString(
-                                WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY));
+                                WifiNetworkDetailsFragment.KEY_CHOSEN_WIFIENTRY_KEY));
     }
 }
diff --git a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
index cbc89ae..5fe156c 100644
--- a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
+++ b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
@@ -330,7 +330,7 @@
 
             final PreferenceImageView imageView = view.findViewById(android.R.id.icon);
             final int level = wifiEntry.getLevel();
-            if (imageView != null) {
+            if (imageView != null && level != WifiEntry.WIFI_LEVEL_UNREACHABLE) {
                 final Drawable drawable = getContext().getDrawable(
                         Utils.getWifiIconResource(level));
                 drawable.setTintList(
diff --git a/src/com/android/settings/wifi/WifiConnectionPreferenceController.java b/src/com/android/settings/wifi/WifiConnectionPreferenceController.java
index 3b2669c..fc2f8f1 100644
--- a/src/com/android/settings/wifi/WifiConnectionPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiConnectionPreferenceController.java
@@ -34,7 +34,7 @@
 import com.android.settings.R;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.wifi.details2.WifiNetworkDetailsFragment2;
+import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.wifi.WifiEntryPreference;
@@ -165,11 +165,11 @@
         mPreference.setOrder(order);
         mPreference.setOnPreferenceClickListener(pref -> {
             final Bundle args = new Bundle();
-            args.putString(WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY,
+            args.putString(WifiNetworkDetailsFragment.KEY_CHOSEN_WIFIENTRY_KEY,
                     wifiEntry.getKey());
             new SubSettingLauncher(mPrefContext)
                     .setTitleRes(R.string.pref_title_network_details)
-                    .setDestination(WifiNetworkDetailsFragment2.class.getName())
+                    .setDestination(WifiNetworkDetailsFragment.class.getName())
                     .setArguments(args)
                     .setSourceMetricsCategory(mMetricsCategory)
                     .launch();
diff --git a/src/com/android/settings/wifi/WifiDialog2.java b/src/com/android/settings/wifi/WifiDialog2.java
index dc546f3..05dad3f 100644
--- a/src/com/android/settings/wifi/WifiDialog2.java
+++ b/src/com/android/settings/wifi/WifiDialog2.java
@@ -21,6 +21,8 @@
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.TextView;
@@ -108,6 +110,8 @@
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        setWindowsOverlay();
+
         mView = getLayoutInflater().inflate(R.layout.wifi_dialog, /* root */ null);
         setView(mView);
         mController = new WifiConfigController2(this, mView, mWifiEntry, mMode);
@@ -126,6 +130,13 @@
         }
     }
 
+    private void setWindowsOverlay() {
+        final Window window = getWindow();
+        final WindowManager.LayoutParams lp = window.getAttributes();
+        window.setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG);
+        window.setAttributes(lp);
+    }
+
     @Override
     protected void onStart() {
         final ImageButton ssidScannerButton = findViewById(R.id.ssid_scanner_button);
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 59f6504..c4b4d59 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -67,7 +67,7 @@
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.widget.MainSwitchBarController;
-import com.android.settings.wifi.details2.WifiNetworkDetailsFragment2;
+import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
 import com.android.settings.wifi.dpp.WifiDppUtils;
 import com.android.settingslib.HelpUtils;
 import com.android.settingslib.RestrictedLockUtils;
@@ -844,11 +844,11 @@
                         : context.getText(R.string.pref_title_network_details);
 
         final Bundle bundle = new Bundle();
-        bundle.putString(WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY, wifiEntry.getKey());
+        bundle.putString(WifiNetworkDetailsFragment.KEY_CHOSEN_WIFIENTRY_KEY, wifiEntry.getKey());
 
         new SubSettingLauncher(context)
                 .setTitleText(title)
-                .setDestination(WifiNetworkDetailsFragment2.class.getName())
+                .setDestination(WifiNetworkDetailsFragment.class.getName())
                 .setArguments(bundle)
                 .setSourceMetricsCategory(getMetricsCategory())
                 .launch();
@@ -1121,7 +1121,7 @@
 
     private void launchConfigNewNetworkFragment(WifiEntry wifiEntry) {
         final Bundle bundle = new Bundle();
-        bundle.putString(WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY,
+        bundle.putString(WifiNetworkDetailsFragment.KEY_CHOSEN_WIFIENTRY_KEY,
                 wifiEntry.getKey());
         new SubSettingLauncher(getContext())
                 .setTitleText(wifiEntry.getTitle())
diff --git a/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
similarity index 92%
rename from src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java
rename to src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
index 6bc510d..dd0c20a 100644
--- a/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java
+++ b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 The Android Open Source Project
+ * Copyright (C) 2021 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.settings.wifi.details2;
+package com.android.settings.wifi.details;
 
 import static com.android.settings.wifi.WifiSettings.WIFI_DIALOG_ID;
 
@@ -45,6 +45,13 @@
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.wifi.WifiConfigUiBase2;
 import com.android.settings.wifi.WifiDialog2;
+import com.android.settings.wifi.details2.AddDevicePreferenceController2;
+import com.android.settings.wifi.details2.WifiAutoConnectPreferenceController2;
+import com.android.settings.wifi.details2.WifiDetailPreferenceController2;
+import com.android.settings.wifi.details2.WifiMeteredPreferenceController2;
+import com.android.settings.wifi.details2.WifiPrivacyPreferenceController2;
+import com.android.settings.wifi.details2.WifiSecondSummaryController2;
+import com.android.settings.wifi.details2.WifiSubscriptionDetailPreferenceController2;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -63,10 +70,10 @@
  * <p>The key of {@link WifiEntry} should be saved to the intent Extras when launching this class
  * in order to properly render this page.
  */
-public class WifiNetworkDetailsFragment2 extends RestrictedDashboardFragment implements
+public class WifiNetworkDetailsFragment extends RestrictedDashboardFragment implements
         WifiDialog2.WifiDialog2Listener {
 
-    private static final String TAG = "WifiNetworkDetailsFrg2";
+    private static final String TAG = "WifiNetworkDetailsFrg";
 
     // Key of a Bundle to save/restore the selected WifiEntry
     public static final String KEY_CHOSEN_WIFIENTRY_KEY = "key_chosen_wifientry_key";
@@ -86,7 +93,7 @@
     @VisibleForTesting
     List<AbstractPreferenceController> mControllers;
 
-    public WifiNetworkDetailsFragment2() {
+    public WifiNetworkDetailsFragment() {
         super(UserManager.DISALLOW_CONFIG_WIFI);
     }
 
diff --git a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
index 7bf680d..f9d0db0 100644
--- a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
+++ b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
@@ -76,6 +76,7 @@
 import com.android.settings.wifi.WifiDialog2;
 import com.android.settings.wifi.WifiDialog2.WifiDialog2Listener;
 import com.android.settings.wifi.WifiUtils;
+import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
 import com.android.settings.wifi.dpp.WifiDppUtils;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -1099,7 +1100,7 @@
         refreshPage();
 
         // Refresh the Preferences in fragment.
-        ((WifiNetworkDetailsFragment2) mFragment).refreshPreferences();
+        ((WifiNetworkDetailsFragment) mFragment).refreshPreferences();
     }
 
     /**
diff --git a/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2.java b/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2.java
index e579ad7..1443e32 100644
--- a/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2.java
+++ b/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2.java
@@ -39,7 +39,7 @@
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.wifi.WifiSettings;
-import com.android.settings.wifi.details2.WifiNetworkDetailsFragment2;
+import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
 import com.android.wifitrackerlib.SavedNetworkTracker;
 
 import java.time.Clock;
@@ -126,7 +126,7 @@
     }
 
     /**
-     * Shows {@link WifiNetworkDetailsFragment2} for assigned key of {@link WifiEntry}.
+     * Shows {@link WifiNetworkDetailsFragment} for assigned key of {@link WifiEntry}.
      */
     public void showWifiPage(@NonNull String key, CharSequence title) {
         removeDialog(WifiSettings.WIFI_DIALOG_ID);
@@ -137,11 +137,11 @@
         }
 
         final Bundle bundle = new Bundle();
-        bundle.putString(WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY, key);
+        bundle.putString(WifiNetworkDetailsFragment.KEY_CHOSEN_WIFIENTRY_KEY, key);
 
         new SubSettingLauncher(getContext())
                 .setTitleText(title)
-                .setDestination(WifiNetworkDetailsFragment2.class.getName())
+                .setDestination(WifiNetworkDetailsFragment.class.getName())
                 .setArguments(bundle)
                 .setSourceMetricsCategory(getMetricsCategory())
                 .launch();
diff --git a/src/com/android/settings/wifi/slice/WifiSlice.java b/src/com/android/settings/wifi/slice/WifiSlice.java
index 75d2c66..f6604dd 100644
--- a/src/com/android/settings/wifi/slice/WifiSlice.java
+++ b/src/com/android/settings/wifi/slice/WifiSlice.java
@@ -50,7 +50,7 @@
 import com.android.settings.wifi.WifiDialogActivity;
 import com.android.settings.wifi.WifiSettings;
 import com.android.settings.wifi.WifiUtils;
-import com.android.settings.wifi.details2.WifiNetworkDetailsFragment2;
+import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
 import com.android.wifitrackerlib.WifiEntry;
 
 import java.util.Arrays;
@@ -200,11 +200,11 @@
 
         if (wifiSliceItem.getConnectedState() != WifiEntry.CONNECTED_STATE_DISCONNECTED) {
             final Bundle bundle = new Bundle();
-            bundle.putString(WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY,
+            bundle.putString(WifiNetworkDetailsFragment.KEY_CHOSEN_WIFIENTRY_KEY,
                     wifiSliceItem.getKey());
             final Intent intent = new SubSettingLauncher(mContext)
                     .setTitleRes(R.string.pref_title_network_details)
-                    .setDestination(WifiNetworkDetailsFragment2.class.getName())
+                    .setDestination(WifiNetworkDetailsFragment.class.getName())
                     .setArguments(bundle)
                     .setSourceMetricsCategory(SettingsEnums.WIFI)
                     .toIntent();
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java
index eee6398..2317c97 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java
@@ -183,7 +183,7 @@
 
     @Test
     public void onTetheringStarted_currentFunctionsIsRndis_setsRndisAsDefaultUsbFunctions() {
-        mFragment.mCurrentFunctions = UsbManager.FUNCTION_RNDIS;
+        when(mUsbBackend.getCurrentFunctions()).thenReturn(UsbManager.FUNCTION_RNDIS);
 
         mFragment.mOnStartTetheringCallback.onTetheringStarted();
 
@@ -192,7 +192,7 @@
 
     @Test
     public void onTetheringStarted_currentFunctionsIsNcm_setsNcmAsDefaultUsbFunctions() {
-        mFragment.mCurrentFunctions = UsbManager.FUNCTION_NCM;
+        when(mUsbBackend.getCurrentFunctions()).thenReturn(UsbManager.FUNCTION_NCM);
 
         mFragment.mOnStartTetheringCallback.onTetheringStarted();
 
diff --git a/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java
deleted file mode 100644
index d5c0b5d..0000000
--- a/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source 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 com.android.settings.development;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.provider.Settings;
-
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class DisableAutomaticUpdatesPreferenceControllerTest {
-
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-    @Mock
-    private SwitchPreference mPreference;
-
-    private Context mContext;
-    private DisableAutomaticUpdatesPreferenceController mController;
-
-    @Before
-    public void setup() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mController = new DisableAutomaticUpdatesPreferenceController(mContext);
-        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
-                mPreference);
-        mController.displayPreference(mPreferenceScreen);
-    }
-
-    @Test
-    public void onPreferenceChanged_turnOnAutomaticUpdates() {
-        mController.onPreferenceChange(null, true);
-
-        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE, -1);
-
-        assertThat(mode).isEqualTo(
-                DisableAutomaticUpdatesPreferenceController.ENABLE_UPDATES_SETTING);
-    }
-
-    @Test
-    public void onPreferenceChanged_turnOffAutomaticUpdates() {
-        mController.onPreferenceChange(null, false);
-
-        final int mode = Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE, -1);
-
-        assertThat(mode).isEqualTo(
-                DisableAutomaticUpdatesPreferenceController.DISABLE_UPDATES_SETTING);
-    }
-
-    @Test
-    public void updateState_preferenceShouldBeChecked() {
-        Settings.Global
-                .putInt(mContext.getContentResolver(), Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE,
-                        DisableAutomaticUpdatesPreferenceController.ENABLE_UPDATES_SETTING);
-        mController.updateState(mPreference);
-
-        verify(mPreference).setChecked(true);
-    }
-
-    @Test
-    public void updateState_preferenceShouldNotBeChecked() {
-        Settings.Global
-                .putInt(mContext.getContentResolver(), Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE,
-                        DisableAutomaticUpdatesPreferenceController.DISABLE_UPDATES_SETTING);
-        mController.updateState(mPreference);
-
-        verify(mPreference).setChecked(false);
-    }
-
-    @Test
-    public void onDeveloperOptionsDisabled_shouldDisablePreference() {
-        mController.onDeveloperOptionsDisabled();
-
-        verify(mPreference).setEnabled(false);
-        verify(mPreference).setChecked(false);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java
index fd4e82d..43fbe81 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java
@@ -50,7 +50,6 @@
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
@@ -65,7 +64,6 @@
 import java.util.Locale;
 import java.util.List;
 import java.util.Map;
-import java.util.TimeZone;
 
 @RunWith(RobolectricTestRunner.class)
 public final class BatteryChartPreferenceControllerTest {
@@ -125,37 +123,6 @@
             createBatteryHistoryMap());
     }
 
-    @Ignore
-    @Test
-    public void testOnResume_uiModeIsChanged_clearBatteryDiffEntryCache() {
-        doReturn(mResources).when(mContext).getResources();
-        doReturn(mConfiguration).when(mResources).getConfiguration();
-        mConfiguration.uiMode = Configuration.UI_MODE_NIGHT_UNDEFINED;
-        // Ensures the testing environment is correct.
-        assertThat(BatteryDiffEntry.sResourceCache).hasSize(1);
-        mBatteryChartPreferenceController.onResume();
-        // Changes the uiMode in the configuration.
-        mConfiguration.uiMode = Configuration.UI_MODE_NIGHT_YES;
-
-        mBatteryChartPreferenceController.onResume();
-        assertThat(BatteryDiffEntry.sResourceCache).isEmpty();
-    }
-
-    @Ignore
-    @Test
-    public void testOnResume_uiModeIsNotChanged_notClearBatteryDiffEntryCache() {
-        doReturn(mResources).when(mContext).getResources();
-        doReturn(mConfiguration).when(mResources).getConfiguration();
-        mConfiguration.uiMode = Configuration.UI_MODE_NIGHT_UNDEFINED;
-        // Ensures the testing environment is correct.
-        assertThat(BatteryDiffEntry.sResourceCache).hasSize(1);
-
-        mBatteryChartPreferenceController.onResume();
-        assertThat(BatteryDiffEntry.sResourceCache).isNotEmpty();
-        verify(mMetricsFeatureProvider)
-                .action(mContext, SettingsEnums.OPEN_BATTERY_USAGE);
-    }
-
     @Test
     public void testOnDestroy_activityIsChanging_clearBatteryEntryCache() {
         doReturn(true).when(mSettingsActivity).isChangingConfigurations();
@@ -579,12 +546,12 @@
         // Verifies the title in the preference group.
         verify(mBatteryChartPreferenceController.mAppListPrefGroup)
             .setTitle(captor.capture());
-        assertThat(captor.getValue()).isEqualTo("App usage for 4 - 7");
+        assertThat(captor.getValue()).isNotEqualTo("App usage for past 24 hr");
         // Verifies the title in the expandable divider.
         captor = ArgumentCaptor.forClass(String.class);
         verify(mBatteryChartPreferenceController.mExpandDividerPreference)
             .setTitle(captor.capture());
-        assertThat(captor.getValue()).isEqualTo("System usage for 4 - 7");
+        assertThat(captor.getValue()).isNotEqualTo("System usage for past 24 hr");
     }
 
     @Test
@@ -722,9 +689,6 @@
             new long[] {1619196786769L, 0L, 1619247636826L};
         ConvertUtils.utcToLocalTimeHour(
             mContext, /*timestamp=*/ 0, /*is24HourFormat=*/ false);
-        // Simulates the locale in GMT.
-        ConvertUtils.sSimpleDateFormatForHour
-             .setTimeZone(TimeZone.getTimeZone("GMT"));
     }
 
     private BatteryChartPreferenceController createController() {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartViewTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartViewTest.java
index d19a012..0b75e79 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartViewTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartViewTest.java
@@ -33,7 +33,6 @@
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -44,7 +43,6 @@
 import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.Locale;
-import java.util.TimeZone;
 
 @RunWith(RobolectricTestRunner.class)
 public final class BatteryChartViewTest {
@@ -233,21 +231,4 @@
         verify(mBatteryChartView.mHandler)
             .postDelayed(mBatteryChartView.mUpdateClickableStateRun, 500L);
     }
-
-    @Ignore
-    @Test
-    public void testSetLatestTimestamp_generateExpectedTimestamps() {
-        final long timestamp = 1619196786769L;
-        ConvertUtils.sSimpleDateFormatForHour = null;
-        // Invokes the method first to create the SimpleDateFormat.
-        ConvertUtils.utcToLocalTimeHour(
-            mContext, /*timestamp=*/ 0, /*is24HourFormat=*/ false);
-        ConvertUtils.sSimpleDateFormatForHour
-            .setTimeZone(TimeZone.getTimeZone("America/Los_Angeles"));
-        final String[] expectedTimestamps = new String[] {"00", "06", "12", "18", "00"};
-
-        mBatteryChartView.setLatestTimestamp(timestamp);
-
-        assertThat(mBatteryChartView.mTimestamps).isEqualTo(expectedTimestamps);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java
index 1b9e05b..b04f053 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java
@@ -30,7 +30,6 @@
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -320,71 +319,6 @@
             .isEqualTo(entry.mConsumePower * ratio);
     }
 
-    @Ignore
-    @Test
-    public void testUtcToLocalTime_returnExpectedResult() {
-        ConvertUtils.sZoneId = null;
-        ConvertUtils.sLocale = null;
-        final long timestamp = 1619196786769L;
-        final String expectedZoneId = "America/Los_Angeles";
-        ConvertUtils.sSimpleDateFormat = null;
-        // Invokes the method first to create the SimpleDateFormat.
-        ConvertUtils.utcToLocalTime(mContext, /*timestamp=*/ 0);
-        ConvertUtils.sSimpleDateFormat
-            .setTimeZone(TimeZone.getTimeZone(expectedZoneId));
-        mContext.getResources().getConfiguration().setLocales(
-            new LocaleList(new Locale("en_US")));
-
-        assertThat(ConvertUtils.utcToLocalTime(mContext, timestamp))
-            .isEqualTo("Apr 24,2021 00:53:06");
-        assertThat(ConvertUtils.sZoneId).isNotEqualTo(expectedZoneId);
-        assertThat(ConvertUtils.sLocale).isEqualTo(new Locale("en_US"));
-    }
-
-    @Ignore
-    @Test
-    public void testUtcToLocalTimeHour_12HourFormat_returnExpectedResult() {
-        ConvertUtils.sZoneIdForHour = null;
-        ConvertUtils.sLocaleForHour = null;
-        final long timestamp = 1619000086769L;
-        final String expectedZoneId = "America/Los_Angeles";
-        ConvertUtils.sSimpleDateFormatForHour = null;
-        // Invokes the method first to create the SimpleDateFormat.
-        ConvertUtils.utcToLocalTimeHour(
-            mContext, /*timestamp=*/ 0, /*is24HourFormat=*/ false);
-        ConvertUtils.sSimpleDateFormatForHour
-            .setTimeZone(TimeZone.getTimeZone(expectedZoneId));
-        mContext.getResources().getConfiguration().setLocales(
-            new LocaleList(new Locale("en_US")));
-
-        assertThat(ConvertUtils.utcToLocalTimeHour(
-            mContext, timestamp, /*is24HourFormat=*/ false)).isEqualTo("6");
-        assertThat(ConvertUtils.sZoneIdForHour).isNotEqualTo(expectedZoneId);
-        assertThat(ConvertUtils.sLocaleForHour).isEqualTo(new Locale("en_US"));
-    }
-
-    @Ignore
-    @Test
-    public void testUtcToLocalTimeHour_24HourFormat_returnExpectedResult() {
-        ConvertUtils.sZoneIdForHour = null;
-        ConvertUtils.sLocaleForHour = null;
-        final long timestamp = 1619000086769L;
-        final String expectedZoneId = "America/Los_Angeles";
-        ConvertUtils.sSimpleDateFormatForHour = null;
-        // Invokes the method first to create the SimpleDateFormat.
-        ConvertUtils.utcToLocalTimeHour(
-            mContext, /*timestamp=*/ 0, /*is24HourFormat=*/ false);
-        ConvertUtils.sSimpleDateFormatForHour
-            .setTimeZone(TimeZone.getTimeZone(expectedZoneId));
-        mContext.getResources().getConfiguration().setLocales(
-            new LocaleList(new Locale("en_US")));
-
-        assertThat(ConvertUtils.utcToLocalTimeHour(
-            mContext, timestamp, /*is24HourFormat=*/ true)).isEqualTo("18");
-        assertThat(ConvertUtils.sZoneIdForHour).isNotEqualTo(expectedZoneId);
-        assertThat(ConvertUtils.sLocaleForHour).isEqualTo(new Locale("en_US"));
-    }
-
     @Test
     public void testGetIndexedUsageMap_hideBackgroundUsageTime_returnsExpectedResult() {
         final long[] batteryHistoryKeys = new long[] {101L, 102L, 103L};
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
index e8a9c5c..c0b566a 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
@@ -155,4 +155,9 @@
 
         assertThat(mPowerFeatureProvider.isSmartBatterySupported()).isFalse();
     }
+
+    @Test
+    public void testGetResumeChargeIntent_returnNull() {
+        assertThat(mPowerFeatureProvider.getResumeChargeIntent()).isNull();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
index 331fb34..99fbaf3 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
@@ -31,6 +31,7 @@
 import androidx.fragment.app.FragmentActivity;
 
 import com.android.settings.R;
+import com.android.settings.fuelgauge.batterytip.tips.BatteryDefenderTip;
 import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
 import com.android.settings.fuelgauge.batterytip.tips.HighUsageTip;
 import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip;
@@ -74,6 +75,7 @@
     private RestrictAppTip mRestrictTwoAppsTip;
     private UnrestrictAppTip mUnrestrictAppTip;
     private SummaryTip mSummaryTip;
+    private BatteryDefenderTip mDefenderTip;
     private AppInfo mAppInfo;
     private ShadowPackageManager mPackageManager;
 
@@ -116,6 +118,7 @@
         mUnrestrictAppTip = new UnrestrictAppTip(BatteryTip.StateType.NEW, mAppInfo);
         mSummaryTip = spy(new SummaryTip(BatteryTip.StateType.NEW,
                 EstimateKt.AVERAGE_TIME_TO_DISCHARGE_UNKNOWN));
+        mDefenderTip = new BatteryDefenderTip(BatteryTip.StateType.NEW);
     }
 
     @After
@@ -243,4 +246,20 @@
                         + "your phone will suggest actions you can take.\n\nYou can always turn"
                         + " on Battery Saver if you’re running low on battery.");
     }
+
+    @Test
+    public void testOnCreateDialog_defenderTip_fireDialog() {
+        mDialogFragment = BatteryTipDialogFragment.newInstance(mDefenderTip, METRICS_KEY);
+
+        FragmentController.setupFragment(mDialogFragment, FragmentActivity.class,
+                0 /* containerViewId */, null /* bundle */);
+
+        final AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+        ShadowAlertDialogCompat shadowDialog = ShadowAlertDialogCompat.shadowOf(dialog);
+
+        assertThat(shadowDialog.getTitle()).isEqualTo(
+                mContext.getString(R.string.battery_tip_limited_temporarily_title));
+        assertThat(shadowDialog.getMessage()).isEqualTo(
+                mContext.getString(R.string.battery_tip_limited_temporarily_dialog_msg, "80%"));
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/BatteryDefenderActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/BatteryDefenderActionTest.java
deleted file mode 100644
index ad5dc54..0000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/BatteryDefenderActionTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source 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 com.android.settings.fuelgauge.batterytip.actions;
-
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public final class BatteryDefenderActionTest {
-
-    private Context mContext;
-    private FakeFeatureFactory mFeatureFactory;
-    private BatteryDefenderAction mBatteryDefenderAction;
-    private MetricsFeatureProvider mMetricsFeatureProvider;
-
-    @Mock private SettingsActivity mSettingsActivity;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mFeatureFactory = FakeFeatureFactory.setupForTest();
-        mMetricsFeatureProvider = mFeatureFactory.metricsFeatureProvider;
-        mContext = spy(RuntimeEnvironment.application);
-        doReturn(mContext).when(mSettingsActivity).getApplicationContext();
-        mBatteryDefenderAction = new BatteryDefenderAction(mSettingsActivity);
-    }
-
-    @Test
-    public void testHandlePositiveAction_logMetric() {
-        final int metricKey = 10;
-        mBatteryDefenderAction.handlePositiveAction(metricKey);
-
-        verify(mMetricsFeatureProvider).action(mContext,
-                SettingsEnums.ACTION_TIP_BATTERY_DEFENDER, metricKey);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/gestures/LabeledSeekBarPreferenceTest.java b/tests/robotests/src/com/android/settings/gestures/LabeledSeekBarPreferenceTest.java
index 4fb94f8..3d83d58 100644
--- a/tests/robotests/src/com/android/settings/gestures/LabeledSeekBarPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/LabeledSeekBarPreferenceTest.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.gestures;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
@@ -24,9 +26,12 @@
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.SeekBar;
+import android.widget.TextView;
 
 import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
 
+import com.android.internal.R;
 import com.android.settings.widget.LabeledSeekBarPreference;
 
 import org.junit.Before;
@@ -41,7 +46,9 @@
 public class LabeledSeekBarPreferenceTest {
 
     private Context mContext;
+    private PreferenceViewHolder mViewHolder;
     private SeekBar mSeekBar;
+    private TextView mSummary;
     private LabeledSeekBarPreference mSeekBarPreference;
 
     @Mock
@@ -57,7 +64,9 @@
         final View view =
                 inflater.inflate(mSeekBarPreference.getLayoutResource(),
                         new LinearLayout(mContext), false);
-        mSeekBar = view.findViewById(com.android.internal.R.id.seekbar);
+        mViewHolder = PreferenceViewHolder.createInstanceForTests(view);
+        mSeekBar = (SeekBar) mViewHolder.findViewById(R.id.seekbar);
+        mSummary = (TextView) mViewHolder.findViewById(R.id.summary);
     }
 
     @Test
@@ -69,4 +78,23 @@
 
         verify(mListener, times(1)).onPreferenceChange(mSeekBarPreference, 2);
     }
+
+    @Test
+    public void seekBarPreferenceSummarySet_returnsValue() {
+        final String summary = "this is a summary";
+        mSeekBarPreference.setSummary(summary);
+        mSeekBarPreference.onBindViewHolder(mViewHolder);
+
+        assertThat(mSeekBarPreference.getSummary()).isEqualTo(summary);
+        assertThat(mSummary.getText()).isEqualTo(summary);
+    }
+
+    @Test
+    public void seekBarPreferenceSummaryNull_hidesView() {
+        mSeekBarPreference.setSummary(null);
+        mSeekBarPreference.onBindViewHolder(mViewHolder);
+
+        assertThat(mSummary.getText()).isEqualTo("");
+        assertThat(mSummary.getVisibility()).isEqualTo(View.GONE);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/gestures/LongPressPowerButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/LongPressPowerButtonPreferenceControllerTest.java
index 8ff50ab..fa97754 100644
--- a/tests/robotests/src/com/android/settings/gestures/LongPressPowerButtonPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/LongPressPowerButtonPreferenceControllerTest.java
@@ -137,7 +137,7 @@
         when(mResources.getInteger(
                 com.android.internal.R.integer.config_keyChordPowerVolumeUp))
                 .thenReturn(
-                      LongPressPowerButtonPreferenceController.KEY_CHORD_POWER_VOLUME_UP_NO_ACTION);
+                     LongPressPowerButtonPreferenceController.KEY_CHORD_POWER_VOLUME_UP_NO_ACTION);
 
         verify(mController.mFooterHint).setVisible(false);
     }
@@ -148,7 +148,7 @@
 
         assertThat(Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.POWER_BUTTON_LONG_PRESS, -1)).isEqualTo(
-                LongPressPowerButtonPreferenceController.LONG_PRESS_POWER_ASSISTANT_VALUE);
+                PowerMenuSettingsUtils.LONG_PRESS_POWER_ASSISTANT_VALUE);
         assertThat(Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.KEY_CHORD_POWER_VOLUME_UP, -1)).isEqualTo(
                 LongPressPowerButtonPreferenceController.KEY_CHORD_POWER_VOLUME_UP_GLOBAL_ACTIONS);
@@ -162,19 +162,19 @@
         when(mResources.getInteger(
                 com.android.internal.R.integer.config_longPressOnPowerBehavior))
                 .thenReturn(
-                        LongPressPowerButtonPreferenceController.LONG_PRESS_POWER_GLOBAL_ACTIONS);
+                        PowerMenuSettingsUtils.LONG_PRESS_POWER_GLOBAL_ACTIONS);
 
         mController.onPreferenceChange(null, false);
 
         assertThat(Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.POWER_BUTTON_LONG_PRESS, -1)).isEqualTo(
-                LongPressPowerButtonPreferenceController.LONG_PRESS_POWER_GLOBAL_ACTIONS);
+                PowerMenuSettingsUtils.LONG_PRESS_POWER_GLOBAL_ACTIONS);
         assertThat(Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.KEY_CHORD_POWER_VOLUME_UP, -1)).isEqualTo(
                 LongPressPowerButtonPreferenceController.KEY_CHORD_POWER_VOLUME_UP_NO_ACTION);
         verify(mController.mAssistSwitch).setSummary(
                 getString(
-                       R.string.power_menu_summary_long_press_for_assist_disabled_with_power_menu));
+                      R.string.power_menu_summary_long_press_for_assist_disabled_with_power_menu));
     }
 
     @Test
@@ -203,13 +203,13 @@
         when(mResources.getInteger(
                 com.android.internal.R.integer.config_longPressOnPowerBehavior))
                 .thenReturn(
-                        LongPressPowerButtonPreferenceController.LONG_PRESS_POWER_ASSISTANT_VALUE);
+                        PowerMenuSettingsUtils.LONG_PRESS_POWER_ASSISTANT_VALUE);
 
         mController.onPreferenceChange(null, false);
 
         assertThat(Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.POWER_BUTTON_LONG_PRESS, -1)).isEqualTo(
-                LongPressPowerButtonPreferenceController.LONG_PRESS_POWER_GLOBAL_ACTIONS);
+                PowerMenuSettingsUtils.LONG_PRESS_POWER_GLOBAL_ACTIONS);
         assertThat(Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.KEY_CHORD_POWER_VOLUME_UP, -1)).isEqualTo(
                 LongPressPowerButtonPreferenceController.KEY_CHORD_POWER_VOLUME_UP_NO_ACTION);
diff --git a/tests/robotests/src/com/android/settings/gestures/LongPressPowerSensitivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/LongPressPowerSensitivityPreferenceControllerTest.java
new file mode 100644
index 0000000..9c99092
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/LongPressPowerSensitivityPreferenceControllerTest.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2021 The Android Open Source 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 com.android.settings.gestures;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.app.Application;
+import android.content.res.Resources;
+import android.provider.Settings;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class LongPressPowerSensitivityPreferenceControllerTest {
+
+    private static final String KEY_LONG_PRESS_SENSITIVITY =
+            "gesture_power_menu_long_press_for_assist_sensitivity";
+
+    private static final int[] SENSITIVITY_VALUES = {250, 350, 500, 750, 850};
+
+    private Application mContext;
+    private Resources mResources;
+    private LongPressPowerSensitivityPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        mResources = mock(Resources.class);
+        when(mContext.getResources()).thenReturn(mResources);
+
+        when(mResources.getIntArray(
+                com.android.internal.R.array.config_longPressOnPowerDurationSettings))
+                .thenReturn(SENSITIVITY_VALUES);
+
+        mController = new LongPressPowerSensitivityPreferenceController(mContext,
+                KEY_LONG_PRESS_SENSITIVITY);
+    }
+
+    @Test
+    public void getSliderPosition_returnsDefaultValue() {
+        when(mResources.getInteger(
+                com.android.internal.R.integer.config_longPressOnPowerDurationMs))
+                .thenReturn(750);
+        assertThat(mController.getSliderPosition()).isEqualTo(3);
+    }
+
+    @Test
+    public void getSliderPosition_returnsSetValue() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.POWER_BUTTON_LONG_PRESS_DURATION_MS, 350);
+        assertThat(mController.getSliderPosition()).isEqualTo(1);
+    }
+
+    @Test
+    public void setSliderPosition_setsValue() {
+        mController.setSliderPosition(4);
+        assertThat(Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.POWER_BUTTON_LONG_PRESS_DURATION_MS, 0)).isEqualTo(850);
+    }
+
+    @Test
+    public void setSliderPositionOutOfBounds_returnsFalse() {
+        assertThat(mController.setSliderPosition(-1)).isFalse();
+        assertThat(mController.setSliderPosition(10)).isFalse();
+    }
+
+    @Test
+    public void getMin_isZero() {
+        assertThat(mController.getMin()).isEqualTo(0);
+    }
+
+    @Test
+    public void getMax_isEqualToLastValueIndex() {
+        assertThat(mController.getMax()).isEqualTo(4);
+    }
+
+    @Test
+    public void longPressForAssistEnabled_isAvailable() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.POWER_BUTTON_LONG_PRESS,
+                PowerMenuSettingsUtils.LONG_PRESS_POWER_ASSISTANT_VALUE);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                LongPressPowerSensitivityPreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void longPressForAssistDisabled_isNotAvailableDueToDependentSetting() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.POWER_BUTTON_LONG_PRESS,
+                PowerMenuSettingsUtils.LONG_PRESS_POWER_NO_ACTION);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                LongPressPowerSensitivityPreferenceController.DISABLED_DEPENDENT_SETTING);
+    }
+
+    @Test
+    public void sensitivityValuesAreNull_notAvailable() {
+        when(mResources.getIntArray(
+                com.android.internal.R.array.config_longPressOnPowerDurationSettings))
+                .thenReturn(null);
+        mController = new LongPressPowerSensitivityPreferenceController(mContext,
+                KEY_LONG_PRESS_SENSITIVITY);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                LongPressPowerSensitivityPreferenceController.UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void sensitivityValuesArrayTooShort_notAvailable() {
+        when(mResources.getIntArray(
+                com.android.internal.R.array.config_longPressOnPowerDurationSettings))
+                .thenReturn(new int[]{200});
+        mController = new LongPressPowerSensitivityPreferenceController(mContext,
+                KEY_LONG_PRESS_SENSITIVITY);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                LongPressPowerSensitivityPreferenceController.UNSUPPORTED_ON_DEVICE);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/PowerMenuSettingsUtilsTest.java b/tests/robotests/src/com/android/settings/gestures/PowerMenuSettingsUtilsTest.java
new file mode 100644
index 0000000..25f0320
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/PowerMenuSettingsUtilsTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2021 The Android Open Source 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 com.android.settings.gestures;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.provider.Settings;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class PowerMenuSettingsUtilsTest {
+
+    private Context mContext;
+    private Resources mResources;
+
+    @Before
+    public void setUp() {
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        mResources = mock(Resources.class);
+        when(mContext.getResources()).thenReturn(mResources);
+    }
+
+    @Test
+    public void longPressBehaviourValuePresent_returnsValue() {
+        when(mResources.getInteger(
+                com.android.internal.R.integer.config_longPressOnPowerBehavior))
+                .thenReturn(0);
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.POWER_BUTTON_LONG_PRESS, 1);
+
+        assertThat(PowerMenuSettingsUtils.getPowerButtonSettingValue(mContext)).isEqualTo(1);
+    }
+
+    @Test
+    public void longPressBehaviourValueNotPresent_returnsDefault() {
+        when(mResources.getInteger(
+                com.android.internal.R.integer.config_longPressOnPowerBehavior))
+                .thenReturn(2);
+
+        assertThat(PowerMenuSettingsUtils.getPowerButtonSettingValue(mContext)).isEqualTo(2);
+    }
+
+    @Test
+    public void longPressBehaviourValueSetToAssistant_isAssistEnabledReturnsTrue() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.POWER_BUTTON_LONG_PRESS, 5);
+        assertThat(PowerMenuSettingsUtils.isLongPressPowerForAssistEnabled(mContext)).isTrue();
+    }
+
+    @Test
+    public void longPressBehaviourValueNotSetToAssistant_isAssistEnabledReturnsFalse() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.POWER_BUTTON_LONG_PRESS, 3);
+        assertThat(PowerMenuSettingsUtils.isLongPressPowerForAssistEnabled(mContext)).isFalse();
+    }
+
+    @Test
+    public void longPressBehaviourDefaultSetToAssistant_isAssistEnabledReturnsFalse() {
+        when(mResources.getInteger(
+                com.android.internal.R.integer.config_longPressOnPowerBehavior))
+                .thenReturn(3);
+
+        assertThat(PowerMenuSettingsUtils.isLongPressPowerForAssistEnabled(mContext)).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java b/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java
index d0df92e..70b0598 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java
@@ -159,7 +159,7 @@
                 eq(SubscriptionManager.NAME_SOURCE_USER_INPUT));
         assertThat(captor.getValue()).isEqualTo("test2");
         verify(mSubscriptionMgr)
-                .setIconTint(eq(Color.parseColor("#ff00796b" /* teal */)), eq(mSubscriptionId));
+                .setIconTint(eq(Color.parseColor("#ff006D74" /* cyan */)), eq(mSubscriptionId));
     }
 
     @Test
@@ -174,6 +174,34 @@
         assertThat(view.findViewById(R.id.number_label).getVisibility()).isEqualTo(View.GONE);
     }
 
+    @Test
+    public void populateView_getPreviousSimColor_setCorrectSelection() {
+        final View view = LayoutInflater.from(mActivity).inflate(
+                R.layout.dialog_mobile_network_rename, null);
+        when(mSubscriptionInfo.getIconTint())
+                .thenReturn(Color.parseColor("#ff3367d6"/* blue700 */));
+
+        startDialog();
+        mFragment.populateView(view);
+
+        final Spinner colorSpinnerView = mFragment.getColorSpinnerView();
+        assertThat(colorSpinnerView.getSelectedItemPosition()).isEqualTo(1);
+    }
+
+    @Test
+    public void populateView_getUpdatedSimColor_setCorrectSelection() {
+        final View view = LayoutInflater.from(mActivity).inflate(
+                R.layout.dialog_mobile_network_rename, null);
+        when(mSubscriptionInfo.getIconTint())
+                .thenReturn(Color.parseColor("#ff137333"/* Green800 */));
+
+        startDialog();
+        mFragment.populateView(view);
+
+        final Spinner colorSpinnerView = mFragment.getColorSpinnerView();
+        assertThat(colorSpinnerView.getSelectedItemPosition()).isEqualTo(2);
+    }
+
     /**
      * Helper method to start the dialog
      */
diff --git a/tests/robotests/src/com/android/settings/notification/app/RecentConversationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/RecentConversationsPreferenceControllerTest.java
index f0ae7ab..1688d63 100644
--- a/tests/robotests/src/com/android/settings/notification/app/RecentConversationsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/RecentConversationsPreferenceControllerTest.java
@@ -36,6 +36,7 @@
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.provider.Settings;
+import android.text.SpannedString;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.LinearLayout;
@@ -338,4 +339,36 @@
         // one for the preference, none for 'clear all'
         verify(outerContainer, times(1)).addPreference(any());
     }
+
+    @Test
+    public void testSpans() {
+        ShortcutInfo si = mock(ShortcutInfo.class);
+        when(si.getLabel()).thenReturn(new SpannedString("hello"));
+        ConversationChannel ccw = new ConversationChannel(si, 6,
+                new NotificationChannel("hi", "hi", 4),
+                null, 7,
+                true /* hasactivenotifs */);
+        ShortcutInfo si2 = mock(ShortcutInfo.class);
+        when(si2.getLabel()).thenReturn("hello");
+        ConversationChannel ccw2 = new ConversationChannel(si2, 6,
+                new NotificationChannel("hi2", "hi2", 4),
+                null, 7,
+                true /* hasactivenotifs */);
+        // no crash
+        mController.mConversationComparator.compare(ccw, ccw2);
+    }
+
+    @Test
+    public void testNullSpans() {
+        ConversationChannel ccw = new ConversationChannel(mock(ShortcutInfo.class), 6,
+                new NotificationChannel("hi", "hi", 4),
+                null, 7,
+                true /* hasactivenotifs */);
+        ConversationChannel ccw2 = new ConversationChannel(mock(ShortcutInfo.class), 6,
+                new NotificationChannel("hi2", "hi2", 4),
+                null, 7,
+                true /* hasactivenotifs */);
+        // no crash
+        mController.mConversationComparator.compare(ccw, ccw2);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
index 049a349..996d572 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
@@ -22,6 +22,7 @@
 import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_NONE;
 import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC;
 import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_COMPLEX;
+import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_MANAGED;
 import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_NUMERIC;
 import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX;
 import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
@@ -190,6 +191,16 @@
     }
 
     @Test
+    public void isScreenLockEnabled_QualityManaged() {
+        setDevicePolicyPasswordQuality(PASSWORD_QUALITY_MANAGED);
+        assertThat(mController.isScreenLockEnabled(ScreenLockType.NONE)).isFalse();
+        assertThat(mController.isScreenLockEnabled(ScreenLockType.SWIPE)).isFalse();
+        assertThat(mController.isScreenLockEnabled(ScreenLockType.PATTERN)).isFalse();
+        assertThat(mController.isScreenLockEnabled(ScreenLockType.PIN)).isFalse();
+        assertThat(mController.isScreenLockEnabled(ScreenLockType.PASSWORD)).isFalse();
+    }
+
+    @Test
     public void isScreenLockEnabled_NoneComplexity() {
         when(mLockPatternUtils.getRequestedPasswordComplexity(anyInt(), anyBoolean()))
                 .thenReturn(PASSWORD_COMPLEXITY_NONE);
@@ -353,6 +364,9 @@
 
         when(mLockPatternUtils.getRequestedPasswordMetrics(anyInt(), anyBoolean()))
                 .thenReturn(policy.getMinMetrics());
+
+        when(mLockPatternUtils.isCredentialsDisabledForUser(anyInt()))
+                .thenReturn(quality == PASSWORD_QUALITY_MANAGED);
     }
 
     private ChooseLockGenericController.Builder createBuilder() {
diff --git a/tests/robotests/src/com/android/settings/system/DisableAutomaticUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/DisableAutomaticUpdatesPreferenceControllerTest.java
new file mode 100644
index 0000000..db8486e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/system/DisableAutomaticUpdatesPreferenceControllerTest.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2021 The Android Open Source 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 com.android.settings.system;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class DisableAutomaticUpdatesPreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private SwitchPreference mPreference;
+
+    private Context mContext;
+    private DisableAutomaticUpdatesPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new DisableAutomaticUpdatesPreferenceController(mContext, "test");
+    }
+
+    @Test
+    public void getAvailabilityStatus_shouldReturnAVAILABLE() {
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void isChecked_valueIsZeroInProvider_shouldReturnTrue() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE,
+                DisableAutomaticUpdatesPreferenceController.ENABLE_UPDATES_SETTING);
+
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isChecked_valueIsOneInProvider_shouldReturnFalse() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE,
+                DisableAutomaticUpdatesPreferenceController.DISABLE_UPDATES_SETTING);
+
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void setChecked_true_providerValueIsZero() {
+        mController.setChecked(true);
+
+        int value = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE,
+                DisableAutomaticUpdatesPreferenceController.ENABLE_UPDATES_SETTING /* default */);
+
+        assertThat(value).isEqualTo(
+                DisableAutomaticUpdatesPreferenceController.ENABLE_UPDATES_SETTING);
+    }
+
+    @Test
+    public void setChecked_false_providerValueIsOne() {
+        mController.setChecked(false);
+
+        int value = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE,
+                DisableAutomaticUpdatesPreferenceController.ENABLE_UPDATES_SETTING /* default */);
+
+        assertThat(value).isEqualTo(
+                DisableAutomaticUpdatesPreferenceController.DISABLE_UPDATES_SETTING);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2Test.java b/tests/robotests/src/com/android/settings/wifi/details/WifiNetworkDetailsFragmentTest.java
similarity index 91%
rename from tests/robotests/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2Test.java
rename to tests/robotests/src/com/android/settings/wifi/details/WifiNetworkDetailsFragmentTest.java
index fdd6295a..4f74254 100644
--- a/tests/robotests/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2Test.java
+++ b/tests/robotests/src/com/android/settings/wifi/details/WifiNetworkDetailsFragmentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 The Android Open Source Project
+ * Copyright (C) 2021 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.wifi.details2;
+package com.android.settings.wifi.details;
 
 import static com.android.settings.wifi.WifiSettings.WIFI_DIALOG_ID;
 
@@ -54,9 +54,9 @@
 import java.util.ArrayList;
 
 @RunWith(RobolectricTestRunner.class)
-public class WifiNetworkDetailsFragment2Test {
+public class WifiNetworkDetailsFragmentTest {
 
-    final String TEST_PREFERENCE_KEY = "TEST_PREFERENCE_KEY";
+    private static final String TEST_PREFERENCE_KEY = "TEST_PREFERENCE_KEY";
 
     @Mock
     WifiEntry mWifiEntry;
@@ -64,7 +64,7 @@
     NetworkDetailsTracker mNetworkDetailsTracker;
     @Mock
     Menu mMenu;
-    private WifiNetworkDetailsFragment2 mFragment;
+    private WifiNetworkDetailsFragment mFragment;
 
     @Before
     public void setUp() {
@@ -72,7 +72,7 @@
         doReturn(mWifiEntry).when(mNetworkDetailsTracker).getWifiEntry();
         doReturn(true).when(mWifiEntry).isSaved();
 
-        mFragment = new WifiNetworkDetailsFragment2();
+        mFragment = new WifiNetworkDetailsFragment();
         mFragment.mNetworkDetailsTracker = mNetworkDetailsTracker;
     }
 
@@ -165,8 +165,8 @@
         verify(controller).displayPreference(screen);
     }
 
-    // Fake WifiNetworkDetailsFragment2 to override the protected method as public.
-    public class FakeFragment extends WifiNetworkDetailsFragment2 {
+    // Fake WifiNetworkDetailsFragment to override the protected method as public.
+    public static class FakeFragment extends WifiNetworkDetailsFragment {
 
         @Override
         public void addPreferenceController(AbstractPreferenceController controller) {
@@ -179,7 +179,7 @@
         }
     }
 
-    public class TestController extends BasePreferenceController {
+    public static class TestController extends BasePreferenceController {
 
         public TestController() {
             super(RuntimeEnvironment.application, TEST_PREFERENCE_KEY);
diff --git a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
index 7354d85..6a098bc 100644
--- a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
+++ b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
@@ -76,6 +76,7 @@
 import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
 import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
 import com.android.settings.widget.EntityHeaderController;
+import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.utils.StringUtil;
@@ -145,7 +146,7 @@
     @Mock
     private WifiInfo mMockWifiInfo;
     @Mock
-    private WifiNetworkDetailsFragment2 mMockFragment;
+    private WifiNetworkDetailsFragment mMockFragment;
     @Mock
     private WifiManager mMockWifiManager;
     @Mock
diff --git a/tests/unit/src/com/android/settings/display/ColorModePreferenceFragmentTest.java b/tests/unit/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
index cfdedc7..450525c 100644
--- a/tests/unit/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
+++ b/tests/unit/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
@@ -39,6 +39,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @RunWith(AndroidJUnit4.class)
@@ -232,4 +233,15 @@
 
         verify(mFragment).setColorMode(ColorDisplayManager.COLOR_MODE_AUTOMATIC);
     }
+
+    @Test
+    @UiThreadTest
+    public void checkViewPagerTotalCount() throws Throwable {
+        final ArrayList<Integer> viewPagerResList = mFragment.getViewPagerResource();
+
+        assertThat(viewPagerResList.size()).isEqualTo(3);
+        for (int idx = 0; idx < viewPagerResList.size(); idx++) {
+            assertThat(viewPagerResList.get(idx) > 0).isTrue();
+        }
+    }
 }
diff --git a/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
index cb78d19..7cffb76 100644
--- a/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
@@ -665,6 +665,7 @@
         doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
         doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
         Drawable icon = mock(Drawable.class);
+        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
         doReturn(icon).when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(false));
         setupGetIconConditions(sub.get(0).getSubscriptionId(), true, true,
                 true, ServiceState.STATE_IN_SERVICE);
@@ -683,6 +684,7 @@
         doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
         doReturn(subs.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
         Drawable icon = mock(Drawable.class);
+        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
         doReturn(icon).when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(false));
         setupGetIconConditions(subId, false, true,
                 true, ServiceState.STATE_IN_SERVICE);
@@ -701,7 +703,8 @@
         doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
         doReturn(subs.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
         Drawable icon = mock(Drawable.class);
-        doReturn(icon).when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(false));
+        when(mTelephonyManager.isDataEnabled()).thenReturn(false);
+        doReturn(icon).when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(true));
 
         setupGetIconConditions(subId, false, false,
                 false, ServiceState.STATE_IN_SERVICE);
diff --git a/tests/unit/src/com/android/settings/network/telephony/NrAdvancedCallingPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/NrAdvancedCallingPreferenceControllerTest.java
new file mode 100644
index 0000000..9eb67df
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/NrAdvancedCallingPreferenceControllerTest.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (C) 2021 The Android Open Source 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 com.android.settings.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.RestrictedSwitchPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class NrAdvancedCallingPreferenceControllerTest {
+    private static final int SUB_ID = 2;
+
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private TelephonyManager mInvalidTelephonyManager;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private CarrierConfigManager mCarrierConfigManager;
+
+    private NrAdvancedCallingPreferenceController mController;
+    private SwitchPreference mPreference;
+    private PersistableBundle mCarrierConfig;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        when(mContext.getSystemService(CarrierConfigManager.class))
+                .thenReturn(mCarrierConfigManager);
+
+        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+        doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
+                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+        doReturn(TelephonyManager.NETWORK_TYPE_BITMASK_NR).when(
+                mTelephonyManager).getSupportedRadioAccessFamily();
+        doReturn(false).when(mTelephonyManager).isVoNrEnabled();
+        doReturn(TelephonyManager.ENABLE_VONR_REQUEST_NOT_SUPPORTED).when(
+                mTelephonyManager).setVoNrEnabled(anyBoolean());
+        mCarrierConfig = new PersistableBundle();
+        doReturn(mCarrierConfig).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_VONR_SETTING_VISIBILITY_BOOL, false);
+        mCarrierConfig.putIntArray(CarrierConfigManager.KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY,
+                new int[]{1, 2});
+
+        mPreference = new RestrictedSwitchPreference(mContext);
+        mController = spy(new NrAdvancedCallingPreferenceController(mContext, "VoNr"));
+        mController.init(SUB_ID);
+        doReturn(true).when(mController).isCallStateIdle();
+        mPreference.setKey(mController.getPreferenceKey());
+    }
+
+    @Test
+    public void getAvailabilityStatus_vonrDisabled_returnUnavailable() {
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_VONR_SETTING_VISIBILITY_BOOL, false);
+
+        mController.init(SUB_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_vonrEnabled_returnAvailable() {
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_VONR_SETTING_VISIBILITY_BOOL, true);
+
+        mController.init(SUB_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_deviceNoNr_returnUnavailable() {
+        doReturn(TelephonyManager.NETWORK_TYPE_BITMASK_LTE).when(
+                mTelephonyManager).getSupportedRadioAccessFamily();
+
+        mController.init(SUB_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_carrierNoNr_returnUnavailable() {
+        mCarrierConfig.putIntArray(CarrierConfigManager.KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY,
+                new int[0]);
+
+        mController.init(SUB_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_carrierConfigNrIsNull_returnUnavailable() {
+        mCarrierConfig.putIntArray(CarrierConfigManager.KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY,
+                null);
+
+        mController.init(SUB_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void updateState_callStateNotIdle_prefDisabled() {
+        doReturn(false).when(mController).isCallStateIdle();
+        mPreference.setEnabled(true);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void updateState_configOn_prefChecked() {
+        doReturn(TelephonyManager.ENABLE_VONR_SUCCESS).when(
+                mTelephonyManager).setVoNrEnabled(anyBoolean());
+        doReturn(true).when(mTelephonyManager).isVoNrEnabled();
+        mPreference.setChecked(false);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java b/tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java
deleted file mode 100644
index 30a2729..0000000
--- a/tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source 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 com.android.settings.panel;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.clearInvocations;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.net.Uri;
-import android.net.wifi.ScanResult;
-import android.net.wifi.WifiManager;
-import android.os.Handler;
-
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import com.android.settings.network.AirplaneModePreferenceController;
-import com.android.settings.network.InternetUpdater;
-import com.android.settings.network.ProviderModelSliceHelper;
-import com.android.settings.slices.CustomSliceRegistry;
-import com.android.settings.testutils.ResourcesUtils;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnit;
-import org.mockito.junit.MockitoRule;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(AndroidJUnit4.class)
-public class InternetConnectivityPanelTest {
-
-    public static final String TITLE_INTERNET = ResourcesUtils.getResourcesString(
-            ApplicationProvider.getApplicationContext(), "provider_internet_settings");
-    public static final String TITLE_APM = ResourcesUtils.getResourcesString(
-            ApplicationProvider.getApplicationContext(), "airplane_mode");
-    public static final String SUBTITLE_TEXT_WIFI_IS_OFF =
-            ResourcesUtils.getResourcesString(ApplicationProvider.getApplicationContext(),
-                    "wifi_is_off");
-    public static final String SUBTITLE_TEXT_TAP_A_NETWORK_TO_CONNECT =
-            ResourcesUtils.getResourcesString(ApplicationProvider.getApplicationContext(),
-                    "tap_a_network_to_connect");
-    public static final String SUBTITLE_NON_CARRIER_NETWORK_UNAVAILABLE =
-            ResourcesUtils.getResourcesString(ApplicationProvider.getApplicationContext(),
-                    "non_carrier_network_unavailable");
-    public static final String SUBTITLE_ALL_NETWORK_UNAVAILABLE =
-            ResourcesUtils.getResourcesString(ApplicationProvider.getApplicationContext(),
-                    "all_network_unavailable");
-    public static final String BUTTON_TURN_ON_WIFI = ResourcesUtils.getResourcesString(
-            ApplicationProvider.getApplicationContext(), "turn_on_wifi");
-    public static final String BUTTON_TURN_OFF_WIFI = ResourcesUtils.getResourcesString(
-            ApplicationProvider.getApplicationContext(), "turn_off_wifi");
-
-    @Rule
-    public final MockitoRule mMocks = MockitoJUnit.rule();
-    @Mock
-    Handler mMainThreadHandler;
-    @Mock
-    PanelContentCallback mPanelContentCallback;
-    @Mock
-    InternetUpdater mInternetUpdater;
-    @Mock
-    private WifiManager mWifiManager;
-    @Mock
-    private ProviderModelSliceHelper mProviderModelSliceHelper;
-
-    private Context mContext;
-    private FakeHandlerInjector mFakeHandlerInjector;
-    private InternetConnectivityPanel mPanel;
-
-    private class FakeHandlerInjector extends InternetConnectivityPanel.HandlerInjector {
-
-        private Runnable mRunnable;
-
-        FakeHandlerInjector(Context context) {
-            super(context);
-        }
-
-        @Override
-        public void postDelay(Runnable runnable) {
-            mRunnable = runnable;
-        }
-
-        public Runnable getRunnable() {
-            return mRunnable;
-        }
-    }
-
-    @Before
-    public void setUp() {
-        mContext = spy(ApplicationProvider.getApplicationContext());
-        mFakeHandlerInjector = new FakeHandlerInjector(mContext);
-        when(mContext.getApplicationContext()).thenReturn(mContext);
-        when(mContext.getMainThreadHandler()).thenReturn(mMainThreadHandler);
-        when(mContext.getSystemService(WifiManager.class)).thenReturn(mWifiManager);
-
-        mPanel = InternetConnectivityPanel.create(mContext);
-        mPanel.registerCallback(mPanelContentCallback);
-        mPanel.mIsProviderModelEnabled = true;
-        mPanel.mInternetUpdater = mInternetUpdater;
-        mPanel.mProviderModelSliceHelper = mProviderModelSliceHelper;
-        mPanel.mHandlerInjector = mFakeHandlerInjector;
-    }
-
-    @Test
-    public void getTitle_apmOff_shouldBeInternet() {
-        doReturn(false).when(mInternetUpdater).isAirplaneModeOn();
-
-        assertThat(mPanel.getTitle()).isEqualTo(TITLE_INTERNET);
-    }
-
-    @Test
-    public void getTitle_apmOn_shouldBeApm() {
-        doReturn(true).when(mInternetUpdater).isAirplaneModeOn();
-
-        assertThat(mPanel.getTitle()).isEqualTo(TITLE_APM);
-    }
-
-    @Test
-    public void getSubTitle_apmOnWifiOff_shouldBeNull() {
-        doReturn(true).when(mInternetUpdater).isAirplaneModeOn();
-        doReturn(false).when(mInternetUpdater).isWifiEnabled();
-
-        assertThat(mPanel.getSubTitle()).isNull();
-    }
-
-    @Test
-    public void getSubTitle_apmOnWifiOn_shouldBeNull() {
-        doReturn(true).when(mInternetUpdater).isAirplaneModeOn();
-        doReturn(true).when(mInternetUpdater).isWifiEnabled();
-
-        assertThat(mPanel.getSubTitle()).isNull();
-    }
-
-    @Test
-    public void getSubTitle_apmOffWifiOff_wifiIsOn() {
-        doReturn(false).when(mInternetUpdater).isAirplaneModeOn();
-        doReturn(false).when(mInternetUpdater).isWifiEnabled();
-
-        mPanel.updatePanelTitle();
-
-        assertThat(mPanel.getSubTitle()).isEqualTo(SUBTITLE_TEXT_WIFI_IS_OFF);
-    }
-
-    @Test
-    public void getSubTitle_apmOffWifiOnNoWifiListHasCarrierData_NonCarrierNetworkUnavailable() {
-        List wifiList = new ArrayList<ScanResult>();
-        mockCondition(false, true, true, true, true, true, wifiList);
-
-        mPanel.updatePanelTitle();
-
-        assertThat(mPanel.getSubTitle()).isEqualTo(SUBTITLE_NON_CARRIER_NETWORK_UNAVAILABLE);
-    }
-
-    @Test
-    public void getSubTitle_apmOffWifiOnNoWifiListNoCarrierItem_AllNetworkUnavailable() {
-        List wifiList = new ArrayList<ScanResult>();
-        mockCondition(false, false, false, false, false, true, wifiList);
-
-        mPanel.updatePanelTitle();
-
-        assertThat(mPanel.getSubTitle()).isEqualTo(SUBTITLE_ALL_NETWORK_UNAVAILABLE);
-    }
-
-    @Test
-    public void getSubTitle_apmOffWifiOnNoWifiListNoDataSimActive_AllNetworkUnavailable() {
-        List wifiList = new ArrayList<ScanResult>();
-        mockCondition(false, true, false, true, true, true, wifiList);
-
-        mPanel.updatePanelTitle();
-
-        assertThat(mPanel.getSubTitle()).isEqualTo(SUBTITLE_ALL_NETWORK_UNAVAILABLE);
-    }
-
-    @Test
-    public void getSubTitle_apmOffWifiOnNoWifiListNoService_AllNetworkUnavailable() {
-        List wifiList = new ArrayList<ScanResult>();
-        mockCondition(false, true, false, true, false, true, wifiList);
-
-        mPanel.updatePanelTitle();
-
-        assertThat(mPanel.getSubTitle()).isEqualTo(SUBTITLE_ALL_NETWORK_UNAVAILABLE);
-    }
-
-    @Test
-    public void getSubTitle_apmOffWifiOnTwoWifiItemsNoCarrierData_tapANetworkToConnect() {
-        List wifiList = new ArrayList<ScanResult>();
-        wifiList.add(new ScanResult());
-        wifiList.add(new ScanResult());
-        mockCondition(false, true, false, true, true, true, wifiList);
-
-        mPanel.updatePanelTitle();
-
-        assertThat(mPanel.getSubTitle()).isEqualTo(SUBTITLE_TEXT_TAP_A_NETWORK_TO_CONNECT);
-    }
-
-    @Test
-    public void getSlices_providerModelDisabled_containsNecessarySlices() {
-        mPanel.mIsProviderModelEnabled = false;
-        List<Uri> uris = mPanel.getSlices();
-
-        assertThat(uris).containsExactly(
-                AirplaneModePreferenceController.SLICE_URI,
-                CustomSliceRegistry.MOBILE_DATA_SLICE_URI,
-                CustomSliceRegistry.WIFI_SLICE_URI);
-    }
-
-    @Test
-    public void getSlices_providerModelEnabled_containsNecessarySlices() {
-        List<Uri> uris = mPanel.getSlices();
-
-        assertThat(uris).containsExactly(CustomSliceRegistry.PROVIDER_MODEL_SLICE_URI);
-    }
-
-    @Test
-    public void getSeeMoreIntent_providerModelDisabled_shouldNotNull() {
-        mPanel.mIsProviderModelEnabled = false;
-
-        assertThat(mPanel.getSeeMoreIntent()).isNotNull();
-    }
-
-    @Test
-    public void getSeeMoreIntent_providerModelEnabled_shouldBeNull() {
-        mPanel.mIsProviderModelEnabled = true;
-
-        assertThat(mPanel.getSeeMoreIntent()).isNull();
-    }
-
-    @Test
-    public void updatePanelTitle_onHeaderChanged() {
-        clearInvocations(mPanelContentCallback);
-
-        mPanel.updatePanelTitle();
-
-        verify(mPanelContentCallback).onHeaderChanged();
-    }
-
-    @Test
-    public void updateProgressBar_wifiDisabled_hideProgress() {
-        mPanel.mIsProgressBarVisible = true;
-        doReturn(false).when(mInternetUpdater).isWifiEnabled();
-        clearInvocations(mPanelContentCallback);
-
-        mPanel.updateProgressBar();
-
-        assertThat(mPanel.isProgressBarVisible()).isFalse();
-        verify(mPanelContentCallback).onProgressBarVisibleChanged();
-    }
-
-    @Test
-    public void updateProgressBar_noWifiScanResults_showProgressForever() {
-        mPanel.mIsScanningSubTitleShownOnce = false;
-        mPanel.mIsProgressBarVisible = false;
-        doReturn(true).when(mInternetUpdater).isWifiEnabled();
-        List<ScanResult> noWifiScanResults = new ArrayList<>();
-        doReturn(noWifiScanResults).when(mWifiManager).getScanResults();
-        clearInvocations(mPanelContentCallback);
-
-        mPanel.updateProgressBar();
-
-        assertThat(mPanel.mIsProgressBarVisible).isTrue();
-        verify(mPanelContentCallback).onProgressBarVisibleChanged();
-        verify(mPanelContentCallback).onHeaderChanged();
-
-        assertThat(mFakeHandlerInjector.getRunnable())
-                .isEqualTo(mPanel.mHideScanningSubTitleRunnable);
-        mFakeHandlerInjector.getRunnable().run();
-        assertThat(mPanel.mIsScanningSubTitleShownOnce).isTrue();
-        assertThat(mPanel.mIsProgressBarVisible).isTrue();
-    }
-
-    @Test
-    public void updateProgressBar_hasWifiScanResults_showProgressDelayedHide() {
-        mPanel.mIsProgressBarVisible = false;
-        doReturn(true).when(mInternetUpdater).isWifiEnabled();
-        List<ScanResult> hasWifiScanResults = mock(ArrayList.class);
-        doReturn(1).when(hasWifiScanResults).size();
-        doReturn(hasWifiScanResults).when(mWifiManager).getScanResults();
-        clearInvocations(mPanelContentCallback);
-
-        mPanel.updateProgressBar();
-
-        assertThat(mPanel.isProgressBarVisible()).isTrue();
-        verify(mPanelContentCallback).onProgressBarVisibleChanged();
-
-        assertThat(mFakeHandlerInjector.getRunnable())
-                .isEqualTo(mPanel.mHideProgressBarRunnable);
-        mFakeHandlerInjector.getRunnable().run();
-        assertThat(mPanel.mIsProgressBarVisible).isFalse();
-    }
-
-    @Test
-    public void setProgressBarVisible_onProgressBarVisibleChanged() {
-        mPanel.mIsProgressBarVisible = false;
-        doReturn(true).when(mInternetUpdater).isWifiEnabled();
-        clearInvocations(mPanelContentCallback);
-
-        mPanel.setProgressBarVisible(true);
-
-        assertThat(mPanel.mIsProgressBarVisible).isTrue();
-        verify(mPanelContentCallback).onProgressBarVisibleChanged();
-        verify(mPanelContentCallback).onHeaderChanged();
-    }
-
-    private void mockCondition(boolean airplaneMode, boolean hasCarrier,
-            boolean isDataSimActive, boolean isMobileDataEnabled, boolean isServiceInService,
-            boolean isWifiEnabled, List<ScanResult> wifiItems) {
-        doReturn(airplaneMode).when(mInternetUpdater).isAirplaneModeOn();
-        when(mProviderModelSliceHelper.hasCarrier()).thenReturn(hasCarrier);
-        when(mProviderModelSliceHelper.isDataSimActive()).thenReturn(isDataSimActive);
-        when(mProviderModelSliceHelper.isMobileDataEnabled()).thenReturn(isMobileDataEnabled);
-        when(mProviderModelSliceHelper.isDataStateInService()).thenReturn(isServiceInService);
-        when(mProviderModelSliceHelper.isVoiceStateInService()).thenReturn(isServiceInService);
-        doReturn(isWifiEnabled).when(mInternetUpdater).isWifiEnabled();
-        doReturn(wifiItems).when(mWifiManager).getScanResults();
-    }
-}
diff --git a/tests/unit/src/com/android/settings/panel/PanelFeatureProviderImplTest.java b/tests/unit/src/com/android/settings/panel/PanelFeatureProviderImplTest.java
index 3b61a73..a02c054 100644
--- a/tests/unit/src/com/android/settings/panel/PanelFeatureProviderImplTest.java
+++ b/tests/unit/src/com/android/settings/panel/PanelFeatureProviderImplTest.java
@@ -20,7 +20,12 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
 import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 import android.provider.Settings;
 
@@ -36,25 +41,28 @@
 
     private static final String TEST_PACKAGENAME = "com.test.packagename";
 
+    private static final String SYSTEMUI_PACKAGE_NAME = "com.android.systemui";
     private Context mContext;
     private PanelFeatureProviderImpl mProvider;
     private Bundle mBundle;
 
     @Before
     public void setUp() {
-        mContext = ApplicationProvider.getApplicationContext();
+        mContext = spy(ApplicationProvider.getApplicationContext());
         mProvider = new PanelFeatureProviderImpl();
         mBundle = new Bundle();
         mBundle.putString(KEY_MEDIA_PACKAGE_NAME, TEST_PACKAGENAME);
     }
 
     @Test
-    public void getPanel_internetConnectivityKey_returnsCorrectPanel() {
+    public void getPanel_internetConnectivityKey_sendsCorrectBroadcast() {
         mBundle.putString(KEY_PANEL_TYPE_ARGUMENT, Settings.Panel.ACTION_INTERNET_CONNECTIVITY);
+        mProvider.getPanel(mContext, mBundle);
+        Intent intent = new Intent(Settings.Panel.ACTION_INTERNET_CONNECTIVITY);
+        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND)
+                .setPackage(SYSTEMUI_PACKAGE_NAME);
 
-        final PanelContent panel = mProvider.getPanel(mContext, mBundle);
-
-        assertThat(panel).isInstanceOf(InternetConnectivityPanel.class);
+        verify(mContext, never()).sendBroadcast(intent);
     }
 
     @Test