diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 65c0996..78f4e22 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -715,7 +715,7 @@
         <activity
             android:name="Settings$ZenModeSettingsActivity"
             android:label="@string/zen_mode_settings_title"
-            android:icon="@drawable/ic_settings_notifications"
+            android:icon="@drawable/ic_notifications"
             android:exported="true"
             android:taskAffinity="com.android.settings"
             android:parentActivityName="Settings">
@@ -763,7 +763,7 @@
         <activity
             android:name=".notification.ZenOnboardingActivity"
             android:label="@string/zen_onboarding_dnd_visual_disturbances_header"
-            android:icon="@drawable/ic_settings_notifications"
+            android:icon="@drawable/ic_notifications"
             android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"
             android:exported="true"
             android:taskAffinity="com.android.settings"
@@ -776,7 +776,7 @@
         <activity
             android:name="Settings$ZenModeAutomationSettingsActivity"
             android:label="@string/zen_mode_automation_settings_title"
-            android:icon="@drawable/ic_settings_notifications"
+            android:icon="@drawable/ic_notifications"
             android:exported="true"
             android:taskAffinity="com.android.settings"
             android:parentActivityName="Settings$ZenModeSettingsActivity">
@@ -957,35 +957,6 @@
                 android:value="com.android.settings.display.NightDisplaySettings" />
         </activity>
 
-        <activity
-            android:name="Settings$DeviceInfoSettingsActivity"
-            android:label="@string/device_info_settings"
-            android:icon="@drawable/ic_settings_about"
-            android:taskAffinity="com.android.settings"
-            android:enabled="false"
-            android:parentActivityName="Settings">
-            <intent-filter android:priority="1">
-                <action android:name="android.settings.DEVICE_INFO_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.VOICE_LAUNCH" />
-            </intent-filter>
-            <intent-filter android:priority="10">
-                <action android:name="com.android.settings.action.SETTINGS" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.ia.system" />
-            <meta-data android:name="com.android.settings.title"
-                android:resource="@string/about_settings" />
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.deviceinfo.DeviceInfoSettings" />
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                android:value="true" />
-        </activity>
-
         <activity android:name=".Settings$MyDeviceInfoActivity"
                   android:label="@string/about_settings"
                   android:icon="@drawable/ic_settings_about"
@@ -1070,7 +1041,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.applications.ManageDomainUrls" />
+                       android:value="com.android.settings.applications.managedomainurls.ManageDomainUrls" />
         </activity>
 
         <activity android:name="Settings$MemorySettingsActivity"
diff --git a/color-check-baseline.xml b/color-check-baseline.xml
index f962954..623f537 100644
--- a/color-check-baseline.xml
+++ b/color-check-baseline.xml
@@ -93,7 +93,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/layout-land/choose_lock_pattern.xml"
-            line="170"
+            line="178"
             column="17"/>
     </issue>
 
@@ -425,27 +425,11 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;fingerprint_indicator_background_resting&quot;>#12000000&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values/colors.xml"
-            line="51"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="    &lt;color name=&quot;running_processes_system_ram&quot;>#ff384248&lt;/color>"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="53"
+            line="52"
             column="5"/>
     </issue>
 
@@ -461,7 +445,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="54"
+            line="53"
             column="5"/>
     </issue>
 
@@ -477,7 +461,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="56"
+            line="55"
             column="5"/>
     </issue>
 
@@ -493,7 +477,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="59"
+            line="58"
             column="5"/>
     </issue>
 
@@ -509,7 +493,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="60"
+            line="59"
             column="5"/>
     </issue>
 
@@ -525,7 +509,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="62"
+            line="61"
             column="5"/>
     </issue>
 
@@ -541,7 +525,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="63"
+            line="62"
             column="5"/>
     </issue>
 
@@ -557,7 +541,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="64"
+            line="63"
             column="5"/>
     </issue>
 
@@ -573,7 +557,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="65"
+            line="64"
             column="5"/>
     </issue>
 
@@ -589,7 +573,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="67"
+            line="66"
             column="5"/>
     </issue>
 
@@ -605,7 +589,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="70"
+            line="69"
             column="5"/>
     </issue>
 
@@ -621,7 +605,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="72"
+            line="71"
             column="5"/>
     </issue>
 
@@ -637,7 +621,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="73"
+            line="72"
             column="5"/>
     </issue>
 
@@ -653,7 +637,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="76"
+            line="75"
             column="5"/>
     </issue>
 
@@ -669,7 +653,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="77"
+            line="76"
             column="5"/>
     </issue>
 
@@ -685,7 +669,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="78"
+            line="77"
             column="5"/>
     </issue>
 
@@ -701,7 +685,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="79"
+            line="78"
             column="5"/>
     </issue>
 
@@ -717,7 +701,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="80"
+            line="79"
             column="5"/>
     </issue>
 
@@ -733,7 +717,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="83"
+            line="82"
             column="5"/>
     </issue>
 
@@ -749,7 +733,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="84"
+            line="83"
             column="5"/>
     </issue>
 
@@ -765,7 +749,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="85"
+            line="84"
             column="5"/>
     </issue>
 
@@ -781,7 +765,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="86"
+            line="85"
             column="5"/>
     </issue>
 
@@ -797,7 +781,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="87"
+            line="86"
             column="5"/>
     </issue>
 
@@ -813,7 +797,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="88"
+            line="87"
             column="5"/>
     </issue>
 
@@ -829,7 +813,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="89"
+            line="88"
             column="5"/>
     </issue>
 
@@ -845,7 +829,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="90"
+            line="89"
             column="5"/>
     </issue>
 
@@ -861,7 +845,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="91"
+            line="90"
             column="5"/>
     </issue>
 
@@ -877,7 +861,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="92"
+            line="91"
             column="5"/>
     </issue>
 
@@ -893,7 +877,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="93"
+            line="92"
             column="5"/>
     </issue>
 
@@ -909,7 +893,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="95"
+            line="94"
             column="5"/>
     </issue>
 
@@ -921,11 +905,11 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;gestures_setting_background_color&quot;>#f4f4f4&lt;/color>"
+        errorLine1="    &lt;color name=&quot;gestures_setting_background_color&quot;>#ffffff&lt;/color>"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="98"
+            line="97"
             column="5"/>
     </issue>
 
@@ -941,7 +925,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="100"
+            line="99"
             column="5"/>
     </issue>
 
@@ -957,7 +941,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="103"
+            line="102"
             column="5"/>
     </issue>
 
@@ -973,7 +957,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="106"
+            line="105"
             column="5"/>
     </issue>
 
@@ -989,7 +973,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="109"
+            line="108"
             column="5"/>
     </issue>
 
@@ -1005,7 +989,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="112"
+            line="111"
             column="5"/>
     </issue>
 
@@ -1021,7 +1005,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="113"
+            line="112"
             column="5"/>
     </issue>
 
@@ -1037,7 +1021,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="116"
+            line="115"
             column="5"/>
     </issue>
 
@@ -1053,7 +1037,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="117"
+            line="116"
             column="5"/>
     </issue>
 
@@ -1069,7 +1053,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="118"
+            line="117"
             column="5"/>
     </issue>
 
@@ -1085,7 +1069,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="119"
+            line="118"
             column="5"/>
     </issue>
 
@@ -1101,7 +1085,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="120"
+            line="119"
             column="5"/>
     </issue>
 
@@ -1117,7 +1101,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="121"
+            line="120"
             column="5"/>
     </issue>
 
@@ -1133,7 +1117,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="122"
+            line="121"
             column="5"/>
     </issue>
 
@@ -1149,7 +1133,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="123"
+            line="122"
             column="5"/>
     </issue>
 
@@ -1165,7 +1149,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="124"
+            line="123"
             column="5"/>
     </issue>
 
@@ -1181,7 +1165,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="125"
+            line="124"
             column="5"/>
     </issue>
 
@@ -1197,7 +1181,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="126"
+            line="125"
             column="5"/>
     </issue>
 
@@ -1213,7 +1197,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="127"
+            line="126"
             column="5"/>
     </issue>
 
@@ -1229,7 +1213,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="128"
+            line="127"
             column="5"/>
     </issue>
 
@@ -1245,7 +1229,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="133"
+            line="132"
             column="5"/>
     </issue>
 
@@ -1261,7 +1245,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="134"
+            line="133"
             column="5"/>
     </issue>
 
@@ -1277,7 +1261,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="135"
+            line="134"
             column="5"/>
     </issue>
 
@@ -1293,7 +1277,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="136"
+            line="135"
             column="5"/>
     </issue>
 
@@ -1309,7 +1293,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="137"
+            line="136"
             column="5"/>
     </issue>
 
@@ -1325,7 +1309,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="138"
+            line="137"
             column="5"/>
     </issue>
 
@@ -1513,38 +1497,6 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="        android:background=&quot;@color/gestures_setting_background_color&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/layout/gesture_preference.xml"
-            line="57"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="                android:background=&quot;@color/gestures_setting_background_color&quot;/>"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/layout/gesture_preference.xml"
-            line="78"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="                &lt;item android:color=&quot;#19263238&quot; android:offset=&quot;0.0&quot;/>"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -2189,7 +2141,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/layout/radio_info.xml"
-            line="111"
+            line="116"
             column="13"/>
     </issue>
 
@@ -2205,7 +2157,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/layout/radio_info.xml"
-            line="141"
+            line="135"
             column="13"/>
     </issue>
 
@@ -2221,7 +2173,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/layout/radio_info.xml"
-            line="279"
+            line="165"
             column="13"/>
     </issue>
 
@@ -2233,6 +2185,38 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="            android:background=&quot;#000000&quot; />"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/radio_info.xml"
+            line="303"
+            column="13"/>
+    </issue>
+
+    <issue
+            id="HardCodedColor"
+            severity="Error"
+            message="Avoid using hardcoded color"
+            category="Correctness"
+            priority="4"
+            summary="Using hardcoded color"
+            explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+            errorLine1="            android:background=&quot;#000000&quot; />"
+            errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+                file="res/layout/radio_info.xml"
+                line="303"
+                column="13"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="            android:src=&quot;@color/running_processes_system_ram&quot;"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -2409,22 +2393,6 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="        android:background=&quot;@color/suggestion_condition_background&quot;>"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/layout/settings_main_dashboard.xml"
-            line="30"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="        android:tint=&quot;@color/icon_accent&quot;"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -2477,7 +2445,7 @@
         errorLine2="                                                                                                                                                                       ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rXC/strings.xml"
-            line="2535"
+            line="2531"
             column="168"/>
     </issue>
 
@@ -2493,7 +2461,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rAU/strings.xml"
-            line="2536"
+            line="2532"
             column="64"/>
     </issue>
 
@@ -2509,7 +2477,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rCA/strings.xml"
-            line="2536"
+            line="2532"
             column="64"/>
     </issue>
 
@@ -2525,7 +2493,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rGB/strings.xml"
-            line="2536"
+            line="2532"
             column="64"/>
     </issue>
 
@@ -2541,7 +2509,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rIN/strings.xml"
-            line="2536"
+            line="2532"
             column="64"/>
     </issue>
 
@@ -2557,7 +2525,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/strings.xml"
-            line="5899"
+            line="5920"
             column="36"/>
     </issue>
 
@@ -2573,7 +2541,7 @@
         errorLine2="                                        ^">
         <location
             file="res/values/styles.xml"
-            line="246"
+            line="248"
             column="41"/>
     </issue>
 
@@ -2589,7 +2557,7 @@
         errorLine2="                                           ^">
         <location
             file="res/values/styles.xml"
-            line="436"
+            line="465"
             column="44"/>
     </issue>
 
@@ -2605,7 +2573,7 @@
         errorLine2="                                           ^">
         <location
             file="res/values/styles.xml"
-            line="442"
+            line="471"
             column="44"/>
     </issue>
 
@@ -2621,7 +2589,7 @@
         errorLine2="                                           ^">
         <location
             file="res/values/styles.xml"
-            line="443"
+            line="472"
             column="44"/>
     </issue>
 
@@ -2633,22 +2601,6 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="        &lt;item name=&quot;android:background&quot;>@color/suggestion_condition_background&lt;/item>"
-        errorLine2="                                        ^">
-        <location
-            file="res/values/styles.xml"
-            line="461"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="        &lt;item name=&quot;wifi_signal_color&quot;>@color/setup_wizard_wifi_color_dark&lt;/item>"
         errorLine2="                                       ^">
         <location
@@ -2861,7 +2813,7 @@
         errorLine2="                                            ^">
         <location
             file="res/values/themes.xml"
-            line="348"
+            line="349"
             column="45"/>
     </issue>
 
@@ -2877,7 +2829,7 @@
         errorLine2="                                                ^">
         <location
             file="res/values/themes.xml"
-            line="349"
+            line="350"
             column="49"/>
     </issue>
 
@@ -2893,7 +2845,7 @@
         errorLine2="                                            ^">
         <location
             file="res/values/themes.xml"
-            line="357"
+            line="358"
             column="45"/>
     </issue>
 
@@ -2909,7 +2861,7 @@
         errorLine2="                                                ^">
         <location
             file="res/values/themes.xml"
-            line="358"
+            line="359"
             column="49"/>
     </issue>
 
diff --git a/res/drawable-nodpi/gesture_swipe_up.png b/res/drawable-nodpi/gesture_swipe_up.png
index ef3610e..a041f9b 100644
--- a/res/drawable-nodpi/gesture_swipe_up.png
+++ b/res/drawable-nodpi/gesture_swipe_up.png
Binary files differ
diff --git a/res/drawable/ic_battery_alert_24dp.xml b/res/drawable/ic_battery_alert_24dp.xml
index cadd882..5a512f7 100644
--- a/res/drawable/ic_battery_alert_24dp.xml
+++ b/res/drawable/ic_battery_alert_24dp.xml
@@ -21,5 +21,8 @@
         android:tint="?android:attr/colorError">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M15.67,4L14,4L14,2h-4v2L8.33,4C7.6,4 7,4.6 7,5.33v15.33C7,21.4 7.6,22 8.33,22h7.33c0.74,0 1.34,-0.6 1.34,-1.33L17,5.33C17,4.6 16.4,4 15.67,4zM13,18h-2v-2h2v2zM13,14h-2L11,9h2v5z"/>
+        android:pathData="M13,17h-2v-2h2V17zM13,13h-2V8h2V13z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16.2,22.5H7.8c-1.3,0 -2.3,-1 -2.3,-2.3V5.8c0,-1.3 1,-2.3 2.3,-2.3h0.7v-2h7v2h0.7c1.3,0 2.3,1.1 2.3,2.3v14.3C18.5,21.5 17.5,22.5 16.2,22.5zM7.8,5.5c-0.2,0 -0.3,0.2 -0.3,0.3v14.3c0,0.2 0.2,0.3 0.3,0.3h8.3c0.2,0 0.3,-0.1 0.3,-0.3V5.8c0,-0.2 -0.1,-0.3 -0.3,-0.3h-2.7v-2h-3v2H7.8z"/>
 </vector>
diff --git a/res/drawable/ic_battery_charging_full.xml b/res/drawable/ic_battery_charging_full.xml
index c2a614e..8308532 100644
--- a/res/drawable/ic_battery_charging_full.xml
+++ b/res/drawable/ic_battery_charging_full.xml
@@ -19,6 +19,9 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:pathData="M15.67,4H14V2h-4v2H8.33C7.6,4 7,4.6 7,5.33v15.33C7,21.4 7.6,22 8.33,22h7.33c0.74,0 1.34,-0.6 1.34,-1.33V5.33C17,4.6 16.4,4 15.67,4zM11,20v-5.5H9L13,7v5.5h2L11,20z"
-        android:fillColor="#000000"/>
+        android:fillColor="#FF000000"
+        android:pathData="M16.2,22.5H7.8c-1.3,0 -2.3,-1 -2.3,-2.3V5.8c0,-1.3 1,-2.3 2.3,-2.3h0.7v-2h7v2h0.7c1.3,0 2.3,1.1 2.3,2.3v14.3C18.5,21.5 17.5,22.5 16.2,22.5zM7.8,5.5c-0.2,0 -0.3,0.2 -0.3,0.3v14.3c0,0.2 0.2,0.3 0.3,0.3h8.3c0.2,0 0.3,-0.1 0.3,-0.3V5.8c0,-0.2 -0.1,-0.3 -0.3,-0.3h-2.7v-2h-3v2H7.8z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11.17,18.42v-4.58H9.5l3.33,-6.25v4.58h1.67L11.17,18.42z"/>
 </vector>
diff --git a/res/drawable/ic_battery_saver_accent_24dp.xml b/res/drawable/ic_battery_saver_accent_24dp.xml
new file mode 100644
index 0000000..c8def54
--- /dev/null
+++ b/res/drawable/ic_battery_saver_accent_24dp.xml
@@ -0,0 +1,29 @@
+<!--
+  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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorAccent">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15,14l-2,0l0,2l-2,0l0,-2l-2,0l0,-2l2,0l0,-2l2,0l0,2l2,0z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16.2,22.5H7.8c-1.3,0 -2.3,-1 -2.3,-2.3V5.8c0,-1.3 1,-2.3 2.3,-2.3h0.7v-2h7v2h0.7c1.3,0 2.3,1.1 2.3,2.3v14.3C18.5,21.5 17.5,22.5 16.2,22.5zM7.8,5.5c-0.2,0 -0.3,0.2 -0.3,0.3v14.3c0,0.2 0.2,0.3 0.3,0.3h8.3c0.2,0 0.3,-0.1 0.3,-0.3V5.8c0,-0.2 -0.1,-0.3 -0.3,-0.3h-2.7v-2h-3v2H7.8z"/>
+</vector>
diff --git a/res/drawable/ic_battery_status_bad_24dp.xml b/res/drawable/ic_battery_status_bad_24dp.xml
index 167d2fe..d841f08 100644
--- a/res/drawable/ic_battery_status_bad_24dp.xml
+++ b/res/drawable/ic_battery_status_bad_24dp.xml
@@ -18,9 +18,10 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
-
     <path
         android:fillColor="?attr/batteryBadColor"
-        android:pathData="M15.78,4h-1.72V2h-4.04v2H8.31C7.61,4,7,4.6,7,5.3v15.3C7,21.4,7.61,22,8.31,22h7.37c0.71,0,1.31-0.6,1.31-1.3V5.3
-		C17.09,4.6,16.48,4,15.78,4z M15,14h-2v2h-2v-2H9v-2h2v-2h2v2h2V14z"/>
+        android:pathData="M15,14l-2,0l0,2l-2,0l0,-2l-2,0l0,-2l2,0l0,-2l2,0l0,2l2,0z"/>
+    <path
+        android:fillColor="?attr/batteryBadColor"
+        android:pathData="M16.2,22.5H7.8c-1.3,0 -2.3,-1 -2.3,-2.3V5.8c0,-1.3 1,-2.3 2.3,-2.3h0.7v-2h7v2h0.7c1.3,0 2.3,1.1 2.3,2.3v14.3C18.5,21.5 17.5,22.5 16.2,22.5zM7.8,5.5c-0.2,0 -0.3,0.2 -0.3,0.3v14.3c0,0.2 0.2,0.3 0.3,0.3h8.3c0.2,0 0.3,-0.1 0.3,-0.3V5.8c0,-0.2 -0.1,-0.3 -0.3,-0.3h-2.7v-2h-3v2H7.8z"/>
 </vector>
diff --git a/res/drawable/ic_battery_status_good_24dp.xml b/res/drawable/ic_battery_status_good_24dp.xml
index 1f29023..4628ee5 100644
--- a/res/drawable/ic_battery_status_good_24dp.xml
+++ b/res/drawable/ic_battery_status_good_24dp.xml
@@ -18,9 +18,10 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
-
     <path
         android:fillColor="?attr/batteryGoodColor"
-        android:pathData="M15.78,4h-1.72V2h-4.04v2H8.31C7.61,4,7,4.6,7,5.3v15.3C7,21.4,7.61,22,8.31,22h7.37c0.71,0,1.31-0.6,1.31-1.3V5.3
-		C17.09,4.6,16.48,4,15.78,4z M10.94,16.37l-3.18-3.18l1.42-1.42l1.77,1.76l3.9-3.9l1.42,1.42L10.94,16.37z"/>
+        android:pathData="M16.2,22.5H7.8c-1.3,0 -2.3,-1 -2.3,-2.3V5.8c0,-1.3 1,-2.3 2.3,-2.3h0.7v-2h7v2h0.7c1.3,0 2.3,1.1 2.3,2.3v14.3C18.5,21.5 17.5,22.5 16.2,22.5zM7.8,5.5c-0.2,0 -0.3,0.2 -0.3,0.3v14.3c0,0.2 0.2,0.3 0.3,0.3h8.3c0.2,0 0.3,-0.1 0.3,-0.3V5.8c0,-0.2 -0.1,-0.3 -0.3,-0.3h-2.7v-2h-3v2H7.8z"/>
+    <path
+        android:fillColor="?attr/batteryGoodColor"
+        android:pathData="M16.1,11.1l-1.4,-1.5l-3.9,3.9l-1.5,-1.4l-1.4,1.4l2.9,2.9z"/>
 </vector>
diff --git a/res/drawable/ic_battery_status_maybe_24dp.xml b/res/drawable/ic_battery_status_maybe_24dp.xml
index 0289c92..64451be 100644
--- a/res/drawable/ic_battery_status_maybe_24dp.xml
+++ b/res/drawable/ic_battery_status_maybe_24dp.xml
@@ -18,9 +18,10 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
-
     <path
         android:fillColor="?attr/batteryMaybeColor"
-        android:pathData="M15.78,4h-1.72V2h-4.04v2H8.31C7.61,4,7,4.6,7,5.3v15.3C7,21.4,7.61,22,8.31,22h7.37c0.71,0,1.31-0.6,1.31-1.3V5.3
-		C17.09,4.6,16.48,4,15.78,4z M13,17.5h-2v-2h2V17.5z M13,13.5h-2v-5h2V13.5z"/>
+        android:pathData="M13,17h-2v-2h2V17zM13,13h-2V8h2V13z"/>
+    <path
+        android:fillColor="?attr/batteryMaybeColor"
+        android:pathData="M16.2,22.5H7.8c-1.3,0 -2.3,-1 -2.3,-2.3V5.8c0,-1.3 1,-2.3 2.3,-2.3h0.7v-2h7v2h0.7c1.3,0 2.3,1.1 2.3,2.3v14.3C18.5,21.5 17.5,22.5 16.2,22.5zM7.8,5.5c-0.2,0 -0.3,0.2 -0.3,0.3v14.3c0,0.2 0.2,0.3 0.3,0.3h8.3c0.2,0 0.3,-0.1 0.3,-0.3V5.8c0,-0.2 -0.1,-0.3 -0.3,-0.3h-2.7v-2h-3v2H7.8z"/>
 </vector>
diff --git a/res/drawable/ic_cancel.xml b/res/drawable/ic_cancel.xml
index b90c18c..c84f18e 100644
--- a/res/drawable/ic_cancel.xml
+++ b/res/drawable/ic_cancel.xml
@@ -16,10 +16,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
-        android:viewportWidth="48.0"
-        android:viewportHeight="48.0">
-
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M24.0,4.0C12.9,4.0 4.0,12.9 4.0,24.0s8.9,20.0 20.0,20.0c11.1,0.0 20.0,-8.9 20.0,-20.0S35.1,4.0 24.0,4.0zM34.0,31.2L31.2,34.0L24.0,26.8L16.8,34.0L14.0,31.2l7.2,-7.2L14.0,16.8l2.8,-2.8l7.2,7.2l7.2,-7.2l2.8,2.8L26.8,24.0L34.0,31.2z"/>
+        android:pathData="M12,2C6.47,2 2,6.47 2,12c0,5.53 4.47,10 10,10c5.53,0 10,-4.47 10,-10C22,6.47 17.53,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8s8,3.59 8,8S16.41,20 12,20z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.59,7l-3.59,3.59l-3.59,-3.59l-1.41,1.41l3.59,3.59l-3.59,3.59l1.41,1.41l3.59,-3.59l3.59,3.59l1.41,-1.41l-3.59,-3.59l3.59,-3.59z"/>
 </vector>
diff --git a/res/drawable/ic_cast_24dp.xml b/res/drawable/ic_cast_24dp.xml
index 948deca..e8245d9 100644
--- a/res/drawable/ic_cast_24dp.xml
+++ b/res/drawable/ic_cast_24dp.xml
@@ -21,11 +21,6 @@
         android:viewportHeight="24.0"
         android:tint="?android:attr/colorControlNormal">
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M1 18v2c0 .55 .45 1 1 1h2c0-1.66-1.34-3-3-3zm0-2.94c-.01 .51 .32 .93 .82 1.02
-2.08 .36 3.74 2 4.1 4.08 .09 .48 .5 .84 .99 .84 .61 0 1.09-.54 1-1.14a6.996
-6.996 0 0 0-5.8-5.78c-.59-.09-1.09 .38 -1.11 .98 zm0-4.03c-.01 .52 .34 .96 .85
-1.01 4.26 .43 7.68 3.82 8.1 8.08 .05 .5 .48 .88 .99 .88 .59 0 1.06-.51
-1-1.1-.52-5.21-4.66-9.34-9.87-9.85-.57-.05-1.05 .4 -1.07 .98 zM21 3H3c-1.1 0-2
-.9-2 2v3h2V5h18v14h-7v2h7c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"/>
+        android:fillColor="#FF000000"
+        android:pathData="M21,3H3C1.9,3 1,3.9 1,5v3h2V5h18v14h-7v2h7c1.1,0 2,-0.9 2,-2V5C23,3.9 22.1,3 21,3zM1,18v3h3C4,19.34 2.66,18 1,18zM1,14v2c2.76,0 5,2.24 5,5h2C8,17.13 4.87,14 1,14zM1,10v2c4.97,0 9,4.03 9,9h2C12,14.92 7.07,10 1,10z"/>
 </vector>
diff --git a/res/drawable/ic_delete.xml b/res/drawable/ic_delete.xml
index d4f79e3..d1290c5 100644
--- a/res/drawable/ic_delete.xml
+++ b/res/drawable/ic_delete.xml
@@ -16,10 +16,16 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24.0dp"
         android:height="24.0dp"
-        android:tint="?android:attr/colorControlNormal"
-        android:viewportWidth="48.0"
-        android:viewportHeight="48.0">
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
     <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12.0,38.0c0.0,2.21 1.79,4.0 4.0,4.0l16.0,0.0c2.21,0.0 4.0,-1.79 4.0,-4.0L36.0,14.0L12.0,14.0l0.0,24.0zM38.0,8.0l-7.0,0.0l-2.0,-2.0L19.0,6.0l-2.0,2.0l-7.0,0.0l0.0,4.0l28.0,0.0L38.0,8.0z"/>
+        android:fillColor="#FF000000"
+        android:pathData="M15,4V3H9v1H4v2h1v13c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V6h1V4H15zM17,19H7V6h10V19z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9,8h2v9h-2z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M13,8h2v9h-2z"/>
 </vector>
diff --git a/res/drawable/ic_folder_vd_theme_24.xml b/res/drawable/ic_folder_vd_theme_24.xml
index 0d27773..34e301f 100644
--- a/res/drawable/ic_folder_vd_theme_24.xml
+++ b/res/drawable/ic_folder_vd_theme_24.xml
@@ -21,5 +21,5 @@
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
-</vector>
\ No newline at end of file
+        android:pathData="M20,6h-8l-2,-2H4C2.9,4 2.01,4.9 2.01,6L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8C22,6.9 21.1,6 20,6zM20,18H4V8h16V18z"/>
+</vector>
diff --git a/res/drawable/ic_headset_24dp.xml b/res/drawable/ic_headset_24dp.xml
index d29eca0..23210d0 100644
--- a/res/drawable/ic_headset_24dp.xml
+++ b/res/drawable/ic_headset_24dp.xml
@@ -21,5 +21,5 @@
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M11.4,1.02C6.62,1.33 3,5.52 3,10.31v5.89C3,18.66 4.34,20 6,20h2c0.55,0 1,-0.45 1,-1v-6c0,-0.55 -0.45,-1 -1,-1H5v-1.71C5,6.45 7.96,3.11 11.79,3 15.76,2.89 19,6.06 19,10v2h-3c-0.55,0 -1,0.45 -1,1v6c0,0.55 0.45,1 1,1h2c1.66,0 3,-1.34 3,-3v-7c0,-5.17 -4.36,-9.32 -9.6,-8.98z"/>
+        android:pathData="M19,15v3c0,0.55 -0.45,1 -1,1h-1v-4H19M7,15v4H6c-0.55,0 -1,-0.45 -1,-1v-3H7M12,2c-4.97,0 -9,4.03 -9,9v7c0,1.66 1.34,3 3,3h3v-8H5v-2c0,-3.87 3.13,-7 7,-7s7,3.13 7,7v2h-4v8h3c1.66,0 3,-1.34 3,-3v-7C21,6.03 16.97,2 12,2L12,2z"/>
 </vector>
diff --git a/res/drawable/ic_help.xml b/res/drawable/ic_help.xml
index 841de58..f8bac71 100644
--- a/res/drawable/ic_help.xml
+++ b/res/drawable/ic_help.xml
@@ -19,11 +19,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 16.81c-.72
-0-1.3-.58-1.3-1.3s.58-1.3 1.3-1.3 1.3 .58 1.3 1.3-.58 1.3-1.3
-1.3zm1.07-4.62c-.09 .52 -.59 .87 -1.13 .79 -.57-.08-.94-.66-.83-1.23 .52 -2.61
-2.66-2.84 2.87-4.5 .12 -.96-.42-1.87-1.34-2.17-1.04-.33-2.21 .16 -2.55 1.37-.12
-.45 -.52 .74 -.97 .74 -.66 0-1.13-.63-.96-1.27 .63 -2.25 2.91-3.38 5.05-2.74
-1.71 .51 2.84 2.16 2.78 3.95-.07 2.44-2.49 2.61-2.92 5.06z"
-        android:fillColor="#FFFFFFFF"/>
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M11,18h2v-2h-2V18zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8s8,3.59 8,8S16.41,20 12,20zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5C16,7.79 14.21,6 12,6z"/>
 </vector>
diff --git a/res/drawable/ic_homepage_storage.xml b/res/drawable/ic_homepage_storage.xml
index 4922844..604cf51 100644
--- a/res/drawable/ic_homepage_storage.xml
+++ b/res/drawable/ic_homepage_storage.xml
@@ -32,5 +32,5 @@
         android:height="@dimen/dashboard_tile_foreground_image_size"
         android:start="@dimen/dashboard_tile_foreground_image_inset"
         android:top="@dimen/dashboard_tile_foreground_image_inset"
-        android:drawable="@drawable/ic_settings_storage_white" />
+        android:drawable="@drawable/ic_storage_white" />
 </layer-list>
diff --git a/res/drawable/ic_info_outline_24dp.xml b/res/drawable/ic_info_outline_24dp.xml
index d1f27ab..3d8b89f 100644
--- a/res/drawable/ic_info_outline_24dp.xml
+++ b/res/drawable/ic_info_outline_24dp.xml
@@ -22,11 +22,11 @@
         android:tint="?android:attr/textColorSecondary">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M12,17L12,17c0.55,0 1,-0.45 1,-1v-4c0,-0.55 -0.45,-1 -1,-1l0,0c-0.55,0 -1,0.45 -1,1v4C11,16.55 11.45,17 12,17z"/>
+        android:pathData="M11,7h2v2h-2z"/>
     <path
         android:fillColor="#FF000000"
-        android:pathData="M12,2c-5.52,0 -10,4.48 -10,10s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8s8,3.59 8,8S16.41,20 12,20z"/>
+        android:pathData="M11,11h2v6h-2z"/>
     <path
         android:fillColor="#FF000000"
-        android:pathData="M12,9.1L12,9.1c0.61,0 1.1,-0.49 1.1,-1.1l0,0c0,-0.61 -0.49,-1.1 -1.1,-1.1l0,0c-0.61,0 -1.1,0.49 -1.1,1.1l0,0C10.9,8.61 11.39,9.1 12,9.1z"/>
+        android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10s10,-4.48 10,-10C22,6.48 17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8c0,-4.41 3.59,-8 8,-8s8,3.59 8,8C20,16.41 16.41,20 12,20z"/>
 </vector>
diff --git a/res/drawable/ic_local_movies.xml b/res/drawable/ic_local_movies.xml
index 9997723..be9d122 100644
--- a/res/drawable/ic_local_movies.xml
+++ b/res/drawable/ic_local_movies.xml
@@ -21,5 +21,5 @@
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M18,3v2h-2V3H8v2H6V3H5C4.45,3 4,3.45 4,4v16c0,0.55 0.45,1 1,1h1v-2h2v2h8v-2h2v2h1c0.55,0 1,-0.45 1,-1V4c0,-0.55 -0.45,-1 -1,-1H18zM8,17H6v-2h2V17zM8,13H6v-2h2V13zM8,9H6V7h2V9zM18,17h-2v-2h2V17zM18,13h-2v-2h2V13zM18,9h-2V7h2V9z"/>
+        android:pathData="M20,4h-3l2,4h-3l-2,-4h-2l2,4h-3L9,4H7l2,4H6L4,4C2.9,4 2.01,4.9 2.01,6L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V6C22,4.9 21.1,4 20,4zM20,18L4,18v-8h16V18z"/>
 </vector>
diff --git a/res/drawable/ic_media_stream.xml b/res/drawable/ic_media_stream.xml
index 4eb78bc..122e9c5 100644
--- a/res/drawable/ic_media_stream.xml
+++ b/res/drawable/ic_media_stream.xml
@@ -21,5 +21,5 @@
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M18,3h-5c-0.55,0 -1,0.45 -1,1v8.3a3.88,3.88 0,0 0,-2.9 -0.04c-1.79,0.67 -3.11,2.35 -3.1,4.26A4.483,4.483 0,0 0,10.5 21c2.5,0 4.5,-2.3 4.5,-4.5V6h3c0.55,0 1,-0.45 1,-1V4c0,-0.55 -0.45,-1 -1,-1z"/>
+        android:pathData="M12,3l0.01,10.55c-0.59,-0.34 -1.27,-0.55 -2,-0.55C7.79,13 6,14.79 6,17c0,2.21 1.79,4 4.01,4S14,19.21 14,17V7h4V3H12zM10.01,19c-1.1,0 -2,-0.9 -2,-2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2C12.01,18.1 11.11,19 10.01,19z"/>
 </vector>
diff --git a/res/drawable/ic_media_stream_off.xml b/res/drawable/ic_media_stream_off.xml
new file mode 100644
index 0000000..c8d5978
--- /dev/null
+++ b/res/drawable/ic_media_stream_off.xml
@@ -0,0 +1,28 @@
+<!--
+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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M21.19,21.19L14,14l-2,-2l-9.2,-9.2L1.39,4.22l8.79,8.79c-0.06,0 -0.12,-0.01 -0.18,-0.01C7.79,13 6,14.79 6,17c0,2.21 1.79,4 4.01,4S14,19.21 14,17v-0.17l5.78,5.78L21.19,21.19zM10.01,19c-1.1,0 -2,-0.9 -2,-2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2C12.01,18.1 11.11,19 10.01,19z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M14,11.17l0,-4.17l4,0l0,-4l-6,0l0,6.17z"/>
+</vector>
diff --git a/res/drawable/ic_menu_delete.xml b/res/drawable/ic_menu_delete.xml
deleted file mode 100644
index f1ff04a..0000000
--- a/res/drawable/ic_menu_delete.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-    Copyright (C) 2015 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="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="48.0"
-        android:viewportHeight="48.0"
-        android:tint="?android:attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12.0,38.0c0.0,2.21 1.79,4.0 4.0,4.0l16.0,0.0c2.21,0.0 4.0,-1.79 4.0,-4.0L36.0,14.0L12.0,14.0l0.0,24.0zM38.0,8.0l-7.0,0.0l-2.0,-2.0L19.0,6.0l-2.0,2.0l-7.0,0.0l0.0,4.0l28.0,0.0L38.0,8.0z"/>
-</vector>
diff --git a/res/drawable/ic_notifications.xml b/res/drawable/ic_notifications.xml
index ec2422d..20e9e5d 100644
--- a/res/drawable/ic_notifications.xml
+++ b/res/drawable/ic_notifications.xml
@@ -20,6 +20,9 @@
         android:viewportHeight="24.0"
         android:tint="?android:attr/colorControlNormal">
     <path
-        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"
-        android:fillColor="#FFFFFFFF"/>
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M18,17v-6c0,-3.07 -1.63,-5.64 -4.5,-6.32V4c0,-0.83 -0.67,-1.5 -1.5,-1.5S10.5,3.17 10.5,4v0.68C7.64,5.36 6,7.92 6,11v6H4v2h10h0.38H20v-2H18zM16,17H8v-6c0,-2.48 1.51,-4.5 4,-4.5s4,2.02 4,4.5V17z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4C10,21.1 10.9,22 12,22z"/>
 </vector>
diff --git a/res/drawable/ic_perm_device_information_green_24dp.xml b/res/drawable/ic_perm_device_information_green_24dp.xml
index a2b9354..e309b40 100644
--- a/res/drawable/ic_perm_device_information_green_24dp.xml
+++ b/res/drawable/ic_perm_device_information_green_24dp.xml
@@ -21,6 +21,11 @@
         android:viewportHeight="24.0">
     <path
         android:fillColor="#0F9D58"
-        android:pathData="M13,7h-2v2h2L13,7zM13,11h-2v6h2v-6zM17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,
-        1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19L7,19L7,5h10v14z"/>
+        android:pathData="M11,7h2v2h-2z"/>
+    <path
+        android:fillColor="#0F9D58"
+        android:pathData="M11,11h2v6h-2z"/>
+    <path
+        android:fillColor="#0F9D58"
+        android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7z"/>
 </vector>
diff --git a/res/drawable/ic_perm_device_information_red_24dp.xml b/res/drawable/ic_perm_device_information_red_24dp.xml
index 135e212..d375c0b 100644
--- a/res/drawable/ic_perm_device_information_red_24dp.xml
+++ b/res/drawable/ic_perm_device_information_red_24dp.xml
@@ -22,6 +22,11 @@
         android:tint="?android:attr/colorError">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M13,7h-2v2h2L13,7zM13,11h-2v6h2v-6zM17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,
-        1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19L7,19L7,5h10v14z"/>
+        android:pathData="M11,7h2v2h-2z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11,11h2v6h-2z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7z"/>
 </vector>
diff --git a/res/drawable/ic_photo_library.xml b/res/drawable/ic_photo_library.xml
index 732a348..a1a58c2 100644
--- a/res/drawable/ic_photo_library.xml
+++ b/res/drawable/ic_photo_library.xml
@@ -21,5 +21,5 @@
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M22,16V4c0,-1.11 -0.9,-2 -2,-2H8C6.89,2 6,2.89 6,4v12c0,1.1 0.89,2 2,2h12C21.1,18 22,17.1 22,16zM11,12l2.03,2.71L16,11l4,5H8L11,12zM2,7v13c0,1.1 0.9,2 2,2h13c0.55,0 1,-0.45 1,-1v0c0,-0.55 -0.45,-1 -1,-1H4.5C4.22,20 4,19.78 4,19.5V7c0,-0.55 -0.45,-1 -1,-1h0C2.45,6 2,6.45 2,7z"/>
+        android:pathData="M20,4v12H8V4H20M20,2H8C6.9,2 6,2.9 6,4v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C22,2.9 21.1,2 20,2L20,2zM2,6v14c0,1.1 0.9,2 2,2h14v-2H4V6H2zM15.67,11l-2.5,2.98L11.5,11.8L9,15h10L15.67,11z"/>
 </vector>
diff --git a/res/drawable/ic_radio_button_checked_black_24dp.xml b/res/drawable/ic_radio_button_checked_black_24dp.xml
new file mode 100644
index 0000000..3be6f99
--- /dev/null
+++ b/res/drawable/ic_radio_button_checked_black_24dp.xml
@@ -0,0 +1,24 @@
+<!--
+  ~ Copyright 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.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5 5,-2.24 5,-5 -2.24,-5 -5,-5zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
+</vector>
diff --git a/res/drawable/ic_radio_button_unchecked_black_24dp.xml b/res/drawable/ic_radio_button_unchecked_black_24dp.xml
new file mode 100644
index 0000000..a864f7b
--- /dev/null
+++ b/res/drawable/ic_radio_button_unchecked_black_24dp.xml
@@ -0,0 +1,24 @@
+<!--
+  ~ Copyright 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.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
+</vector>
diff --git a/res/drawable/ic_settings_24dp.xml b/res/drawable/ic_settings_24dp.xml
index da34345..ac4c43b 100644
--- a/res/drawable/ic_settings_24dp.xml
+++ b/res/drawable/ic_settings_24dp.xml
@@ -21,6 +21,9 @@
         android:viewportHeight="24.0"
         android:tint="?android:attr/colorControlNormal">
     <path
-        android:pathData="M19.4,13.0c0.0,-0.3 0.1,-0.6 0.1,-1.0s0.0,-0.7 -0.1,-1.0l2.1,-1.7c0.2,-0.2 0.2,-0.4 0.1,-0.6l-2.0,-3.5C19.5,5.1 19.3,5.0 19.0,5.1l-2.5,1.0c-0.5,-0.4 -1.1,-0.7 -1.7,-1.0l-0.4,-2.6C14.5,2.2 14.2,2.0 14.0,2.0l-4.0,0.0C9.8,2.0 9.5,2.2 9.5,2.4L9.1,5.1C8.5,5.3 8.0,5.7 7.4,6.1L5.0,5.1C4.7,5.0 4.5,5.1 4.3,5.3l-2.0,3.5C2.2,8.9 2.3,9.2 2.5,9.4L4.6,11.0c0.0,0.3 -0.1,0.6 -0.1,1.0s0.0,0.7 0.1,1.0l-2.1,1.7c-0.2,0.2 -0.2,0.4 -0.1,0.6l2.0,3.5C4.5,18.9 4.7,19.0 5.0,18.9l2.5,-1.0c0.5,0.4 1.1,0.7 1.7,1.0l0.4,2.6c0.0,0.2 0.2,0.4 0.5,0.4l4.0,0.0c0.2,0.0 0.5,-0.2 0.5,-0.4l0.4,-2.6c0.6,-0.3 1.2,-0.6 1.7,-1.0l2.5,1.0c0.2,0.1 0.5,0.0 0.6,-0.2l2.0,-3.5c0.1,-0.2 0.1,-0.5 -0.1,-0.6L19.4,13.0zM12.0,15.5c-1.9,0.0 -3.5,-1.6 -3.5,-3.5s1.6,-3.5 3.5,-3.5s3.5,1.6 3.5,3.5S13.9,15.5 12.0,15.5z"
-        android:fillColor="#ffffffff" />
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M13.85,22.25h-3.7c-0.74,0 -1.36,-0.54 -1.45,-1.27l-0.27,-1.89c-0.27,-0.14 -0.53,-0.29 -0.79,-0.46l-1.8,0.72c-0.7,0.26 -1.47,-0.03 -1.81,-0.65L2.2,15.53c-0.35,-0.66 -0.2,-1.44 0.36,-1.88l1.53,-1.19c-0.01,-0.15 -0.02,-0.3 -0.02,-0.46c0,-0.15 0.01,-0.31 0.02,-0.46l-1.52,-1.19C1.98,9.9 1.83,9.09 2.2,8.47l1.85,-3.19c0.34,-0.62 1.11,-0.9 1.79,-0.63l1.81,0.73c0.26,-0.17 0.52,-0.32 0.78,-0.46l0.27,-1.91c0.09,-0.7 0.71,-1.25 1.44,-1.25h3.7c0.74,0 1.36,0.54 1.45,1.27l0.27,1.89c0.27,0.14 0.53,0.29 0.79,0.46l1.8,-0.72c0.71,-0.26 1.48,0.03 1.82,0.65l1.84,3.18c0.36,0.66 0.2,1.44 -0.36,1.88l-1.52,1.19c0.01,0.15 0.02,0.3 0.02,0.46s-0.01,0.31 -0.02,0.46l1.52,1.19c0.56,0.45 0.72,1.23 0.37,1.86l-1.86,3.22c-0.34,0.62 -1.11,0.9 -1.8,0.63l-1.8,-0.72c-0.26,0.17 -0.52,0.32 -0.78,0.46l-0.27,1.91C15.21,21.71 14.59,22.25 13.85,22.25zM13.32,20.72c0,0.01 0,0.01 0,0.02L13.32,20.72zM10.68,20.7l0,0.02C10.69,20.72 10.69,20.71 10.68,20.7zM10.62,20.25h2.76l0.37,-2.55l0.53,-0.22c0.44,-0.18 0.88,-0.44 1.34,-0.78l0.45,-0.34l2.38,0.96l1.38,-2.4l-2.03,-1.58l0.07,-0.56c0.03,-0.26 0.06,-0.51 0.06,-0.78c0,-0.27 -0.03,-0.53 -0.06,-0.78l-0.07,-0.56l2.03,-1.58l-1.39,-2.4l-2.39,0.96l-0.45,-0.35c-0.42,-0.32 -0.87,-0.58 -1.33,-0.77L13.75,6.3l-0.37,-2.55h-2.76L10.25,6.3L9.72,6.51C9.28,6.7 8.84,6.95 8.38,7.3L7.93,7.63L5.55,6.68L4.16,9.07l2.03,1.58l-0.07,0.56C6.09,11.47 6.06,11.74 6.06,12c0,0.26 0.02,0.53 0.06,0.78l0.07,0.56l-2.03,1.58l1.38,2.4l2.39,-0.96l0.45,0.35c0.43,0.33 0.86,0.58 1.33,0.77l0.53,0.22L10.62,20.25zM18.22,17.72c0,0.01 -0.01,0.02 -0.01,0.03L18.22,17.72zM5.77,17.71l0.01,0.02C5.78,17.72 5.77,17.71 5.77,17.71zM3.93,9.47L3.93,9.47C3.93,9.47 3.93,9.47 3.93,9.47zM18.22,6.27c0,0.01 0.01,0.02 0.01,0.02L18.22,6.27zM5.79,6.25L5.78,6.27C5.78,6.27 5.79,6.26 5.79,6.25zM13.31,3.28c0,0.01 0,0.01 0,0.02L13.31,3.28zM10.69,3.26l0,0.02C10.69,3.27 10.69,3.27 10.69,3.26z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,12m-3.5,0a3.5,3.5 0,1 1,7 0a3.5,3.5 0,1 1,-7 0"/>
 </vector>
diff --git a/res/drawable/ic_settings_24dp_inverse.xml b/res/drawable/ic_settings_24dp_inverse.xml
deleted file mode 100644
index 6f70d21..0000000
--- a/res/drawable/ic_settings_24dp_inverse.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  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.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorForegroundInverse">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66
-            -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3
-            -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2
-            14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59
-            -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49
-            0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66
-            0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3
-            0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42
-            0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25
-            1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49
-            -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57
-            -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
-</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_about.xml b/res/drawable/ic_settings_about.xml
index 887fca6..4f13530 100644
--- a/res/drawable/ic_settings_about.xml
+++ b/res/drawable/ic_settings_about.xml
@@ -21,11 +21,11 @@
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M12,17L12,17c0.55,0 1,-0.45 1,-1v-4c0,-0.55 -0.45,-1 -1,-1l0,0c-0.55,0 -1,0.45 -1,1v4C11,16.55 11.45,17 12,17z"/>
+        android:pathData="M11,7h2v2h-2z"/>
     <path
         android:fillColor="#FF000000"
-        android:pathData="M12,2c-5.52,0 -10,4.48 -10,10s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8s8,3.59 8,8S16.41,20 12,20z"/>
+        android:pathData="M11,11h2v6h-2z"/>
     <path
         android:fillColor="#FF000000"
-        android:pathData="M12,9.1L12,9.1c0.61,0 1.1,-0.49 1.1,-1.1l0,0c0,-0.61 -0.49,-1.1 -1.1,-1.1l0,0c-0.61,0 -1.1,0.49 -1.1,1.1l0,0C10.9,8.61 11.39,9.1 12,9.1z"/>
+        android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10s10,-4.48 10,-10C22,6.48 17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8c0,-4.41 3.59,-8 8,-8s8,3.59 8,8C20,16.41 16.41,20 12,20z"/>
 </vector>
diff --git a/res/drawable/ic_settings_accessibility.xml b/res/drawable/ic_settings_accessibility.xml
index 67b6c9a..d5c89b9 100644
--- a/res/drawable/ic_settings_accessibility.xml
+++ b/res/drawable/ic_settings_accessibility.xml
@@ -20,5 +20,8 @@
         android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M20.75,6.99c-0.14,-0.55 -0.69,-0.87 -1.24,-0.75C17.13,6.77 14.48,7 12,7S6.87,6.77 4.49,6.24c-0.55,-0.12 -1.1,0.2 -1.24,0.75l0,0C3.11,7.55 3.45,8.12 4,8.25C5.61,8.61 7.35,8.86 9,9v12c0,0.55 0.45,1 1,1h0c0.55,0 1,-0.45 1,-1v-5h2v5c0,0.55 0.45,1 1,1h0c0.55,0 1,-0.45 1,-1V9c1.65,-0.14 3.39,-0.39 5,-0.75C20.55,8.12 20.89,7.55 20.75,6.99L20.75,6.99zM12,6c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2s-2,0.9 -2,2S10.9,6 12,6z"/>
+        android:pathData="M20.5,4c-2.61,0.7 -5.67,1 -8.5,1S6.11,4.7 3.5,4L3,6c1.86,0.5 4,0.83 6,1v13h2v-6h2v6h2V7c2,-0.17 4.14,-0.5 6,-1L20.5,4zM12,4c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2s-2,0.9 -2,2S10.9,4 12,4z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M7,24h2v-2H7V24zM11,24h2v-2h-2V24zM15,24h2v-2h-2V24z"/>
 </vector>
diff --git a/res/drawable/ic_settings_accounts.xml b/res/drawable/ic_settings_accounts.xml
index d152b14..7f18286 100644
--- a/res/drawable/ic_settings_accounts.xml
+++ b/res/drawable/ic_settings_accounts.xml
@@ -14,15 +14,14 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
+        android:width="24dp"
+        android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M3.0,5.0
-        l0.0,14.0c0.0,1.0 0.89,2.0 2.0,2.0l14.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0
-        L21.0,5.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0
-        L5.0,3.0c-1.11,0.0 -2.0,0.9 -2.0,2.0zm12.0,4.0c0.0,1.66 -1.34,3.0 -3.0,3.0s-3.0,-1.34 -3.0,-3.0 1.34,-3.0 3.0,-3.0 3.0,1.34 3.0,3.0zm-9.0,8.0c0.0,-2.0 4.0,-3.1 6.0,-3.1s6.0,1.1 6.0,3.1l0.0,1.0
-        l-12.0,0l0.0,-1.0z"/>
+        android:pathData="M19,3H5C3.89,3 3,3.9 3,5v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM19,5v10.79C16.52,14.37 13.23,14 12,14s-4.52,0.37 -7,1.79V5H19zM5,19v-0.77C6.74,16.66 10.32,16 12,16s5.26,0.66 7,2.23V19H5z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,13c1.94,0 3.5,-1.56 3.5,-3.5C15.5,7.56 13.94,6 12,6c-1.94,0 -3.5,1.56 -3.5,3.5C8.5,11.44 10.06,13 12,13zM12,8c0.83,0 1.5,0.67 1.5,1.5c0,0.83 -0.67,1.5 -1.5,1.5c-0.83,0 -1.5,-0.67 -1.5,-1.5C10.5,8.67 11.17,8 12,8z"/>
 </vector>
diff --git a/res/drawable/ic_settings_backup.xml b/res/drawable/ic_settings_backup.xml
index 8a9997a..231eadd 100644
--- a/res/drawable/ic_settings_backup.xml
+++ b/res/drawable/ic_settings_backup.xml
@@ -14,12 +14,12 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
+        android:width="24dp"
+        android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M19.35,10.04C18.67,6.59 15.64,4.0 12.0,4.0 9.11,4.0 6.6,5.64 5.35,8.04 2.34,8.36 0.0,10.91 0.0,14.0c0.0,3.31 2.69,6.0 6.0,6.0l13.0,0.0c2.76,0.0 5.0,-2.24 5.0,-5.0 0.0,-2.64 -2.05,-4.78 -4.65,-4.96zM14.0,13.0l0.0,4.0l-4.0,0.0l0.0,-4.0L7.0,13.0l5.0,-5.0 5.0,5.0l-3.0,0.0z"/>
+        android:pathData="M17.92,10.02C17.45,7.18 14.97,5 12,5C9.82,5 7.83,6.18 6.78,8.06C4.09,8.41 2,10.74 2,13.5C2,16.53 4.47,19 7.5,19h10c2.48,0 4.5,-2.02 4.5,-4.5C22,12.16 20.21,10.23 17.92,10.02zM17.5,17h-10C5.57,17 4,15.43 4,13.5c0,-1.89 1.54,-3.46 3.44,-3.49L8.08,10l0.26,-0.59C8.97,7.94 10.41,7 12,7c2.21,0 4,1.79 4,4v1h1.5c1.38,0 2.5,1.12 2.5,2.5S18.88,17 17.5,17zM14.09,11.09l1.41,1.41l-2.79,2.79L12,16l-0.71,-0.71L8.5,12.5l1.41,-1.41L11,12.17V9.5h2v2.67L14.09,11.09z"/>
 </vector>
diff --git a/res/drawable/ic_settings_display.xml b/res/drawable/ic_settings_display.xml
index de71508..7f0aacd 100644
--- a/res/drawable/ic_settings_display.xml
+++ b/res/drawable/ic_settings_display.xml
@@ -21,8 +21,5 @@
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M20,15.31l2.6-2.6c0.39-0.39,0.39-1.02,0-1.41L20,8.69V5c0-0.55-0.45-1-1-1h-3.69l-2.6-2.6c-0.39-0.39-1.02-0.39-1.41,0
-L8.69,4H5C4.45,4,4,4.45,4,5v3.69l-2.6,2.6c-0.39,0.39-0.39,1.02,0,1.41l2.6,2.6V19c0,0.55,0.45,1,1,1h3.69l2.6,2.6
-c0.39,0.39,1.02,0.39,1.41,0l2.6-2.6H19c0.55,0,1-0.45,1-1V15.31z
-M12,18V6c3.31,0,6,2.69,6,6S15.31,18,12,18z"/>
+        android:pathData="M20,8.69V4h-4.69L12,0.69L8.69,4H4v4.69L0.69,12L4,15.31V20h4.69L12,23.31L15.31,20H20v-4.69L23.31,12L20,8.69zM18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48zM12,17c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5V17z"/>
 </vector>
diff --git a/res/drawable/ic_settings_display_white.xml b/res/drawable/ic_settings_display_white.xml
index 4a41691..62dc21f 100644
--- a/res/drawable/ic_settings_display_white.xml
+++ b/res/drawable/ic_settings_display_white.xml
@@ -20,8 +20,5 @@
         android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M20,15.31l2.6-2.6c0.39-0.39,0.39-1.02,0-1.41L20,8.69V5c0-0.55-0.45-1-1-1h-3.69l-2.6-2.6c-0.39-0.39-1.02-0.39-1.41,0
-L8.69,4H5C4.45,4,4,4.45,4,5v3.69l-2.6,2.6c-0.39,0.39-0.39,1.02,0,1.41l2.6,2.6V19c0,0.55,0.45,1,1,1h3.69l2.6,2.6
-c0.39,0.39,1.02,0.39,1.41,0l2.6-2.6H19c0.55,0,1-0.45,1-1V15.31z
-M12,18V6c3.31,0,6,2.69,6,6S15.31,18,12,18z"/>
+        android:pathData="M20,8.69V4h-4.69L12,0.69L8.69,4H4v4.69L0.69,12L4,15.31V20h4.69L12,23.31L15.31,20H20v-4.69L23.31,12L20,8.69zM18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48zM12,17c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5V17z"/>
 </vector>
diff --git a/res/drawable/ic_settings_location.xml b/res/drawable/ic_settings_location.xml
index c774b2e..34bd4f0 100644
--- a/res/drawable/ic_settings_location.xml
+++ b/res/drawable/ic_settings_location.xml
@@ -21,5 +21,8 @@
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M12.0,2.0C8.13,2.0 5.0,5.13 5.0,9.0c0.0,5.25 7.0,13.0 7.0,13.0s7.0,-7.75 7.0,-13.0c0.0,-3.87 -3.13,-7.0 -7.0,-7.0zm0.0,9.5c-1.38,0.0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
+        android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13C19,5.13 15.87,2 12,2zM7,9c0,-2.76 2.24,-5 5,-5s5,2.24 5,5c0,2.88 -2.88,7.19 -5,9.88C9.92,16.21 7,11.85 7,9z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,9m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0"/>
 </vector>
diff --git a/res/drawable/ic_settings_memory.xml b/res/drawable/ic_settings_memory.xml
index 830dfc9..78a6b8d 100644
--- a/res/drawable/ic_settings_memory.xml
+++ b/res/drawable/ic_settings_memory.xml
@@ -20,19 +20,6 @@
         android:viewportHeight="24.0"
         android:tint="?android:attr/colorControlNormal">
     <path
-        android:pathData="M6.0,4.0l0.0,16.0 12.0,0.0 0.0,-16.0 -12.0,0.0z
-        M6.0,5.25l0,1.5 -3,0 0,-1.5 3,0z
-        M6.0,9.25l0,1.5 -3,0 0,-1.5 3,0z
-        M6.0,13.25l0,1.5 -3,0 0,-1.5 3,0z
-        M6.0,17.25l0,1.5 -3,0 0,-1.5 3,0z
-        M21.0,5.25l0,1.5 -3,0 0,-1.5 3,0z
-        M21.0,9.25l0,1.5 -3,0 0,-1.5 3,0z
-        M21.0,13.25l0,1.5 -3,0 0,-1.5 3,0z
-        M21.0,17.25l0,1.5 -3,0 0,-1.5 3,0z
-
-        M11.5,14.5l1,0 0,3 -1,0 0,-3z
-        M13.25,14.5l1,0 0,3 -1,0 0,-3z
-        M15.0,14.5l1,0 0,3 -1,0 0,-3z
-        "
-        android:fillColor="@android:color/black" />
+        android:fillColor="@android:color/black"
+        android:pathData="M15,9H9v6h6V9zM21,11V9h-2V7c0,-1.1 -0.9,-2 -2,-2h-2V3h-2v2h-2V3H9v2H7C5.9,5 5,5.9 5,7v2H3v2h2v2H3v2h2v2c0,1.1 0.9,2 2,2h2v2h2v-2h2v2h2v-2h2c1.1,0 2,-0.9 2,-2v-2h2v-2h-2v-2H21zM17,17H7V7h10V17z"/>
 </vector>
diff --git a/res/drawable/ic_settings_multiuser.xml b/res/drawable/ic_settings_multiuser.xml
index 4dd83a5..2d857c5 100644
--- a/res/drawable/ic_settings_multiuser.xml
+++ b/res/drawable/ic_settings_multiuser.xml
@@ -21,5 +21,5 @@
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M12.0,12.0c2.21,0.0 4.0,-1.79 4.0,-4.0s-1.79,-4.0 -4.0,-4.0 -4.0,1.79 -4.0,4.0 1.79,4.0 4.0,4.0zm0.0,2.0c-2.67,0.0 -8.0,1.34 -8.0,4.0l0.0,2.0l16.0,0.0l0.0,-2.0c0.0,-2.66 -5.33,-4.0 -8.0,-4.0z"/>
+        android:pathData="M12,6c1.1,0 2,0.9 2,2s-0.9,2 -2,2s-2,-0.9 -2,-2S10.9,6 12,6M12,15c2.7,0 5.8,1.29 6,2v1H6l0,-0.99C6.2,16.29 9.3,15 12,15M12,4C9.79,4 8,5.79 8,8s1.79,4 4,4s4,-1.79 4,-4S14.21,4 12,4L12,4zM12,13c-2.67,0 -8,1.34 -8,4v3h16v-3C20,14.34 14.67,13 12,13L12,13z"/>
 </vector>
diff --git a/res/drawable/ic_settings_notifications.xml b/res/drawable/ic_settings_notifications.xml
deleted file mode 100644
index 2b49afe..0000000
--- a/res/drawable/ic_settings_notifications.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-    Copyright (C) 2016 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="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M12.0,22.0c1.1,0.0 2.0,-0.9 2.0,-2.0l-4.0,0.0c0.0,1.0 0.89,2.0 2.0,2.0zm6.0,-6.0l0.0,-5.0c0.0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4.0c0.0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.0,0.67 -1.5,1.5l0.0,0.68C7.63,5.36 6.0,7.92 6.0,11.0l0.0,5.0l-2.0,2.0l0.0,1.0l16.0,0.0l0.0,-1.0l-2.0,-2.0z"/>
-</vector>
diff --git a/res/drawable/ic_settings_security.xml b/res/drawable/ic_settings_security.xml
index 34accd0..055babc 100644
--- a/res/drawable/ic_settings_security.xml
+++ b/res/drawable/ic_settings_security.xml
@@ -21,5 +21,5 @@
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M18.0,8.0l-1.0,0.0L17.0,6.0c0.0,-2.76 -2.24,-5.0 -5.0,-5.0S7.0,3.24 7.0,6.0l0.0,2.0L6.0,8.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,10.0c0.0,1.0 0.9,2.0 2.0,2.0l12.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L20.0,10.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0zm-6.0,9.0c-1.1,0.0 -2.0,-0.9 -2.0,-2.0s0.9,-2.0 2.0,-2.0 2.0,0.9 2.0,2.0 -0.9,2.0 -2.0,2.0zm3.1,-9.0L8.9,8.0L8.9,6.0c0.0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0.0 3.1,1.39 3.1,3.1l0.0,2.0z"/>
+        android:pathData="M18,8h-1V6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10C20,8.9 19.1,8 18,8zM9,6c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2H9V6zM18,20H6V10h12V20zM12,17c1.1,0 2,-0.9 2,-2c0,-1.1 -0.9,-2 -2,-2c-1.1,0 -2,0.9 -2,2C10,16.1 10.9,17 12,17z"/>
 </vector>
diff --git a/res/drawable/ic_settings_security_white.xml b/res/drawable/ic_settings_security_white.xml
index d6c5b64..544ebef 100644
--- a/res/drawable/ic_settings_security_white.xml
+++ b/res/drawable/ic_settings_security_white.xml
@@ -20,5 +20,5 @@
         android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M18.0,8.0l-1.0,0.0L17.0,6.0c0.0,-2.76 -2.24,-5.0 -5.0,-5.0S7.0,3.24 7.0,6.0l0.0,2.0L6.0,8.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,10.0c0.0,1.0 0.9,2.0 2.0,2.0l12.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L20.0,10.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0zm-6.0,9.0c-1.1,0.0 -2.0,-0.9 -2.0,-2.0s0.9,-2.0 2.0,-2.0 2.0,0.9 2.0,2.0 -0.9,2.0 -2.0,2.0zm3.1,-9.0L8.9,8.0L8.9,6.0c0.0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0.0 3.1,1.39 3.1,3.1l0.0,2.0z"/>
+        android:pathData="M18,8h-1V6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10C20,8.9 19.1,8 18,8zM9,6c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2H9V6zM18,20H6V10h12V20zM12,17c1.1,0 2,-0.9 2,-2c0,-1.1 -0.9,-2 -2,-2c-1.1,0 -2,0.9 -2,2C10,16.1 10.9,17 12,17z"/>
 </vector>
diff --git a/res/drawable/ic_settings_sim.xml b/res/drawable/ic_settings_sim.xml
index d083c9d..3edda49 100644
--- a/res/drawable/ic_settings_sim.xml
+++ b/res/drawable/ic_settings_sim.xml
@@ -16,13 +16,30 @@
 -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
+        android:width="24dp"
+        android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M19.99 4c0-1.1-.89-2-1.99-2h-8L4 8v12c0 1.1.9 2 2 2h12.01c1.1 0 1.99-.9 1.99-2l-.01-16zM9 19H7v-2h2v2zm8 0h-2v-2h2v2zm-8-4H7v-4h2v4zm4 4h-2v-4h2v4zm0-6h-2v-2h2v2zm4 2h-2v-4h2v4z"/>
-      <path android:pathData="M0 0h24v24H0z"/>
+        android:pathData="M18,2h-8L4,8v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C20,2.9 19.1,2 18,2zM18,4v16H6V8.83L10.83,4L18,4L18,4z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M7,17h2v2h-2z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M15,17h2v2h-2z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M7,11h2v4h-2z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M11,15h2v4h-2z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M11,11h2v2h-2z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M15,11h2v4h-2z"/>
 </vector>
diff --git a/res/drawable/ic_settings_storage.xml b/res/drawable/ic_settings_storage.xml
deleted file mode 100644
index 36dcc38..0000000
--- a/res/drawable/ic_settings_storage.xml
+++ /dev/null
@@ -1,25 +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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M20,16L4,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2h16c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2zM5,19.1c-0.61,0 -1.1,-0.49 -1.1,-1.1 0,-0.61 0.49,-1.1 1.1,-1.1s1.1,0.49 1.1,1.1c0,0.61 -0.49,1.1 -1.1,1.1zM4,8h16c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2L4,4c-1.1,0 -2,0.9 -2,2s0.9,2 2,2zM5,4.9c0.61,0 1.1,0.49 1.1,1.1 0,0.61 -0.49,1.1 -1.1,1.1S3.9,6.61 3.9,6c0,-0.61 0.49,-1.1 1.1,-1.1zM20,10L4,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2h16c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2zM5,13.1c-0.61,0 -1.1,-0.49 -1.1,-1.1 0,-0.61 0.49,-1.1 1.1,-1.1s1.1,0.49 1.1,1.1c0,0.61 -0.49,1.1 -1.1,1.1z"/>
-</vector>
diff --git a/res/drawable/ic_settings_system_dashboard_white.xml b/res/drawable/ic_settings_system_dashboard_white.xml
index 5308cb0..5a697d4 100644
--- a/res/drawable/ic_settings_system_dashboard_white.xml
+++ b/res/drawable/ic_settings_system_dashboard_white.xml
@@ -20,11 +20,11 @@
         android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFF"
-        android:pathData="M12,17L12,17c0.55,0 1,-0.45 1,-1v-4c0,-0.55 -0.45,-1 -1,-1l0,0c-0.55,0 -1,0.45 -1,1v4C11,16.55 11.45,17 12,17z"/>
+        android:pathData="M11,7h2v2h-2z"/>
     <path
         android:fillColor="#FFFFFF"
-        android:pathData="M12,2c-5.52,0 -10,4.48 -10,10s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8s8,3.59 8,8S16.41,20 12,20z"/>
+        android:pathData="M11,11h2v6h-2z"/>
     <path
         android:fillColor="#FFFFFF"
-        android:pathData="M12,9.1L12,9.1c0.61,0 1.1,-0.49 1.1,-1.1l0,0c0,-0.61 -0.49,-1.1 -1.1,-1.1l0,0c-0.61,0 -1.1,0.49 -1.1,1.1l0,0C10.9,8.61 11.39,9.1 12,9.1z"/>
+        android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10s10,-4.48 10,-10C22,6.48 17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8c0,-4.41 3.59,-8 8,-8s8,3.59 8,8C20,16.41 16.41,20 12,20z"/>
 </vector>
diff --git a/res/drawable/ic_storage.xml b/res/drawable/ic_storage.xml
index 36dcc38..55e66c3 100644
--- a/res/drawable/ic_storage.xml
+++ b/res/drawable/ic_storage.xml
@@ -21,5 +21,5 @@
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M20,16L4,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2h16c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2zM5,19.1c-0.61,0 -1.1,-0.49 -1.1,-1.1 0,-0.61 0.49,-1.1 1.1,-1.1s1.1,0.49 1.1,1.1c0,0.61 -0.49,1.1 -1.1,1.1zM4,8h16c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2L4,4c-1.1,0 -2,0.9 -2,2s0.9,2 2,2zM5,4.9c0.61,0 1.1,0.49 1.1,1.1 0,0.61 -0.49,1.1 -1.1,1.1S3.9,6.61 3.9,6c0,-0.61 0.49,-1.1 1.1,-1.1zM20,10L4,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2h16c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2zM5,13.1c-0.61,0 -1.1,-0.49 -1.1,-1.1 0,-0.61 0.49,-1.1 1.1,-1.1s1.1,0.49 1.1,1.1c0,0.61 -0.49,1.1 -1.1,1.1z"/>
+        android:pathData="M3,20h18v-4H3V20zM5,17h2v2H5V17zM3,4v4h18V4H3zM7,7H5V5h2V7zM3,14h18v-4H3V14zM5,11h2v2H5V11z"/>
 </vector>
diff --git a/res/drawable/ic_settings_storage_white.xml b/res/drawable/ic_storage_white.xml
similarity index 60%
rename from res/drawable/ic_settings_storage_white.xml
rename to res/drawable/ic_storage_white.xml
index 8f662f3..eed9140 100644
--- a/res/drawable/ic_settings_storage_white.xml
+++ b/res/drawable/ic_storage_white.xml
@@ -20,5 +20,5 @@
         android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFF"
-        android:pathData="M20,16L4,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2h16c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2zM5,19.1c-0.61,0 -1.1,-0.49 -1.1,-1.1 0,-0.61 0.49,-1.1 1.1,-1.1s1.1,0.49 1.1,1.1c0,0.61 -0.49,1.1 -1.1,1.1zM4,8h16c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2L4,4c-1.1,0 -2,0.9 -2,2s0.9,2 2,2zM5,4.9c0.61,0 1.1,0.49 1.1,1.1 0,0.61 -0.49,1.1 -1.1,1.1S3.9,6.61 3.9,6c0,-0.61 0.49,-1.1 1.1,-1.1zM20,10L4,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2h16c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2zM5,13.1c-0.61,0 -1.1,-0.49 -1.1,-1.1 0,-0.61 0.49,-1.1 1.1,-1.1s1.1,0.49 1.1,1.1c0,0.61 -0.49,1.1 -1.1,1.1z"/>
+        android:pathData="M3,20h18v-4H3V20zM5,17h2v2H5V17zM3,4v4h18V4H3zM7,7H5V5h2V7zM3,14h18v-4H3V14zM5,11h2v2H5V11z"/>
 </vector>
diff --git a/res/drawable/ic_suggested_notifications.xml b/res/drawable/ic_suggested_notifications.xml
index 5a8f0e9..d15d13a 100644
--- a/res/drawable/ic_suggested_notifications.xml
+++ b/res/drawable/ic_suggested_notifications.xml
@@ -14,11 +14,14 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.0dp"
-    android:height="24.0dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
     <path
         android:fillColor="@color/suw_color_accent_light"
-        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4a2,2 0,0 0,2 2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2.15,2.15a0.5,0.5 0,0 0,0.35 0.85h15.6c0.45,0 0.67,-0.54 0.35,-0.85L18,16z"/>
+        android:pathData="M18,17v-6c0,-3.07 -1.63,-5.64 -4.5,-6.32V4c0,-0.83 -0.67,-1.5 -1.5,-1.5S10.5,3.17 10.5,4v0.68C7.64,5.36 6,7.92 6,11v6H4v2h10h0.38H20v-2H18zM16,17H8v-6c0,-2.48 1.51,-4.5 4,-4.5s4,2.02 4,4.5V17z"/>
+    <path
+        android:fillColor="@color/suw_color_accent_light"
+        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4C10,21.1 10.9,22 12,22z"/>
 </vector>
diff --git a/res/drawable/ic_system_update.xml b/res/drawable/ic_system_update.xml
index ef8f991..3325fdd 100644
--- a/res/drawable/ic_system_update.xml
+++ b/res/drawable/ic_system_update.xml
@@ -20,6 +20,6 @@
         android:viewportHeight="24.0"
         android:tint="?android:attr/colorControlNormal">
     <path
-        android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19L7,19L7,5h10v14zM16,13h-3L13,8h-2v5L8,13l4,4 4,-4z"
-        android:fillColor="#FFFFFFFF"/>
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7zM16,12.5l-4,4l-4,-4l1.41,-1.41L11,12.67V8.5V8h2v0.5v4.17l1.59,-1.59L16,12.5z"/>
 </vector>
diff --git a/res/drawable/ic_system_update_vd_theme_24.xml b/res/drawable/ic_system_update_vd_theme_24.xml
index d68ea13..d1fc061 100644
--- a/res/drawable/ic_system_update_vd_theme_24.xml
+++ b/res/drawable/ic_system_update_vd_theme_24.xml
@@ -21,5 +21,5 @@
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19L7,19L7,5h10v14zM16,13h-3L13,8h-2v5L8,13l4,4 4,-4z"/>
-</vector>
\ No newline at end of file
+        android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7zM16,12.5l-4,4l-4,-4l1.41,-1.41L11,12.67V8.5V8h2v0.5v4.17l1.59,-1.59L16,12.5z"/>
+</vector>
diff --git a/res/drawable/ic_videogame_vd_theme_24.xml b/res/drawable/ic_videogame_vd_theme_24.xml
index 8cb9c1c..bd6f74b 100644
--- a/res/drawable/ic_videogame_vd_theme_24.xml
+++ b/res/drawable/ic_videogame_vd_theme_24.xml
@@ -21,5 +21,14 @@
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M21,6L3,6c-1.1,0 -2,0.9 -2,2v8c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,8c0,-1.1 -0.9,-2 -2,-2zM11,13L8,13v3L6,16v-3L3,13v-2h3L6,8h2v3h3v2zM15.5,15c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM19.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S18.67,9 19.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
-</vector>
\ No newline at end of file
+        android:pathData="M21,6H3C1.9,6 1,6.9 1,8v8c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2V8C23,6.9 22.1,6 21,6zM21,16H3V8h18V16z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M6,15l2,0l0,-2l2,0l0,-2l-2,0l0,-2l-2,0l0,2l-2,0l0,2l2,0z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M14.5,13.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M18.5,10.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
+</vector>
diff --git a/res/drawable/ic_volume_ringer_vibrate.xml b/res/drawable/ic_volume_ringer_vibrate.xml
index d6afe10..4663b75 100644
--- a/res/drawable/ic_volume_ringer_vibrate.xml
+++ b/res/drawable/ic_volume_ringer_vibrate.xml
@@ -15,14 +15,12 @@
      limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="24dp"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0"
         android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
         android:tint="?android:attr/colorControlNormal">
-
     <path
         android:fillColor="#FFFFFF"
-        android:pathData="M1,15c0.55,0 1,-0.45 1,-1v-4c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v4c0,0.55 0.45,1 1,1zM4,17c0.55,0 1,-0.45 1,-1L5,8c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v8c0,0.55 0.45,1 1,1zM22,10v4c0,0.55 0.45,1 1,1s1,-0.45 1,-1v-4c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1zM20,17c0.55,0 1,-0.45 1,-1L21,8c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v8c0,0.55 0.45,1 1,1zM16.5,3h-9C6.67,3 6,3.67 6,4.5v15c0,0.83 0.67,1.5 1.5,1.5h9c0.83,0 1.5,-0.67 1.5,-1.5v-15c0,-0.83 -0.67,-1.5 -1.5,-1.5zM16,19L8,19L8,5h8v14z" />
-
+        android:pathData="M1,9h2v6H1V9zM4,17h2V7H4V17zM21,9v6h2V9H21zM18,17h2V7h-2V17zM17,5.5v13c0,0.83 -0.67,1.5 -1.5,1.5h-7C7.67,20 7,19.33 7,18.5v-13C7,4.67 7.67,4 8.5,4h7C16.33,4 17,4.67 17,5.5zM15,6H9v12h6V6z"/>
 </vector>
diff --git a/res/drawable/ic_vpn_key.xml b/res/drawable/ic_vpn_key.xml
index 71b29d6..c2a7e34 100644
--- a/res/drawable/ic_vpn_key.xml
+++ b/res/drawable/ic_vpn_key.xml
@@ -20,7 +20,9 @@
         android:viewportHeight="24.0"
         android:tint="?android:attr/colorControlNormal">
     <path
-        android:pathData="M12.65,10C11.7,7.31,8.9,5.5,5.78,6.12C3.49,6.58,1.62,8.41,1.14,10.7C0.32,14.57,3.26,18,7,18c2.61,0,4.83-1.67,5.65-4H16
-v2c0,1.1,0.9,2,2,2h0c1.1,0,2-0.9,2-2v-2h1c1.1,0,2-0.9,2-2v0c0-1.1-0.9-2-2-2H12.65z M7,14c-1.1,0-2-0.9-2-2s0.9-2,2-2s2,0.9,2,2 S8.1,14,7,14z"
-        android:fillColor="#FFFFFFFF"/>
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12.09,9C11.11,7.5 9.43,6.5 7.5,6.5C4.46,6.5 2,8.96 2,12c0,3.04 2.46,5.5 5.5,5.5c1.93,0 3.61,-1 4.59,-2.5H14v3h6v-3h2V9H12.09zM20,13h-2v3h-2v-3h-5.16c-0.43,1.44 -1.76,2.5 -3.34,2.5C5.57,15.5 4,13.93 4,12c0,-1.93 1.57,-3.5 3.5,-3.5c1.58,0 2.9,1.06 3.34,2.5H20V13z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M7.5,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
 </vector>
diff --git a/res/drawable/ic_warning_24dp.xml b/res/drawable/ic_warning_24dp.xml
index 8e9fee3..2ca48e0 100644
--- a/res/drawable/ic_warning_24dp.xml
+++ b/res/drawable/ic_warning_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-Copyright (C) 2015 The Android Open Source Project
+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.
@@ -16,9 +16,15 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
-        android:viewportWidth="48.0"
-        android:viewportHeight="48.0">
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M2 42h44L24 4 2 42zm24,-6h-4v-4h4v4zm0,-8h-4v-8h4v8z"/>
+        android:pathData="M12,5.99L19.53,19H4.47L12,5.99M12,2L1,21h22L12,2L12,2z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M13,16l-2,0l0,2l2,0l0,-2z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M13,10l-2,0l0,4l2,0l0,-4z"/>
 </vector>
diff --git a/res/drawable/radio_button_check.xml b/res/drawable/radio_button_check.xml
new file mode 100644
index 0000000..e7884d7
--- /dev/null
+++ b/res/drawable/radio_button_check.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 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.
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/on"
+        android:state_checked="true"
+        android:drawable="@drawable/ic_radio_button_checked_black_24dp" />
+    <item
+        android:id="@+id/off"
+        android:state_checked="false"
+        android:drawable="@drawable/ic_radio_button_unchecked_black_24dp" />
+</selector>
\ No newline at end of file
diff --git a/res/drawable/selectable_card_grey.xml b/res/drawable/selectable_card_grey.xml
deleted file mode 100644
index e74ae8d..0000000
--- a/res/drawable/selectable_card_grey.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2016 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.
--->
-
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:attr/colorControlHighlight">
-    <item android:drawable="?android:attr/colorPrimary"/>
-</ripple>
diff --git a/res/layout/android_beam.xml b/res/layout/android_beam.xml
deleted file mode 100644
index 7780b31..0000000
--- a/res/layout/android_beam.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:scrollbars="vertical"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/android_beam_explained"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dip"
-                android:gravity="top"
-                android:paddingStart="@dimen/preference_no_icon_padding_start"
-                android:text="@string/android_beam_explained"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-            <ImageView android:id="@+id/android_beam_image"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:contentDescription="@null"
-            />
-        </LinearLayout>
-
-    </ScrollView>
-
-</LinearLayout>
-
diff --git a/res/layout/apps_filter_spinner.xml b/res/layout/apps_filter_spinner.xml
index 3eebbb0..3faff50 100644
--- a/res/layout/apps_filter_spinner.xml
+++ b/res/layout/apps_filter_spinner.xml
@@ -39,7 +39,7 @@
         android:layout_height="56dp"
         android:contentDescription="@string/configure"
         android:scaleType="center"
-        android:src="@drawable/ic_settings_24dp_inverse"
+        android:src="@drawable/ic_settings_24dp"
         android:visibility="gone" />
 
 </LinearLayout>
diff --git a/res/layout/battery_header.xml b/res/layout/battery_header.xml
index db90e2e..df45d15 100644
--- a/res/layout/battery_header.xml
+++ b/res/layout/battery_header.xml
@@ -24,7 +24,6 @@
     android:orientation="horizontal"
     android:paddingTop="24dp"
     android:paddingBottom="24dp"
-    android:background="@drawable/selectable_card_grey"
     style="@style/EntityHeader">
 
     <LinearLayout
diff --git a/res/layout/data_usage_summary_preference.xml b/res/layout/data_usage_summary_preference.xml
index 6af159a..6617ac9 100644
--- a/res/layout/data_usage_summary_preference.xml
+++ b/res/layout/data_usage_summary_preference.xml
@@ -23,7 +23,6 @@
     android:paddingStart="@dimen/preference_no_icon_padding_start"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:orientation="vertical"
-    android:background="@drawable/selectable_card_grey"
     android:selectable="false"
     style="@style/EntityHeader">
 
@@ -31,7 +30,7 @@
         android:id="@+id/usage_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="?android:attr/colorAccent"
+        android:textColor="?android:attr/textColorPrimary"
         android:text="@string/data_usage_title" />
 
     <com.android.settings.datausage.MeasurableLinearLayout
diff --git a/res/layout/radio_info.xml b/res/layout/radio_info.xml
index 0ec1f10..60b23c8 100644
--- a/res/layout/radio_info.xml
+++ b/res/layout/radio_info.xml
@@ -49,16 +49,10 @@
             <TextView android:id="@+id/operator" style="@style/info_value" />
         </LinearLayout>
 
-        <!-- Signal Strength -->
+        <!-- Roaming -->
         <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_signal_strength_label" style="@style/info_label" />
-            <TextView android:id="@+id/dbm" style="@style/info_value" />
-        </LinearLayout>
-
-        <!-- Voice Service Status -->
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_gsm_service_label" style="@style/info_label" />
-            <TextView android:id="@+id/gsm" style="@style/info_value" />
+            <TextView android:text="@string/radio_info_roaming_label" style="@style/info_label" />
+            <TextView android:id="@+id/roaming" style="@style/info_value" />
         </LinearLayout>
 
         <!-- Data Service Status -->
@@ -67,28 +61,28 @@
             <TextView android:id="@+id/gprs" style="@style/info_value" />
         </LinearLayout>
 
-        <!-- Network Type -->
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_voice_network_type_label" style="@style/info_label" />
-            <TextView android:id="@+id/voice_network" style="@style/info_value" />
-        </LinearLayout>
-
-        <!-- Network Type -->
+        <!-- Data Network Type -->
         <LinearLayout style="@style/entry_layout">
             <TextView android:text="@string/radio_info_data_network_type_label" style="@style/info_label" />
             <TextView android:id="@+id/data_network" style="@style/info_value" />
         </LinearLayout>
 
-        <!-- Call Status -->
+        <!-- Voice Service Status -->
         <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_call_status_label" style="@style/info_label" />
-            <TextView android:id="@+id/call" style="@style/info_value" />
+            <TextView android:text="@string/radio_info_gsm_service_label" style="@style/info_label" />
+            <TextView android:id="@+id/gsm" style="@style/info_value" />
         </LinearLayout>
 
-        <!-- Roaming -->
+        <!-- Voice Network Type -->
         <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_roaming_label" style="@style/info_label" />
-            <TextView android:id="@+id/roaming" style="@style/info_value" />
+            <TextView android:text="@string/radio_info_voice_network_type_label" style="@style/info_label" />
+            <TextView android:id="@+id/voice_network" style="@style/info_value" />
+        </LinearLayout>
+
+        <!-- Signal Strength -->
+        <LinearLayout style="@style/entry_layout">
+            <TextView android:text="@string/radio_info_signal_strength_label" style="@style/info_label" />
+            <TextView android:id="@+id/dbm" style="@style/info_value" />
         </LinearLayout>
 
         <!-- Link Bandwidth -->
@@ -113,7 +107,7 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="1dip"
-            android:background="#000000" />
+            android:background="?android:attr/listDivider" />
 
         <!-- Preferred Network Type -->
         <TextView
@@ -132,77 +126,7 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="1dip"
-            android:background="#000000" />
-
-        <!-- Ping stats -->
-        <Button android:id="@+id/ping_test"
-                android:textSize="14sp"
-                android:layout_marginTop="8dip"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/ping_test_label"
-                />
- 
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_ping_hostname_v4" style="@style/info_label" />
-            <TextView android:id="@+id/pingHostnameV4" style="@style/info_value" />
-        </LinearLayout>
-
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_ping_hostname_v6" style="@style/info_label" />
-            <TextView android:id="@+id/pingHostnameV6" style="@style/info_value" />
-        </LinearLayout>
-
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_http_client_test" style="@style/info_label" />
-            <TextView android:id="@+id/httpClientTest" style="@style/info_value" />
-        </LinearLayout>
-
-        <!-- Horizontal Rule -->
-        <View
-            android:layout_width="fill_parent"
-            android:layout_height="1dip"
-            android:background="#000000" />
-
-        <!-- DcRtInfo - DataConnectionRealTimeInfo -->
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_dcrtinfo_label"
-                      style="@style/info_label" />
-            <TextView android:id="@+id/dcrtinfo" style="@style/info_value" />
-        </LinearLayout>
-
-        <!-- Message Waiting Indicator -->
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_message_waiting_label" style="@style/info_label" />
-            <TextView android:id="@+id/mwi" style="@style/info_value" />
-        </LinearLayout>
-
-        <!-- Call Forwarding Indicator -->
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_call_redirect_label" style="@style/info_label" />
-            <TextView android:id="@+id/cfi" style="@style/info_value" />
-        </LinearLayout>
-
-        <!-- PPP Sent -->
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_ppp_sent_label"
-                style="@style/info_label" />
-            <TextView android:id="@+id/sent" style="@style/info_value" />
-        </LinearLayout>
-
-        <!-- PPP Received -->
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_ppp_received_label"
-                style="@style/info_label" />
-            <TextView android:id="@+id/received" style="@style/info_value" />
-        </LinearLayout>
-
-        <!-- PPP Sent since last received -->
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_ppp_resets_label"
-                style="@style/info_label" />
-            <TextView android:id="@+id/sentSinceReceived" style="@style/info_value" />
-        </LinearLayout>
+            android:background="?android:attr/listDivider" />
 
         <!-- Radio Power -->
         <Switch android:id="@+id/radio_power"
@@ -244,6 +168,157 @@
                 android:layout_height="wrap_content"
                 android:text="@string/eab_provisioned_switch_string"/>
 
+        <!-- Horizontal Rule -->
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <!-- Ping stats -->
+        <Button android:id="@+id/ping_test"
+                android:textSize="14sp"
+                android:layout_marginTop="8dip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/ping_test_label"
+                />
+ 
+        <LinearLayout style="@style/entry_layout">
+            <TextView android:text="@string/radio_info_ping_hostname_v4" style="@style/info_label" />
+            <TextView android:id="@+id/pingHostnameV4" style="@style/info_value" />
+        </LinearLayout>
+
+        <LinearLayout style="@style/entry_layout">
+            <TextView android:text="@string/radio_info_ping_hostname_v6" style="@style/info_label" />
+            <TextView android:id="@+id/pingHostnameV6" style="@style/info_value" />
+        </LinearLayout>
+
+        <LinearLayout style="@style/entry_layout">
+            <TextView android:text="@string/radio_info_http_client_test" style="@style/info_label" />
+            <TextView android:id="@+id/httpClientTest" style="@style/info_value" />
+        </LinearLayout>
+
+        <!-- Horizontal Rule -->
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <!-- PPP Sent -->
+        <LinearLayout style="@style/entry_layout">
+            <TextView android:text="@string/radio_info_ppp_sent_label"
+                style="@style/info_label" />
+            <TextView android:id="@+id/sent" style="@style/info_value" />
+        </LinearLayout>
+
+        <!-- PPP Received -->
+        <LinearLayout style="@style/entry_layout">
+            <TextView android:text="@string/radio_info_ppp_received_label"
+                style="@style/info_label" />
+            <TextView android:id="@+id/received" style="@style/info_value" />
+        </LinearLayout>
+
+        <!-- PPP Sent since last received -->
+        <LinearLayout style="@style/entry_layout">
+            <TextView android:text="@string/radio_info_ppp_resets_label"
+                style="@style/info_label" />
+            <TextView android:id="@+id/sentSinceReceived" style="@style/info_value" />
+        </LinearLayout>
+
+        <!-- Horizontal Rule -->
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <!-- Call Status -->
+        <LinearLayout style="@style/entry_layout">
+            <TextView android:text="@string/radio_info_call_status_label" style="@style/info_label" />
+            <TextView android:id="@+id/call" style="@style/info_value" />
+        </LinearLayout>
+
+        <!-- Message Waiting Indicator -->
+        <LinearLayout style="@style/entry_layout">
+            <TextView android:text="@string/radio_info_message_waiting_label" style="@style/info_label" />
+            <TextView android:id="@+id/mwi" style="@style/info_value" />
+        </LinearLayout>
+
+        <!-- Call Forwarding Indicator -->
+        <LinearLayout style="@style/entry_layout">
+            <TextView android:text="@string/radio_info_call_redirect_label" style="@style/info_label" />
+            <TextView android:id="@+id/cfi" style="@style/info_value" />
+        </LinearLayout>
+
+        <!-- Horizontal Rule -->
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <!-- CellInfoListRate Selection -->
+        <!-- Location -->
+        <LinearLayout style="@style/entry_layout">
+            <TextView android:text="@string/radio_info_signal_location_label" style="@style/info_label" />
+            <TextView android:id="@+id/location" style="@style/info_value" />
+        </LinearLayout>
+
+        <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/radio_info_cell_info_refresh_rate"
+                style="@style/info_label"
+                />
+
+        <Spinner android:id="@+id/cell_info_rate_select"
+                 android:layout_width="match_parent"
+                 android:layout_height="wrap_content"
+                />
+
+        <!-- CellInfo -->
+        <LinearLayout style="@style/entry_layout">
+            <TextView android:text="@string/radio_info_cellinfo_label"
+                      style="@style/info_label" />
+        </LinearLayout>
+        <LinearLayout style="@style/entry_layout">
+            <TextView android:id="@+id/cellinfo"
+                      style="@style/info_value"
+                      android:minHeight="300dip"
+                      android:textSize="12sp" />
+        </LinearLayout>
+
+        <!-- Horizontal Rule -->
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <!-- Launch OEM-specific Info/Settings Activity (if any) -->
+        <!-- Carrier Provisioning -->
+        <LinearLayout style="@style/entry_layout"
+                      android:orientation="horizontal" >
+            <Button android:id="@+id/carrier_provisioning"
+                    android:layout_marginTop="8dip"
+                    android:layout_weight="1"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:text="@string/carrier_provisioning"
+                    android:textSize="14sp"/>
+            <Button android:id="@+id/trigger_carrier_provisioning"
+                    android:layout_marginTop="8dip"
+                    android:layout_weight="1"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:text="@string/trigger_carrier_provisioning"
+                    android:textSize="14sp"/>
+            <Button android:id="@+id/oem_info"
+                    android:layout_marginTop="8dip"
+                    android:layout_weight="1"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:text="@string/oem_radio_info_label"
+                    android:textSize="14sp"/>
+        </LinearLayout>
+
         <!-- SMSC -->
         <RelativeLayout android:layout_width="match_parent"
                         android:layout_height="wrap_content">
@@ -287,74 +362,6 @@
             <TextView android:id="@+id/dnsCheckState" style="@style/info_value" />
         </LinearLayout>
 
-        <!-- Launch OEM-specific Info/Settings Activity (if any) -->
-        <Button android:id="@+id/oem_info"
-                android:textSize="14sp"
-                android:layout_marginTop="8dip"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/oem_radio_info_label"
-                />
-
-        <!-- Horizontal Rule -->
-        <View
-            android:layout_width="fill_parent"
-            android:layout_height="1dip"
-            android:background="#000000" />
-
-        <!-- CellInfoListRate Selection -->
-        <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/radio_info_cell_info_refresh_rate"
-                style="@style/info_label"
-                />
-
-        <Spinner android:id="@+id/cell_info_rate_select"
-                 android:layout_width="match_parent"
-                 android:layout_height="wrap_content"
-                />
-
-        <!-- Location -->
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_signal_location_label" style="@style/info_label" />
-            <TextView android:id="@+id/location" style="@style/info_value" />
-        </LinearLayout>
-
-        <!-- Neighboring Cids -->
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_neighboring_location_label"
-                      style="@style/info_label" />
-            <TextView android:id="@+id/neighboring" style="@style/info_value" />
-        </LinearLayout>
-
-        <!-- CellInfo -->
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_cellinfo_label"
-                      style="@style/info_label" />
-        </LinearLayout>
-        <LinearLayout style="@style/entry_layout">
-            <TextView android:id="@+id/cellinfo"
-                      style="@style/info_value"
-                      android:minHeight="300dip"
-                      android:textSize="12sp" />
-        </LinearLayout>
-
-        <!-- Carrier Provisioning -->
-        <LinearLayout style="@style/entry_layout">
-            <Button android:id="@+id/carrier_provisioning"
-                    android:layout_marginTop="8dip"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/carrier_provisioning"
-                    android:textSize="14sp"/>
-            <Button android:id="@+id/trigger_carrier_provisioning"
-                    android:layout_marginTop="8dip"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/trigger_carrier_provisioning"
-                    android:textSize="14sp"/>
-        </LinearLayout>
 
     </LinearLayout>
 </ScrollView>
diff --git a/res/layout/restricted_preference_user_delete_widget.xml b/res/layout/restricted_preference_user_delete_widget.xml
index 7fd5d88..7bafacc 100644
--- a/res/layout/restricted_preference_user_delete_widget.xml
+++ b/res/layout/restricted_preference_user_delete_widget.xml
@@ -52,7 +52,7 @@
             android:layout_height="fill_parent"
             android:paddingStart="16dip"
             android:paddingEnd="16dip"
-            android:src="@drawable/ic_menu_delete"
+            android:src="@drawable/ic_delete"
             android:contentDescription="@string/user_delete_user_description"
             android:layout_gravity="center"
             android:background="?android:attr/selectableItemBackground" />
diff --git a/res/layout/user_info_header.xml b/res/layout/user_info_header.xml
index 583c847..57f01c7 100644
--- a/res/layout/user_info_header.xml
+++ b/res/layout/user_info_header.xml
@@ -85,7 +85,7 @@
                 android:layout_height="fill_parent"
                 android:paddingStart="16dip"
                 android:paddingEnd="16dip"
-                android:src="@drawable/ic_menu_delete"
+                android:src="@drawable/ic_delete"
                 android:contentDescription="@string/user_delete_user_description"
                 android:layout_gravity="center"
                 android:background="?android:attr/selectableItemBackground" />
diff --git a/res/layout/video_preference.xml b/res/layout/video_preference.xml
index b71a1b5..17b867f 100644
--- a/res/layout/video_preference.xml
+++ b/res/layout/video_preference.xml
@@ -23,7 +23,8 @@
     android:clipToPadding="false"
     android:gravity="center"
     android:minHeight="?android:attr/listPreferredItemHeightSmall"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    android:importantForAccessibility="noHideDescendants">
 
     <com.android.settings.widget.AspectRatioFrameLayout
         android:id="@+id/video_container"
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index fe891e1..2330727 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -604,6 +604,7 @@
             <LinearLayout android:id="@+id/hidden_settings_field"
                           android:layout_width="match_parent"
                           android:layout_height="wrap_content"
+                          android:visibility="gone"
                           style="@style/wifi_item">
 
                 <TextView android:id="@+id/hidden_settings_title"
diff --git a/res/layout/zen_onboarding.xml b/res/layout/zen_onboarding.xml
index 82951bd..33cdbdd 100644
--- a/res/layout/zen_onboarding.xml
+++ b/res/layout/zen_onboarding.xml
@@ -16,8 +16,8 @@
 -->
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="320dp"
-    android:layout_height="wrap_content" >
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
 
     <RelativeLayout
         android:id="@+id/zen_onboarding_choices"
diff --git a/res/layout/zen_rule_widget.xml b/res/layout/zen_rule_widget.xml
index aa1175b..d502243 100644
--- a/res/layout/zen_rule_widget.xml
+++ b/res/layout/zen_rule_widget.xml
@@ -25,8 +25,8 @@
             android:layout_height="fill_parent"
             android:paddingStart="16dip"
             android:paddingEnd="16dip"
-            android:src="@drawable/ic_menu_delete"
+            android:src="@drawable/ic_delete"
             android:contentDescription="@string/zen_mode_delete_rule"
             android:layout_gravity="center"
             android:background="?android:attr/selectableItemBackground" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/menu/misc_files_menu.xml b/res/menu/misc_files_menu.xml
index 80fdd2f..1170ade 100644
--- a/res/menu/misc_files_menu.xml
+++ b/res/menu/misc_files_menu.xml
@@ -17,7 +17,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/action_delete"
           android:title="@string/delete"
-          android:icon="@android:drawable/ic_menu_delete"/>
+          android:icon="@drawable/ic_delete"/>
     <item android:id="@+id/action_select_all"
           android:title="@string/select_all"
           android:showAsAction="ifRoom" />
diff --git a/res/raw/gesture_swipe_up.mp4 b/res/raw/gesture_swipe_up.mp4
index a8959e4..2f65292 100644
--- a/res/raw/gesture_swipe_up.mp4
+++ b/res/raw/gesture_swipe_up.mp4
Binary files differ
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 49508ba..ac9bb1a 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Altyd aan"</item>
     <item msgid="6385301106124765323">"Altyd af"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index db1cef2..8def75b 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Laat jou tablet toe om met Bluetooth-toestelle in die omtrek te kommunikeer"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Laat jou toestel toe om met Bluetooth-toestelle in die omtrek te kommunikeer"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Laat jou foon toe om met Bluetooth-toestelle in die omtrek te kommunikeer"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Deaktiveer Bluetooth-A2DP-hardeware-aflaai"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Herbegin toestel?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Jy moet jou toestel herbegin om dié instelling te verander."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Herbegin"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Kanselleer"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Beskikbare mediatoestelle"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Beskikbare oproeptoestelle"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Tans gekoppel"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Verbindingvoorkeure"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Toestelle wat vroeër gekoppel was"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Voorheen gekoppel"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Datum en tyd"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Kies tydsone"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Die poort wat jy ingevoer het, is nie geldig nie."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Die HTTP-instaanbediener word deur die blaaier gebruik, maar kan nie deur die ander programme gebruik word nie."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC-URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Aflaaibandwydte (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Oplaaibandwydte (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Selligginginligting (opgeskort):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Buurselinligting (opgeskort):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Fisieke LTE-kanaalopstelling:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Herlaaikoers van selinligting:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Alle selmetingsinligting:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Intydse inligting oor dataverbinding:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Datadiens:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Swerwing:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Outomatiese helderheid"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lig op om wakker te maak"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Stemmingvertoning"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Altyd aan / verhoogde batterygebruik"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nuwe kennisgewings"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Wanneer om te wys"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nuwe kennisgewings"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Maak skerm wakker wanneer jy kennisgewings ontvang"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">Verkeerde SIM-PIN. <xliff:g id="NUMBER_0">%d</xliff:g> poging oor voor jy jou diensverskaffer moet kontak om jou toestel te ontsluit.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM PIN-bewerking het misluk!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tabletstatus"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Foonstatus"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Stelselopdaterings"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android-weergawe"</string>
@@ -2434,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Noodoproepsein"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Stel gedrag wanneer \'n noodoproep gemaak word"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Rugsteun"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Aan"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Af"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Rugsteun en laai terug"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Persoonlike data"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Rugsteun my data"</string>
@@ -2760,6 +2766,12 @@
       <item quantity="one">Kontroleer sertifikaat</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Veelvuldige gebruikers"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Gebruikers en profiele"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Voeg gebruiker of profiel by"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Voeg gebruiker by"</string>
@@ -2942,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"datagebruik"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"warmkol"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Gekoppelde toestelle"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, rymodus, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, rymodus"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps en kennisgewings"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Toestemmings, verstekprogramme"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Rekeninge"</string>
@@ -2966,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"lanseerder, verstek, programme"</string>
     <string name="keywords_display" msgid="8910345814565493016">"skerm, raakskerm"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"dowwe skerm, raakskerm, battery, helder"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"verdonker skerm, raakskerm, battery"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"dowwe skerm, nag, tint, nagskof, helderheid, skermkleur, kleur, kleur"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"agtergrond, personaliseer, pasmaak skerm"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"teksgrootte"</string>
@@ -3007,8 +3014,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"netwerk, selnetwerktoestand, dienstoestand, seinsterkte, selnetwerktipe, swerf, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"reeksnommer, hardewareweergawe"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android-sekuriteitregstellingvlak, basisband-weergawe, kernweergawe"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Stemmingvertoning, sluitskermvertoning"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"vingerafdruk"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"verdof skerm, raakskerm, battery, slimhelderheid, dinamiese helderheid"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"draai, keer om, rotasie, portret, landskap, oriëntasie, vertikaal, horisontaal"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"gradeer op, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"msn, skedule, kennisgewings, blokkeer, stilte, vibreer, slaap, werk, fokus, klank, demp, dag, weeksdag, naweek, weeksaand, geleentheid"</string>
@@ -3091,18 +3101,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Laat visuele tekens toe"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Wanneer Moenie Steur Nie aangeskakel is"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Kennisgewings"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Wys kennisgewings sonder klank"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Kennisgewings sal gedemp word"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Geen klank van kennisgewings af nie"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Jy sal kennisgewings op jou skerm sien"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Wanneer kennisgewings opdaag, sal jou foon nie \'n klank maak of vibreer nie."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Versteek kennisgewings"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Jy sal nie nuwe of bestaande kennisgewings sien nie"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Geen visuele elemente of klank van kennisgewings af nie"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Jy sal nie kennisgewings sien of hoor nie"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Jou foon sal nie nuwe of bestaande kennisgewings wys nie en sal nie \'n klank maak of vibreer nie. Kennisgewings sal nie verskyn wanneer jy van die bokant van jou skerm af ondertoe swiep nie.\n\nHou in gedagte dat belangrike kennisgewings oor foonaktiwiteit en -status steeds sal verskyn."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Gepasmaak"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Aktiveer gepasmaakte instelling"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Verwyder gepasmaakte instelling"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Sal verskyn"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Geen klank van kennisgewings af nie"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Gedeeltelik versteek"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Versteek"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Geen visuele elemente of klank van kennisgewings af nie"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Gepasmaakte beperkings"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Wanneer die skerm aan is"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Wanneer die skerm af is"</string>
@@ -3161,19 +3171,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Gedemp, maar laat <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> en <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> toe"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Boodskappe, geleenthede en onthounotas"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Boodskappe, onthounotas en geleenthede sal gedemp word wanneer Moenie Steur Nie aan is, met die uitsondering van die items wat jy hierbo toelaat. Jy kan boodskapinstellings verstel om dit vir jou vriende, familielede of ander kontakte moontlik te maak om jou te bereik."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Klaar"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Instellings"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Geen visuele elemente of klank van kennisgewings af nie"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Geen klank van kennisgewings af nie"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Jy sal nie kennisgewings sien of hoor nie. Oproepe vanaf gesterde kontakte en herhaalbellers word toegelaat."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Huidige instelling)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Verander Moenie Steur Nie-kennisgewinginstellings?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Werkprofielklanke"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Gebruik persoonlike profiel se klanke"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Klanke is dieselfde vir werk- en persoonlike profiele"</string>
@@ -3345,10 +3349,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Laat oproepe toe"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Inkomende oproepe word geblokkeer wanneer Moenie Steur Nie aan is. Jy kan instellings verstel om dit vir jou vriende, familielede of ander kontakte moontlik te maak om jou te bereik."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Gesterde kontakte"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">en <xliff:g id="NUM_PEOPLE">%d</xliff:g> ander mense</item>
-      <item quantity="one">en 1 ander persoon</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Boodskappe"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Laat boodskappe toe"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Boodskappe"</string>
@@ -3778,10 +3779,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Koel kleurtemperatuur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gebruik koeler skermkleure"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Skakel skerm af om kleur toe te pas"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Konnektiwiteitmonitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Konnektiwiteitmonitor sal loglêers insamel wanneer dit \'n konnektiwiteitprobleem bespeur en \'n aanporkennisgewing na die gebruiker stuur om \'n fout aan te meld"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Laat die toestel herselflaai om konnektiwiteitmonitorverandering toe te pas"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameralasersensor"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Logiese kamera as verstek"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Outomatiese stelselopdaterings"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Pas opdaterings toe wanneer toestel herbegin"</string>
     <string name="usage" msgid="2977875522080448986">"Gebruik"</string>
@@ -4091,8 +4090,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Outovuldiens"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"outomaties, invul, outovul"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Maak seker dat jy hierdie program vertrou&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Outovul&gt;%1$s&lt;/xliff:g&gt; gebruik wat op jou skerm is om te bepaal wat outomaties ingevul kan word."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Toesteltema"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Kleurtema"</string>
     <string name="default_theme" msgid="7085644992078579076">"Verstek"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Toesteltema"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Outomaties (gebaseer op muurpapier)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Lig"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Donker"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Netwerknaam"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Vertoon netwerknaam in statusbalk"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Bergingbestuurder: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4104,7 +4107,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Diensverskaffervoorsiening-inligting"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger-diensverskaffervoorsiening"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Dateer Moenie Steur Nie op"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Versteek kennisgewings om gefokus te bly"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Onderbreek kennisgewings om gefokus te bly"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Wat is nuut en opwindend?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Kry \'n kykie van jou nuwe foon"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Kry \'n kykie van jou nuwe tablet"</string>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index 0d2f03b..02f0402 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"ሁልጊዜ አብራ"</item>
     <item msgid="6385301106124765323">"ሁልጊዜ አጥፋ"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 32edf9a..3348c42 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"ከአቅራቢያ ካሉ የብሉቱዝ መሣሪያዎች ጋር መልዕክት ለመለዋወጥ እንዲችል የእርስዎን ጡባዊ ይፍቀዱለት"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"ከአቅራቢያ ካሉ የብሉቱዝ መሣሪያዎች ጋር መልዕክት ለመለዋወጥ እንዲችል የእርስዎን መሣሪያ ይፍቀዱለት"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"ከአቅራቢያ ካሉ የብሉቱዝ መሣሪያዎች ጋር መልዕክት ለመለዋወጥ እንዲችል የእርስዎን ስልክ ይፍቀዱለት"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"የብሉቱዝ A2DP ሃርድዌር ማራገፍን አሰናክል"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"መሣሪያ ዳግም ይጀምር?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"ይህን ቅንብር ለመለወጥ የእርስዎን መሣሪያ ዳግም ማስጀመር ያስፈልግዎታል።"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"ዳግም ጀምር"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"ይቅር"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"የሚገኙ የማህደረመረጃ መሣሪያዎች"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"የሚገኙ የጥሪ መሣሪያዎች"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"አሁን ላይ ተገናኝቷል"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"የግንኙነት ምርጫዎች"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"ከዚህ ቀደም የተገናኙ መሣሪያዎች"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"ከዚህ ቀደም የተገናኘ"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"ቀን እና ሰዓት"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"የጊዜ ሰቅ ምረጥ"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"የተየብከው ወደብ ትክክል አይደለም።"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"አሳሹ የHTTP ተተኪ ተጠቅሟል ሆኖም በሌሎች መተግበሪያዎች ላይጠቀም ይችላል።"</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"የፒኤሲ ዩአርኤል፦ "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"የውርድ መተላለፊያ ይዘት (ኪቢ/ሴ)፦"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"የሰቀላ መተላለፊያ ይዘት (ኪቢ/ሴ)፦"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"የሕዋስ የአካባቢ መረጃ (የተቋረጠ)፦"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"የጎረቤት ሕዋስ መረጃ (የተቋረጠ)፦"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"የLTE አካላዊ ሰርጥ ውቅረት፦"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"ሕዋስ መረጃ እድሳት ፍጥነት፦"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"ሁሉም የሕዋስ መለኪያ መረጃ፦"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"ቅጽበታዊ የውሂብ ግንኙነት መረጃ፦"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"የውሂብ አገልግሎት፦"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"በመንቀሳቀስ ላይ:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"ራስ ሰርብሩህነት"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"ለማንቃት ያንሱ"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"ከባቢያዊ ማሳያ"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"ሁልጊዜ እንደበራ ይሆናል / የባትሪ አጠቃቀምን ይጨምራል"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"አዳዲስ ማስታወቂያዎች"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"መቼ እንደሚታይ እንደሚደረግ"</string>
     <string name="doze_title" msgid="2375510714460456687">"አዳዲስ ማስታወቂያዎች"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ማሳወቂያዎችን ሲቀበሉ ማያ ገጽን አንቃ"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="other">ልክ ያልሆነ የሲም ፒን ኮድ፣ <xliff:g id="NUMBER_1">%d</xliff:g> ሙከራዎች ይቀርዎታል።</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"የሲም ፒን ክወና አልተሳካም!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"የጡባዊ ኹነታ"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"የስልክ ሁኔታዎች"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"የሥርዓት ዝመናዎች"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android ሥሪት"</string>
@@ -2434,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"የድንገተኛ አደጋ መወደያ ሲግናል"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"የአደጋጊዜ ጥሪ ሲደረግ ባህሪ አዘጋጅ"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"ምትኬ"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"በርቷል"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"ጠፍቷል"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"ምትኬ &amp; እነበረበት መልስ"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"የግል ውሂብ"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"ውሂቤን መጠባበቂያ"</string>
@@ -2760,6 +2766,12 @@
       <item quantity="other">የእውቅና ማረጋገጫዎችን ይፈትሹ</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"በርካታ ተጠቃሚዎች"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"ተጠቃሚዎች እና መገለጫዎች"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ተጠቃሚ ወይም መገለጫ አክል"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"ተጠቃሚ አክል"</string>
@@ -2942,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"የውሂብ አጠቃቀም"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"መገናኛ ነጥብ"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"የተገናኙ መሣሪያዎች"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"ብሉቱዝ፣ የመንዳት ሁነታ፣ NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"ብሉቱዝ፣ የመንዳት ሁነታ"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"ብሉቱዝ፣ NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"ብሉቱዝ"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"መተግበሪያዎች እና ማሳወቂያዎች"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ፈቃዶች፣ ነባሪ መተግበሪያዎች"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"መለያዎች"</string>
@@ -2966,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"አስጀመሪ፣ ነባሪ፣ መተግበሪያዎች"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ማያ ገጽ፣ ማያንካ"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"ደብዛዛ ማያ ገጽ፣ ማያንካ፣ ባትሪ፣ ብሩህ"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"ደብዛዛ ማያ ገጽ፣ ማያንካ፣ ባትሪ"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"ደብዛዛ ማያ ገጽ፣ ሌሊት፣ ቅብ፣ ሌሊት ሺፍት፣ ብሩህነት፣ ማያ ገጽ ቀለም፣ ቀለም ውህድ፣ ቀለም"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"በስተጀርባ፣ ግላዊነት ማላበስ፣ ብጁ ማድረግ ማሳያ"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"የጽሁፍ መጠን"</string>
@@ -3007,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"አውታረ መረብ፣ የተንቀሳቃሽ ስልክ አውታረ መረብ ሁኔታ፣ አገልግሎት ሁኔታ፣ የሲግናል ጥንካሬ፣ የተንቀሳቃሽ ስልክ አውታረ መረብ ዓይነት፣ ከአገልግሎት መስጫ ክልል ውጭ፣ iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"ተከታታይ ቁጥር፣ የሃርድዌር ስሪት"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"የandroid ደህንነት መጠገኛ ደረጃ፣ የመሰረተ-ድግ ስሪት፣ የአውራ ከዋኝ ስሪት"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"ድባባዊ ማሳያ፣ የማያ ገጽ ቁልፍ ማሳያ"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"የጣት አሻራ"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"አሽከርክር፣ ገልብጥ፣ ሽክርክሪት፣ የቁም፣ የመሬት ገጽታ፣ አቀማመጥ፣ ቁልቁል፣ አግድም"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"ደረጃ አሻሽል፣ android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd፣ መርሐ ግብር፣ ማሳወቂያዎች፣ አግድ፣ ጸጥታ፣ ንዘር፣ አንቀላፋ፣ ሥራ፣ አተኩር፣ ድምፅ፣ ድምፀ ከል አድርግ፣ ቀን፣ የሳምንቱ ቀን፣ የሳምንቱ ዕረፍት ቀናት፣ የሳምንቱ ሌሊት፣ ክስተት"</string>
@@ -3091,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"ምስላዊ ምልክቶችን ፍቀድ"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"አትረብሽ ሲበራ"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"ማሳወቂያዎች"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"ማሳወቂያዎችን በጸጥታ አሳይ"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"ማሳወቂያዎች ድምጸ-ከል ይደረግባቸዋል"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"ከማሳወቂያዎች ምንም ድምጽ የለም"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"ማሳወቂያዎችን በማያዎ ላይ ይመለከታሉ"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"ማሳወቂያዎች ሲመጡ ስልክዎ ድምጽ አያሰማም ወይም አይነዝርም።"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"ማሳወቂያዎችን ይደብቁ"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"አዲስ ወይም ነባር ማሳወቂያዎችን አይመለከቱም።"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"ማሳወቂያዎች ላይ ምንም ምስሎች ወይም ድምጽ የለም"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"ማሳወቂያዎችን አያዩም ወይም አይሰሙም።"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"የእርስዎ ስልክ አዲስ ወይም ነባር ማሳወቂያዎች አያሳይም፣ እና ድምጽ አያሰማም ወይም አይነዝርም። ከማያ ገጽዎ አናት ወደ ታች ሲያንሸራትቱ ማሳወቂያዎች አይታዩም።\n\nለስልክ እንቅስቃሴ ወሳኝ የሆኑ ማሳወቂያዎች እና ሁኔታ አሁንም እንደሚታዩ ልብ ይበሉ።"</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"ብጁ"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"ብጁ ቅንብን አንቃ"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"ብጁ ቅንብን አስወግድ"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"ይመጣሉ"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"ከማሳወቂያዎች ምንም ድምጽ የለም"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"በከፊል ተደብቋል"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"የተደበቁ"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"ማሳወቂያዎች ላይ ምንም ምስሎች ወይም ድምጽ የለም"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"ብጁ ገደቦች"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"ማያ ገጹ ሲበራ"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"ማያ ገጹ ሲጠፋ"</string>
@@ -3161,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"ድምጸ-ከል ተደርጎበታል፣ ነገር ግን <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>ን፣ <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>ን እና <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>ን ፍቀድ"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"መልዕክቶች፣ ክስተቶች እና አስታዋሾች"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"አትረብሽ ሲበራ ከላይ ከሚፈቅዷቸው ንጥሎች በስተቀር መልዕክቶች፣ አስታዋሾች እና ክስተቶች ድምጸ-ከል ይደረግባቸዋል። የእርስዎ ጓደኛዎች፣ ቤተሰብ እና ሌሎች እውቂያዎች እርስዎን ማግኘት እንዲችሉ የመልዕክት ቅንብሮችን ማስተካከል ይችላሉ።"</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"ተከናውኗል"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"ቅንብሮች"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"ማሳወቂያዎች ላይ ምንም ምስሎች ወይም ድምጽ የለም"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"ከማሳወቂያዎች ምንም ድምጽ የለም"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"ማሳወቂያዎችን አያዩም ወይም አይሰሙም። ኮከብ ከተደረገባቸው እውቂያዎች የሚመጡ ጥሪዎች እና ድጋሚ ደዋዮች ይፈቀዳሉ።"</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(የአሁን ቅንብር)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"የአትረብሽ ማሳወቂያ ቅንብሮች ይቀየሩ?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"የስራ መገለጫ ድምጾች"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"የግል መገለጫ ድምጾችን ይጠቀሙ"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"ድምጾች ለስራ እና የግል መገለጫዎች ተመሳሳይ ናቸው"</string>
@@ -3345,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"ጥሪዎችን ፍቀድ"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"አትረብሽ ሲበራ ገቢ ጥሪዎች ይታገዳሉ። የእርስዎ ጓደኛዎች፣ ቤተሰብ ወይም ሌሎች እውቂያዎች እርስዎን ማግኘት እንዲችሉ ቅንብሮችን ማስተካከል ይችላሉ።"</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"ባለኮከብ ዕውቂያዎች"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">እና <xliff:g id="NUM_PEOPLE">%d</xliff:g> ሌሎች</item>
-      <item quantity="other">እና <xliff:g id="NUM_PEOPLE">%d</xliff:g> ሌሎች</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"መልዕክቶች"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"መልዕክቶችን ፍቀድ"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"መልዕክቶች"</string>
@@ -3778,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"ቀዝቀዝ ያለ የቀለም ሙቀት"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ቀዝቀዝ ያሉ የማሳያ ቀለሞችን ይጠቀሙ"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"የቀለም ለውጥን ለመተግበር ማያ ገጹን ያጥፉት"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"የተገናኝነት መከታተያ"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor የተገናኝነት ችግር ሲያገኝ የምዝግብ ማስታወሻዎችን የሚሰበስብ ሲሆን ተጠቃሚው ሳንካ እንዲያስመዘግብ በማሳወቂያ ይጠይቀዋል"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"የተገናኝነት መከታተያ ለውጥን ለመተግበር መሣሪያውን ዳግም ያስነሱት"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"የካሜራ ሌዘር ዳሳሽ"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"ምክንያታዊ ካሜራ እንደ ነባሪ"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ራስ-ሰር የስርዓት ዝማኔዎች"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"መሣሪያ ዳግም ሲጀምር ዝማኔዎችን ተፈጻሚ አድርግ"</string>
     <string name="usage" msgid="2977875522080448986">"አጠቃቀም"</string>
@@ -4091,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"የራስ-ሙላ አገልግሎት"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"ራስ-ሰር፣ ሙላ፣ ራስ-ሙላ"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;ይህን መተግበሪያ የሚያምኑት መሆንዎን ያረጋግጡ&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google ራስ-ሙላ&gt;%1$s&lt;/xliff:g&gt; ምን በራስ መሞላት እንደሚችል ለማወቅ በማያ ገጽዎ ላይ ያለውን ነገር ይጠቀማል።"</string>
-    <string name="device_theme" msgid="4571803018917608588">"የመሣሪያ ገጽታ"</string>
+    <string name="color_theme" msgid="1535685696756738324">"የቀለም ገጽታዎች"</string>
     <string name="default_theme" msgid="7085644992078579076">"ነባሪ"</string>
+    <string name="device_theme" msgid="4571803018917608588">"የመሣሪያ ገጽታ"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"ራስ-ሰር (በግድግዳ ወረቀት ላይ በመመርኮዝ)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"ቀላል"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"ጨለማ"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"የአውታረ መረብ ስም"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"የአውታረ መረብ ስም በሁኔታ አሞሌ ውስጥ አሳይ።"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"የማከማቻ አስተዳዳሪ፦ <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4104,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"የአገልግሎት አቅራቢ አቅርቦት መረጃ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"የቀስቃሴ አገልግሎት አቅራቢ አቅርቦት"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"አትረብሽን አዘምን"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"እንዳተኮሩ ለመቆየት ማሳወቂያዎችን ይደብቁ"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"ትኩረት እንደሰጡ ለመቆየት ማሳወቂያዎችን ባሉበት አቁም"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"ምን አዲስ እና አስደሳች ነገር አለ?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"በአዲሱ ስልክዎ ላይ ጉብኝት ያድርጉ"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"በአዲሱ ጡባዊዎ ላይ ጉብኝት ያድርጉ"</string>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index af15c02..37d4085 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"التشغيل دائمًا"</item>
     <item msgid="6385301106124765323">"إيقاف دائمًا"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index a538b23..70f7c4b 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -177,6 +177,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"السماح لجهازك اللوحي بالاتصال بأجهزة بلوتوث المجاورة"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"السماح لجهازك بالاتصال بأجهزة بلوتوث المجاورة"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"السماح لهاتفك بالاتصال بأجهزة بلوتوث المجاورة"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"‏إيقاف نقل بيانات أجهزة بلوتوث A2DP"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"إعادة تشغيل الجهاز؟"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"يجب إعادة تشغيل جهازك لتغيير هذا الإعداد."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"إعادة تشغيل"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"إلغاء"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"أجهزة الوسائط المتوفرة"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"أجهزة الاتصال المتاحة"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"الأجهزة المتصلة حاليًا"</string>
@@ -186,6 +191,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"تفضيلات الاتصال"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"الأجهزة المتصلة سابقًا"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"الأجهزة المتصلة سابقًا"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"التاريخ والوقت"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"اختيار المنطقة الزمنية"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -211,11 +218,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"المنفذ الذي كتبته غير صالح."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"‏يستخدم المتصفح الخادم الوكيل HTTP، ولكنه ربما لا تستخدمه التطبيقات الأخرى."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"‏عنوان URL لتهيئة PAC: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"‏معدّل نقل بيانات DL (كيلوبت في الثانية):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"‏معدّل نقل بيانات UL (كيلوبت في الثانية):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"معلومات الموقع الخلوية (تم الإيقاف):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"المعلومات الخلوية المجاورة (تم الإيقاف):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"‏تهيئة قناة LTE Physical:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"معدل تحديث المعلومات الخلوية:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"جميع معلومات القياس الخلوية:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"معلومات اتصال البيانات في الوقت الفعلي:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"خدمة البيانات:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"تجوال:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -409,7 +417,7 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"فتح القفل باستخدام بصمة الإصبع"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"استخدام بصمة الإصبع"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"كل ما عليك فعله هو لمس مستشعر بصمات الإصبع لإلغاء قفل هاتفك أو السماح بإجراء عمليات الشراء أو تسجيل الدخول إلى التطبيقات. عليك توخي الحذر عند إضافة بصمة الإصبع لأشخاص آخرين؛ فأي بصمة من هذه البصمات يمكن أن تؤدي إلى تنفيذ أي إجراء من الإجراءات السابق ذكرها.\n\nملاحظة: يمكن أن تكون بصمة إصبعك أقل أمانًا من استخدام نقش أو رقم تعريف شخصي قوي."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"كل ما عليك فعله هو لمس جهاز استشعار بصمات الإصبع لإلغاء قفل هاتفك أو السماح بإجراء عمليات الشراء أو تسجيل الدخول إلى التطبيقات. عليك توخي الحذر عند إضافة بصمة الإصبع لأشخاص آخرين؛ فأي بصمة من هذه البصمات يمكن أن تؤدي إلى تنفيذ أي إجراء من الإجراءات السابق ذكرها.\n\nملاحظة: يمكن أن تكون بصمة إصبعك أقل أمانًا من استخدام نقش أو رقم تعريف شخصي قوي."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"استخدم بصمة الإصبع لإلغاء قفل هاتفك أو الموافقة على عمليات الشراء.\n\nملاحظة: لا يمكنك استخدم بصمة الإصبع لإلغاء قفل هذا الجهاز. للحصول على المزيد من المعلومات. اتصل بمشرف المؤسسة."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"استخدم بصمة الإصبع لإلغاء قفل هاتفك أو الموافقة على عمليات الشراء.\n\nملاحظة: قد تكون بصمة إصبعك أقل أمانًا من استخدام نقش أو رقم تعريف شخصي قوي."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"إلغاء"</string>
@@ -1210,8 +1218,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"سطوع تلقائي"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"الرفع لتنبيه الجهاز"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"العرض على الشاشة"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"قيد التشغيل دائمًا / زيادة استخدام البطارية"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"إشعارات جديدة"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"وقت العرض"</string>
     <string name="doze_title" msgid="2375510714460456687">"إشعارات جديدة"</string>
     <string name="doze_summary" msgid="3846219936142814032">"تفعيل الشاشة عند تلقي إشعارات"</string>
@@ -1260,8 +1266,6 @@
       <item quantity="one">‏رمزPIN لبطاقة SIM غير صحيح، ولديك محاولة واحدة (<xliff:g id="NUMBER_0">%d</xliff:g>) يجب أن تتصل بعدها بمشغّل شبكة الجوّال لإلغاء قفل الجهاز.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"‏تعذّر إتمام عملية \"رقم التعريف الشخصي\" لبطاقة SIM!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"حالة الجهاز اللوحي"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"حالة الهاتف"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"تحديثات النظام"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"‏إصدار Android"</string>
@@ -2218,8 +2222,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"يتعذر تقييد استخدام الخلفية."</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"هل تريد وضع حد لنشاط التطبيق في الخلفية؟"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"قد يتأثر أداء أحد التطبيقات سلبًا في حالة وضع حد لنشاطه في الخلفية"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"نظرًا لعدم تعيين هذا التطبيق للعمل على تحسين البطارية، فلا يمكنك تقييده.\n\nلتقييد التطبيق، شغِّل ميزة تحسين البطارية أولاً."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"استخدام الشاشة منذ الشحن الكامل"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"استهلاك الشاشة"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"البحث عن شبكات الجوال"</string>
@@ -2567,6 +2570,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"إشارة اتصال الطوارئ"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"تعيين السلوك عند إجراء اتصال بالطوارئ"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"الاحتفاظ بنسخة احتياطية"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"مفعّل"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"غير مفعّل"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"النسخ الاحتياطي والاستعادة"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"البيانات الشخصية"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"احتفاظ بنسخة لبياناتي"</string>
@@ -2909,6 +2914,12 @@
       <item quantity="one">الاطّلاع على الشهادة</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"مستخدمون متعدِّدون"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"المستخدمون والملفات الشخصية"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"إضافة مستخدم أو ملف شخصي"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"إضافة مستخدم"</string>
@@ -3095,14 +3106,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"استخدام البيانات"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"نقطة اتصال"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"الأجهزة المرتبطة"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"‏بلوتوث، وضع القيادة، NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"بلوتوث، وضع القيادة"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"‏بلوتوث، NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"بلوتوث"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"التطبيقات والإشعارات"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"أذونات، تطبيقات تلقائية"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"الحسابات"</string>
@@ -3119,7 +3126,6 @@
     <string name="keywords_home" msgid="294182527446892659">"مشغّل تطبيقات، تلقائي، تطبيقات"</string>
     <string name="keywords_display" msgid="8910345814565493016">"شاشة، شاشة تعمل باللمس"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"تعتيم شاشة، شاشة تعمل باللمس، بطارية، ساطع"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"تعتيم شاشة، شاشة تعمل باللمس، بطارية"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"تعتيم شاشة، ليل، تلوين خفيف، نوبة ليلية، سطوع، لون شاشة، لون، تلوين"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"خلفية، تخصيص، تخصيص عرض"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"حجم النص"</string>
@@ -3160,8 +3166,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"‏شبكة، حالة شبكة الجوّال، حالة الخدمة، قوة الإشارة، نوع شبكة الجوّال، التجوال، iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"رقم تسلسلي، إصدار الجهاز"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"‏مستوى رمز تصحيح أمان android، إصدار النطاق الأساسي، إصدار النواة"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"العرض على الشاشة، عرض شاشة التأمين"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"بصمة الإصبع"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"تعتيم الشاشة، شاشة تعمل باللمس، بطارية، سطوع ذكي، سطوع ديناميكي"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"تدوير، قلب، دوران، عمودي، أفقي، اتجاه، رأسي، عرضي"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"‏ترقية، android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"الرجاء عدم الإزعاج، جدول زمني، إشعارات، حظر، صامت، اهتزاز، سكون، عمل، تركيز، صوت، كتم الصوت، يوم، يوم من الأسبوع، عطلة نهاية الأسبوع، ليلة من الأسبوع، حدث"</string>
@@ -3248,18 +3257,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"السماح بالإشارات المرئية"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"عند تفعيل الإعداد \"الرجاء عدم الإزعاج\""</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"الإشعارات"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"عرض الإشعارات بدون تنبيه صوتي"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"سيتم تجاهل الإشعارات."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"بلا صوت من الإشعارات."</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"سترى إشعارات على شاشتك."</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"عند ظهور إشعارات، لن يُصدر هاتفك صوتًا أو يهتزّ."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"إخفاء الإشعارات"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"لن ترى إشعارات جديدة أو حالية."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"بلا عناصر مرئيّة أو أصوات من الإشعارات."</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"لن ترى أو تسمع إشعارات."</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"لن يعرض هاتفك إشعارات جديدة أو حالية ولن يُصدر صوتًا أو يهتزّ. ولن تظهر الإشعارات عند التمرير بسرعة من أعلى الشاشة.\n\nجدير بالذكر أن الإشعارات المهمّة عن أنشطة الهاتف وحالته ستستمر في الظهور."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"الإعدادات المخصّصة"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"تفعيل الإعداد المخصّص"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"إزالة الإعداد المخصّص"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"إظهار الإشعارات"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"بلا صوت من الإشعارات."</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"إخفاء الإشعارات جزئيًا"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"إخفاء الإشعارات"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"بلا عناصر مرئيّة أو أصوات من الإشعارات"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"القيود المخصّصة"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"عندما تكون الشاشة مُشغَّلة"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"عندما تكون الشاشة مطفأة"</string>
@@ -3326,19 +3335,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"تمّ كتم الصوت مع السماح لـ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> و<xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> و<xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>."</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"الرسائل والأحداث والتذكيرات"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"عند تفعيل الإعداد \"الرجاء عدم الإزعاج\"، سيتم تجاهل الإشعارات عن الرسائل والتذكيرات والأحداث، باستثناء الإشعارات التي تسمح بها أعلاه. يمكنك ضبط إعدادات الرسائل للسماح لأصدقائك أو أفراد عائلتك أو جهات الاتصال الأخرى بالتواصل معك."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"تمّ"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"الإعدادات"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"بلا عناصر مرئيّة أو أصوات من الإشعارات."</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"بلا صوت من الإشعارات"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"لن ترى أو تسمع إشعارات. ويُسمح بالمكالمات من جهات الاتصال المميّزة بنجمة والمتصلين المتكرّرين."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(الإعداد الحالي)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"هل تريد تغيير إعدادات إشعار \"الرجاء عدم الإزعاج\"؟"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"أصوات الملف الشخصي للعمل"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"استخدام أصوات الملف الشخصي"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"يتم استخدام الأصوات نفسها للملف الشخصي وملف العمل الشخصي"</string>
@@ -3526,14 +3529,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"السماح بالمكالمات"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"عند تفعيل الإعداد \"الرجاء عدم الإزعاج\"، يتم حظر المكالمات الواردة. يمكنك ضبط الإعدادات للسماح لأصدقائك أو أفراد عائلتك أو جهات الاتصال الأخرى بالتواصل معك."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"جهات الاتصال المميّزة بنجمة"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="zero">و<xliff:g id="NUM_PEOPLE">%d</xliff:g> جهة اتصال أخرى</item>
-      <item quantity="two">وجهتا اتصال (<xliff:g id="NUM_PEOPLE">%d</xliff:g>) أخريان</item>
-      <item quantity="few">و<xliff:g id="NUM_PEOPLE">%d</xliff:g> جهات اتصال أخرى</item>
-      <item quantity="many">و<xliff:g id="NUM_PEOPLE">%d</xliff:g> جهة اتصال أخرى</item>
-      <item quantity="other">و<xliff:g id="NUM_PEOPLE">%d</xliff:g> جهة اتصال أخرى</item>
-      <item quantity="one">وجهة اتصال أخرى</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"الرسائل"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"السماح بالرسائل"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"الرسائل"</string>
@@ -4015,10 +4011,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"ألوان هادئة"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"استخدم ألوان عرض هادئة"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"لتطبيق التغيير في اللون، أوقف الشاشة."</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"أداة مراقبة إمكانية الاتصال"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ستجمع أداة مراقبة إمكانية الاتصال سجلات عند اكتشاف مشكلة متعلقة بإمكانية الاتصال وترسل إشعارًا إلى المستخدم لإرسال تقرير بالخطأ"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"يُرجى إعادة تشغيل الجهاز لتطبيق التغيير الذي تم إجراؤه على أداة مراقبة إمكانية الاتصال"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"مُستشعِر الليزر في الكاميرا"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"الاختيار التلقائي للكاميرا"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"تحديثات النظام التلقائية"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"تطبيق التحديثات عند إعادة تشغيل الجهاز"</string>
     <string name="usage" msgid="2977875522080448986">"الاستخدام"</string>
@@ -4238,9 +4232,9 @@
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"للاطلاع على الوقت ورموز الإشعارات والمعلومات الأخرى، يمكنك إلقاء نظرة على جهازك."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"تمرير البصمة للحصول على الإشعارات"</string>
     <string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"تمرير بصمة الإصبع"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"للاطّلاع على الإشعارات، مرر للأسفل على مستشعر بصمة الإصبع على الجزء الخلفي لهاتفك."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"للاطّلاع على الإشعارات، مرّر سريعًا للأسفل على مستشعر بصمات الإصبع على الجزء الخلفي من جهازك اللوحي."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"للاطّلاع على الإشعارات، مرّر سريعًا للأسفل على مستشعر بصمات الإصبع على الجزء الخلفي من جهازك."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"للاطّلاع على الإشعارات، مرر للأسفل على جهاز استشعار بصمة الإصبع على الجزء الخلفي لهاتفك."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"للاطّلاع على الإشعارات، مرّر سريعًا للأسفل على جهاز استشعار بصمات الإصبع على الجزء الخلفي من جهازك اللوحي."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"للاطّلاع على الإشعارات، مرّر سريعًا للأسفل على جهاز استشعار بصمات الإصبع على الجزء الخلفي من جهازك."</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"الاطّلاع على الإشعارات بسرعة"</string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"تشغيل"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"إيقاف"</string>
@@ -4384,8 +4378,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"خدمة الملء التلقائي"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"ملء، تعبئة، ملء تلقائي"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"‏&lt;b&gt;تأكّد من أنك تثق بهذا التطبيق&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; تستخدم البيانات المعروضة على الشاشة لتحديد ما يمكن ملؤه تلقائيًا."</string>
-    <string name="device_theme" msgid="4571803018917608588">"مظهر الجهاز"</string>
+    <string name="color_theme" msgid="1535685696756738324">"مظهر ملوَّن"</string>
     <string name="default_theme" msgid="7085644992078579076">"تلقائي"</string>
+    <string name="device_theme" msgid="4571803018917608588">"مظهر الجهاز"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"تلقائي (حسب لون الخلفية)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"مظهر فاتح"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"مظهر داكن"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"اسم الشبكة"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"عرض اسم الشبكة في شريط الحالة"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"إدارة سعة التخزين: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4397,7 +4395,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"معلومات توفير خدمة مشغل شبكة الجوال"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"بدء توفير خدمة مشغل شبكة الجوال"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"تحديث إعداد \"الرجاء عدم الإزعاج\""</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"إخفاء الإشعارات للحفاظ على التركيز"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"إيقاف الإشعارات مؤقتًا للحفاظ على التركيز"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"ما الميزات الجديدة والمثيرة للاهتمام؟"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"الحصول على جولة في هاتفك الجديد"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"الحصول على جولة في جهازك اللوحي الجديد"</string>
diff --git a/res/values-as/arrays.xml b/res/values-as/arrays.xml
index d106917..449115d 100644
--- a/res/values-as/arrays.xml
+++ b/res/values-as/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"সদায় অন"</item>
     <item msgid="6385301106124765323">"সদায় অফ"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 26ff3f7..87a648e 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -172,6 +172,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"আপোনাৰ টেবলেটটোক নিকটৱৰ্তী ব্লুটুথ ডিভাইচৰ সৈতে যোগাযোগ কৰিবলৈ অনুমতি দিয়ক"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"আপোনাৰ ডিভাইচটোক নিকটৱৰ্তী ব্লুটুথ ডিভাইচৰ সৈতে যোগাযোগ কৰিবলৈ অনুমতি দিয়ক"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"আপোনাৰ ফ\'নটোক নিকটৱৰ্তী ব্লুটুথ ডিভাইচৰ সৈতে যোগাযোগ কৰিবলৈ অনুমতি দিয়ক"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"ব্লুটুথ A2DP হাৰ্ডৱেৰ অফল\'ড অক্ষম কৰক"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"ডিভাইচটো ৰিষ্টার্ট কৰেনে?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"আপুনি এই ছেটিঙটো সলনি কৰিবলৈ ডিভাইচটো ৰিষ্টার্ট কৰিব লাগিব।"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"ৰিষ্টাৰ্ট কৰক"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"বাতিল কৰক"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"মিডিয়াৰ বাবে উপলব্ধ ডিভাইচবোৰ"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"কল কৰিবৰ বাবে উপলব্ধ ডিভাইচবোৰ"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"বৰ্তমান সংযোজিত হৈ আছে"</string>
@@ -181,6 +186,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"সংযোগৰ অগ্ৰাধিকাৰসমূহ"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"পূৰ্বৱৰ্তী সংযোগ হোৱা ডিভাইচবোৰ"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"আগতে সংযোগ কৰা"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"তাৰিখ আৰু সময়"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"সময় মণ্ডল নিৰ্বাচন কৰক"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -206,11 +213,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"আপুনি টাইপ কৰা প\'ৰ্টটো মান্য নহয়।"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP প্ৰক্সিটো ব্ৰাউজাৰে ব্যৱহাৰ কৰি আছে, কিন্তু তাক অইন এপে ব্যৱহাৰ নকৰিবও পাৰে।"</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"পিএচি ইউআৰএল: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"ডাউনল\'ড বেণ্ডৱিথ (কেবিপিএছ):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"আপল\'ড বেণ্ডৱিথ (কেবিপিএছ):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"চেল অৱস্থানৰ তথ্য (অপ্ৰচলিত):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"সমীপৱৰ্তী চেলৰ তথ্য (অননুমোদিত):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"এলটিই ফিজিকেল চ্চেনেল কনফিগাৰেশ্বন:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"চেল তথ্য ৰিফ্ৰেশ্ব কৰাৰ হাৰ:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"সকলো চেল পৰিমাপৰ তথ্য:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"ডেটা সংযোগ বিষয়ক তাৎক্ষণিক তথ্য:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"ডেটা সেৱা:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"ৰ\'মিং:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -307,7 +315,7 @@
     <string name="allow_data_usage_title" msgid="2238205944729213062">"ৰ\'মিঙত থাকোতে ডেটা ব্যৱহাৰৰ অনুমতি দিয়ক"</string>
     <string name="roaming" msgid="3596055926335478572">"ডেটা ৰ\'মিং"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"ৰ’মিঙৰ সময়ত ডেটা সেৱাৰ সৈতে সংযোগ কৰক"</string>
-    <string name="roaming_disable" msgid="1295279574370898378">"ৰ’মিঙৰ সময়ত ডেটা সেৱাসমূহৰ সৈতে সংযোগ কৰক"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"ৰ’মিঙৰ সময়ত ডেটা সেৱাৰ সৈতে সংযোগ কৰক"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"আপুনি ডেটা ৰ\'মিং অফ হৈ থকা অৱস্থাত আপোনাৰ হ\'ম নেটৱৰ্কটো এৰি অহা বাবে ডেটা সংযোগ হেৰুৱাইছে।"</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"অন কৰক"</string>
     <string name="roaming_warning" msgid="4275443317524544705">"আপুনি যথেষ্ট পৰিমাণৰ খৰচ বহন কৰিবলগীয়া হ’ব পাৰে।"</string>
@@ -994,16 +1002,11 @@
     <string name="emergency_address_title" msgid="932729250447887545">"জৰূৰীকালীন ঠিকনা"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"আপুনি ৱাই-ফাইৰ জৰিয়তে জৰুৰীকালীন কল কৰাৰ সময়ত আপোনাৰ অৱস্থান হিচাপে ব্যৱহাৰ কৰা হৈছে"</string>
     <string name="private_dns_help_message" msgid="3299567069152568958">"ব্যক্তিগত ডিএনএছ সুবিধাসমূহৰ বিষয়ে "<annotation id="url">"অধিক জানক"</annotation></string>
-    <!-- no translation found for wifi_calling_pref_managed_by_carrier (6845711858866828986) -->
-    <skip />
-    <!-- no translation found for wifi_calling_settings_activation_instructions (7492509632478260955) -->
-    <skip />
-    <!-- no translation found for wifi_calling_turn_on (1171403510313983983) -->
-    <skip />
-    <!-- no translation found for wifi_calling_not_supported (7878640438907807754) -->
-    <skip />
-    <!-- no translation found for carrier (5264014738689761132) -->
-    <skip />
+    <string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"বাহকে ছেটিং পৰিচালনা কৰে"</string>
+    <string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"ৱাই-ফাইৰ জৰিয়তে কল কৰা সুবিধা সক্ৰিয় কৰক"</string>
+    <string name="wifi_calling_turn_on" msgid="1171403510313983983">"ৱাই-ফাইৰ জৰিয়তে কল কৰাৰ সুবিধা অন কৰক"</string>
+    <string name="wifi_calling_not_supported" msgid="7878640438907807754">"%1$sত ৱাই-ফাইৰ জৰিয়তে কল কৰাৰ সুবিধা নাই"</string>
+    <string name="carrier" msgid="5264014738689761132">"বাহক"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ডিছপ্লে"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ধ্বনি"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ভলিউম"</string>
@@ -1073,13 +1076,13 @@
     <string name="brightness_summary" msgid="838917350127550703">"স্ক্ৰীণৰ উজ্জ্বলতা খাপ খুৱাওক"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"অভিযোজিত উজ্জ্বলতা"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"পোহৰ অনুযায়ী উজ্জ্বলতা অপ্টিমাইজ কৰক"</string>
-    <string name="auto_brightness_summary_off" msgid="2802336459335410626">"অফ কৰক"</string>
+    <string name="auto_brightness_summary_off" msgid="2802336459335410626">"অফ হৈ আছে"</string>
     <string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"আপুনি স্ক্ৰীণৰ বাবে বাছনি কৰা উজ্জ্বলতা অতি কম হৈছে"</string>
     <string name="auto_brightness_summary_low" msgid="5609877905833960427">"আপুনি স্ক্ৰীণৰ বাবে বাছনি কৰা উজ্জ্বলতাটো কম"</string>
     <string name="auto_brightness_summary_default" msgid="7225666614394726845">"উজ্জ্বলতাক অগ্ৰাধিকাৰ দিয়া ছেটিং ডিফ\'ল্ট হৈ আছে"</string>
     <string name="auto_brightness_summary_high" msgid="7172304165631136027">"আপুনি স্ক্ৰীণৰ বাবে বাছনি কৰা উজ্জ্বলতাটো অতি বেছি"</string>
     <string name="auto_brightness_summary_very_high" msgid="979277812582279078">"আপুনি স্ক্ৰীণৰ বাবে বাছনি কৰা উজ্জ্বলতা অতি বেছি হৈছে"</string>
-    <string name="auto_brightness_off_title" msgid="2996864829946190795">"বন্ধ কৰক"</string>
+    <string name="auto_brightness_off_title" msgid="2996864829946190795">"অফ কৰক"</string>
     <string name="auto_brightness_very_low_title" msgid="8252988638614126320">"অতি কম"</string>
     <string name="auto_brightness_low_title" msgid="1632186441514863377">"নিম্ন"</string>
     <string name="auto_brightness_default_title" msgid="936771997353506620">"ডিফ\'ল্ট"</string>
@@ -1129,7 +1132,7 @@
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"চ্চাৰ্জ কৰি থকাৰ সময়ত"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"ডক হৈ থাকোঁতে"</string>
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"কেতিয়াও নহয়"</string>
-    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"অফ"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"অফ হৈ আছে"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"ফ\'নটো ড’ক আৰু/বা সুপ্ত অৱস্থাত থাকিলে যি হয় তাক নিয়ন্ত্ৰণ কৰিবলৈ, স্ক্ৰীণ ছেভাৰ অন কৰক৷"</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"ষ্টাৰ্ট কৰাৰ সময়"</string>
     <string name="screensaver_settings_current" msgid="4663846038247130023">"বৰ্তমান ব্যৱহৃতহৈ থকা স্ক্ৰীণছেভাৰ"</string>
@@ -1138,8 +1141,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"স্বয়ংক্ৰিয় উজ্জ্বলতা"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"সক্ৰিয় কৰিবলৈ দাঙক"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"স্তিমিত ডিছপ্লে"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"সদা-সক্ৰিয় / বেটাৰিৰ বৰ্ধিত ব্যৱহাৰ"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"নতুন জাননীসমূহ"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"কেতিয়া দেখুওৱাব"</string>
     <string name="doze_title" msgid="2375510714460456687">"নতুন জাননীসমূহ"</string>
     <string name="doze_summary" msgid="3846219936142814032">"জাননী লাভ কৰাৰ লগে লগে স্ক্ৰীণ জাগ্ৰত কৰক"</string>
@@ -1184,8 +1185,6 @@
       <item quantity="other">ভুল ছিম পিন ক’ড, আপোনাৰ <xliff:g id="NUMBER_1">%d</xliff:g> টা প্ৰচেষ্টা বাকী আছে৷</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"ছিম পিন অপাৰেশ্বন সফল নহ\'ল!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"টে\'বলেটৰ স্থিতি"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"ফ\'নৰ স্থিতি"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"ছিষ্টেম আপডেইট"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android সংস্কৰণ"</string>
@@ -1489,7 +1488,7 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"প\'ৰ্টেবল হ\'টস্প\'ট"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ব্লুটুথ টেডাৰিং"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"টেডাৰ কৰি থকা হৈছে"</string>
-    <string name="tether_settings_title_all" msgid="3058586928118801157">"হ\'টস্প\'ট আৰু টেডাৰিং"</string>
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"হটস্পট আৰু টেডাৰিং"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"হ\'টস্প\'ট  অন হৈ আছে, টেডাৰিং কৰা হৈছে"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"হ\'টস্প\'ট  অন হৈ আছে"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"টেডাৰ কৰি থকা হৈছে"</string>
@@ -2012,7 +2011,7 @@
     <string name="accessibility_vibration_intensity_high" msgid="2543921139337952491">"উচ্চ"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"ছেটিংসমূহ"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"অন হৈ আছে"</string>
-    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"অফ"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"অফ হৈ আছে"</string>
     <string name="captioning_preview_title" msgid="1234015253497016890">"পূৰ্বদৰ্শন"</string>
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"মান্য বিকল্পসমূহ"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"ভাষা"</string>
@@ -2075,7 +2074,7 @@
     <string name="print_menu_item_settings" msgid="6591330373682227082">"ছেটিংসমূহ"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"প্ৰিণ্টাৰ যোগ কৰক"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"অন হৈ আছে"</string>
-    <string name="print_feature_state_off" msgid="7294876968403966040">"অফ"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"অফ হৈ আছে"</string>
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"সেৱা যোগ কৰক"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"প্ৰিণ্টাৰ যোগ কৰক"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"সন্ধান কৰক"</string>
@@ -2106,8 +2105,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"নেপথ্য়ত হোৱা ব্য়ৱহাৰ সীমিত কৰিব নোৱাৰি"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"নেপথ্যৰ কাৰ্যকলাপ সীমিত কৰিবনে?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"আপুনি এটা এপৰ নেপথ্য কাৰ্যকলাপ সীমিত কৰিলে ই অস্বাভাৱিক আচৰণ কৰিব পাৰে"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"যিহেতু এই এপটো বেটাৰি অপ্টিমাইজ কৰিবলৈ ছেট কৰি থোৱা হোৱা নাই, সেয়ে ইয়াক আপুনি সীমিত কৰিব নোৱাৰে।\n\nএপটো সীমিত কৰিবলৈ প্ৰথমে বেটাৰি অপ্টিমাইজেশ্বন অন কৰক।"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"সম্পূৰ্ণ চ্চাৰ্জ হোৱাৰ পিছত স্ক্ৰীণৰ ব্যৱহাৰ"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"স্ক্ৰীণে কৰা খৰচ"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"ম\'বাইল নেটৱৰ্ক স্কেনিং"</string>
@@ -2387,7 +2385,7 @@
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ব্লুটুথ ছেটিংসমূহ আপডেইট কৰা হৈছে"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"অন হৈ আছে"</string>
-    <string name="gadget_state_off" msgid="5220212352953066317">"অফ কৰক"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"অফ হৈ আছে"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"অন কৰি থকা হৈছে"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"অফ কৰি থকা হৈছে"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"ৱাই-ফাই"</string>
@@ -2398,7 +2396,7 @@
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"স্বয়ং"</string>
     <string name="gadget_brightness_state_full" msgid="6814570109772137631">"পূৰ্ণ"</string>
     <string name="gadget_brightness_state_half" msgid="3696671957608774204">"আধা"</string>
-    <string name="gadget_brightness_state_off" msgid="946382262872753084">"অফ"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"অফ হৈ আছে"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"ভিপিএন"</string>
     <string name="credentials_title" msgid="4446234003860769883">"ক্ৰেডেনশ্বিয়েল সঞ্চয়াগাৰ"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"সঞ্চয়াগাৰৰ পৰা ইনষ্টল কৰক"</string>
@@ -2427,6 +2425,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"জৰুৰীকালীন অৱস্থাত ডায়েল কৰা ছিগনেল"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"জৰুৰীকালীন কল কৰোতে কৰিবলগীয়া আচৰণ ছেট কৰক"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"বেকআপ"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"অন হৈ আছে"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"অফ হৈ আছে"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"বেকআপ আৰু পুনঃস্থাপন"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"ব্যক্তিগত ডেটা"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"মোৰ ডেটাৰ বেকআপ লওক"</string>
@@ -2555,7 +2555,7 @@
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g>ৰ ভিতৰত <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"সকলো বাছনি কৰক"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"ডেটাৰ ব্যৱহাৰ"</string>
-    <string name="data_usage_app_summary_title" msgid="4147258989837459172">"এপৰ দ্বাৰা ডেটাৰ ব্যৱহাৰ"</string>
+    <string name="data_usage_app_summary_title" msgid="4147258989837459172">"এপে ব্যৱহাৰ কৰা ডেটা"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"বাহকৰ ডেটা গণনা কাৰ্য আপোনাৰ ডিভাইচতকৈ পৃথক হ’ব পাৰে৷"</string>
     <string name="data_usage_app" msgid="4970478397515423303">"এপৰ ব্যৱহাৰ"</string>
     <string name="data_usage_app_info_label" msgid="3409931235687866706">"এপ্ সম্পৰ্কীয় তথ্য"</string>
@@ -2754,6 +2754,12 @@
       <item quantity="other">প্ৰমাণপত্ৰ পৰীক্ষা কৰক</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"একাধিক ব্যৱহাৰকাৰী"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"ব্যৱহাৰকাৰী আৰু প্ৰ\'ফাইলসমূহ"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ব্যৱহাৰকাৰী বা প্ৰ\'ফাইল যোগ কৰক"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"ব্যৱহাৰকাৰী যোগ কৰক"</string>
@@ -2936,14 +2942,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ডেটাৰ ব্যৱহাৰ"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"হ\'টস্প\'ট"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"সংযোজিত ডিভাইচসমূহ"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"ব্লুটুথ, গাড়ী চালনা ম\'ড, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"ব্লুটুথ, গাড়ী চালনা ম\'ড"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"ব্লুটুথ, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"ব্লুটুথ"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"এপ্ আৰু জাননীসমূহ"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"অনুমতি, ডিফ\'ল্ট এপসমূহ"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"একাউণ্টসমূহ"</string>
@@ -2960,7 +2962,6 @@
     <string name="keywords_home" msgid="294182527446892659">"লঞ্চাৰ, ডিফ\'ল্ট, এপ্"</string>
     <string name="keywords_display" msgid="8910345814565493016">"স্ক্ৰীণ, টাচ্চ স্ক্ৰীণ"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"অনুজ্জ্বল স্ক্ৰীণ, টাচ্চস্ক্ৰীণ, বেটাৰি, উজ্জ্বল"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"অনুজ্জ্বল স্ক্ৰীণ, টাচ্চস্ক্ৰীণ, বেটাৰি"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"অনুজ্জ্বল স্ক্ৰীণ, ৰাতি, গাঢ়তা, নাইট শ্বিফট, উজ্জ্বলতা, স্ক্ৰীণৰ ৰং, ৰং"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"বেকগ্ৰাউণ্ড, ব্যক্তিগত কৰক, নিজৰ উপযোগী কৰক"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ফণ্টৰ আকাৰ"</string>
@@ -3001,8 +3002,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"নেটৱৰ্ক, ম\'বাইল নেটৱৰ্কৰ স্থিতি, সেৱাৰ স্থিতি, সংকেতৰ ক্ষমতা, ম\'বাইল নেটৱৰ্কৰ প্ৰকাৰ, ৰ\'মিং, আইচিচিআইডি"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"ক্ৰমিক নম্বৰ, হাৰ্ডৱেৰৰ সংস্কৰণ"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"androidৰ সুৰক্ষা পেটচ্চ স্তৰ, বেইছবেণ্ড সংস্কৰণ, কাৰ্ণেল সংস্কৰণ"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"স্তিমিত ডিছপ্লে, বন্ধ স্ক্ৰীণৰ ডিছপ্লে"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"ফিংগাৰপ্ৰিণ্ট"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"ঘূৰোৱা, লুটিওৱা, ঘূৰ্ণন, প\'ৰ্ট্ৰেইট, লেণ্ডস্কেইপ, দিশ, উলম্ব, অনুভূমিক"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"আপগ্ৰেইড, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"ডিএনডি, সূচী, জাননী, অৱৰোধ, নীৰৱতা, কম্পন, নিদ্ৰা, কৰ্ম, ফ\'কাছ, ধ্বনি, মিউট, দিন, কৰ্মদিন, কৰ্মদিনৰ ৰাতি, কাৰ্যক্ৰম"</string>
@@ -3085,18 +3090,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"দৃশ্যমান সংকেতৰ অনুমতি দিয়ক"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"যেতিয়া অসুবিধা নিদিব ম\'ড অন অৱস্থাত থাকে"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"জাননীসমূহ"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"জাননীসমূহ নীৰৱে দেখুৱাওক"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"জাননীসমূহ মিউট কৰা হ\'ব"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"জাননীৰ লগত জড়িত ধ্বনি নিষেধ"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"আপুনি স্ক্ৰীণত জাননী দেখা পাব"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"জাননী আহিলে আপোনাৰ ফ\'নে কোনো ধ্বনি বা কম্পন নকৰিব।"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"জাননীসমূহ লুকুৱাওক"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"আপুনি নতুন বা পুৰণি জাননীসমূহ দেখা নাপাব"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"জাননীৰ লগত জড়িত দৃশ্য বা ধ্বনি নিষেধ"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"আপুনি জাননী নেদেখিব বা নুশুনিব"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"আপোনাৰ ফ’নে নতুন বা পুৰণি জাননীসমূহ নেদেখুৱাব আৰু কোনো ধ্বনি বা কম্পন নকৰিব। আপুনি নিজৰ স্ক্ৰীণৰ ওপৰৰ পৰা তললৈ ছোৱাইপ কৰোঁতে জাননীসমূহ দেখুওৱা নহ’ব।\n\nমনত ৰাখিব যে, তেতিয়াও ফ\'নৰ কাৰ্যকলাপৰ বাবে প্ৰয়োজনীয় জাননীসমূহ আৰু ইয়াৰ স্থিতি দেখুওৱা হ\'ব।"</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"নিজৰ উপযোগিতা অনুসৰি কৰা ছেটিং"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"নিজৰ উপযোগিতা অনুসৰি কৰা ছেটিং সক্ষম কৰক"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"নিজৰ উপযোগিতা অনুসৰি কৰা ছেটিং আঁতৰাওক"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"দেখা দিব"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"জাননীৰ লগত জড়িত ধ্বনি নিষেধ"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"আংশিকভাৱে লুকুওৱা হৈছে"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"লুকুওৱা হৈছে"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"জাননীৰ লগত জড়িত দৃশ্য বা ধ্বনি নিষেধ"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"নিজৰ উপযোগিতা অনুসৰি কৰা অৱৰোধসমূহ"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"যেতিয়া স্ক্ৰীণখন অন হৈ থাকে"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"যেতিয়া স্ক্ৰীণখন অফ হৈ থাকে"</string>
@@ -3155,19 +3160,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"মিউট কৰা হৈছে, কিন্তু <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> আৰু <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>ক অনুমতি দিয়ক"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"বাৰ্তা, কাৰ্যক্ৰম আৰু সোঁৱৰণিসমূহ"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"অসুবিধা নিদিব ম\'ড অন থকা অৱস্থাত আপুনি ওপৰত অনুমতি দিয়া বস্তুবোৰৰ বাহিৰে বাৰ্তা, সোঁৱৰণী আৰু কাৰ্যক্ৰমবোৰ মিউট কৰা হ\'ব। আপুনি নিজৰ বন্ধু, পৰিয়ালৰ সদস্য় বা অন্য় সম্পৰ্কসমূহক আপোনাৰ সৈতে যোগাযোগ কৰিবৰ বাবে অনুমতি দিবলৈ ছেটিংসমূহ মিলাব পাৰে।"</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"হ’ল"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"ছেটিংবোৰ"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"জাননীৰ লগত জড়িত দৃশ্য বা ধ্বনি নিষেধ"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"জাননীৰ কাৰণে কোনো ধ্বনি নাই"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"আপুনি আৰু জাননী নেদেখিব বা জাননীৰ ধ্বনি নুশুনিব। তৰাযুক্ত সম্পৰ্ক আৰু দুনাই কল কৰোঁতাৰ পৰা অহা কলত অনুমতি দিয়া হৈছে।"</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(বৰ্তমানৰ ছেটিং)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"অসুবিধা নিদিব-ৰ জাননীৰ ছেটিংসমূহ সলনি কৰিব নেকি?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"কৰ্মস্থানৰ প্ৰ’ফাইলৰ ধ্বনিসমূহ"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"ব্যক্তিগত প্ৰ’ফাইলৰ ধ্বনি ব্যৱহাৰ কৰক"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"কৰ্মস্থানৰ আৰু ব্যক্তিগত প্ৰ\'ফাইলৰ ধ্বনি একেই"</string>
@@ -3336,17 +3335,12 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> পৰা <xliff:g id="END">%2$s</xliff:g> লৈ"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"কলসমূহ"</string>
-    <!-- no translation found for zen_mode_calls_title (623395033931747661) -->
-    <skip />
+    <string name="zen_mode_calls_title" msgid="623395033931747661">"কলৰ অনুমতি দিয়ক"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"অসুবিধা নিদিব ম\'ড অন থকা অৱস্থাত অন্তৰ্গামী কলবোৰক অৱৰোধ কৰা হয়। আপুনি নিজৰ বন্ধু, পৰিয়ালৰ সদস্য় বা অন্য় সম্পৰ্কসমূহক আপোনাৰ সৈতে যোগাযোগ কৰিবৰ বাবে অনুমতি দিবলৈ ছেটিংসমূহ মিলাব পাৰে।"</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"তৰাযুক্ত সম্পৰ্কসমূহ"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">আৰু অইন <xliff:g id="NUM_PEOPLE">%d</xliff:g>টা</item>
-      <item quantity="other">আৰু অইন <xliff:g id="NUM_PEOPLE">%d</xliff:g>টা</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"বাৰ্তাসমূহ"</string>
-    <!-- no translation found for zen_mode_messages_title (7729380010396411129) -->
-    <skip />
+    <string name="zen_mode_messages_title" msgid="7729380010396411129">"বাৰ্তাৰ অনুমতি দিয়ক"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"বাৰ্তাবোৰ"</string>
     <string name="zen_mode_selected_messages" msgid="1047355526202106114">"কিছুমান বাৰ্তা"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"সকলোৰ পৰা"</string>
@@ -3360,19 +3354,15 @@
     <string name="zen_mode_media" msgid="8808264142134422380">"মিডিয়া"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"স্পৰ্শৰ ধ্বনিবোৰ"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"সোঁৱৰণিসমূহ"</string>
-    <!-- no translation found for zen_mode_reminders_title (2345044406347406902) -->
-    <skip />
+    <string name="zen_mode_reminders_title" msgid="2345044406347406902">"ৰিমাইণ্ডাৰৰ অনুমতি দিয়ক"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"কাৰ্যক্ৰমসমূহ"</string>
-    <!-- no translation found for zen_mode_events_title (5597241655883329085) -->
-    <skip />
+    <string name="zen_mode_events_title" msgid="5597241655883329085">"কাৰ্যক্ৰমৰ অনুমতি দিয়ক"</string>
     <string name="zen_mode_all_callers" msgid="2378065871253871057">"সকলোৰে পৰা"</string>
     <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"সম্পৰ্কসূচী"</string>
     <string name="zen_mode_starred_callers" msgid="1023167821338514140">"তৰাযুক্ত সম্পৰ্কবোৰ"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"পুনৰাই কল কৰা লোকসকল"</string>
-    <!-- no translation found for zen_mode_repeat_callers_title (8553876328249671783) -->
-    <skip />
-    <!-- no translation found for zen_mode_calls_summary_one (3972333792749874863) -->
-    <skip />
+    <string name="zen_mode_repeat_callers_title" msgid="8553876328249671783">"পুনৰাই কল কৰা লোকসকলক অনুমতি দিয়ক"</string>
+    <string name="zen_mode_calls_summary_one" msgid="3972333792749874863">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g>ৰ পৰা"</string>
     <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> আৰু <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>ৰ পৰা মাত্ৰ"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"যদিহে একেজন ব্যক্তিয়ে <xliff:g id="MINUTES">%d</xliff:g> মিনিটৰ ভিতৰত দ্বিতীয়বাৰ কল কৰে"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"কাষ্টম"</string>
@@ -3445,7 +3435,7 @@
     <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>ৰ <xliff:g id="SIZE">%1$s</xliff:g> ব্যৱহাৰ হ\'ল"</string>
     <string name="storage_type_internal" msgid="6042049833565674948">"আভ্যন্তৰীণ সঞ্চয়াগাৰ"</string>
     <string name="storage_type_external" msgid="7738894330670001898">"বাহ্যিক সঞ্চয়াগাৰ"</string>
-    <string name="app_data_usage" msgid="7942375313697452803">"এপ্ ডেটাৰ ব্যৱহাৰ"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"এপে ব্যৱহাৰ কৰা ডেটা"</string>
     <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="DATE">%2$s</xliff:g>ৰ পিছত <xliff:g id="SIZE">%1$s</xliff:g> ব্যৱহৃত হৈছে"</string>
     <string name="storage_used" msgid="7128074132917008743">"সঞ্চয়াগাৰ ব্যৱহাৰ কৰা হৈছে"</string>
     <string name="change" msgid="6657848623929839991">"সলনি কৰক"</string>
@@ -3781,15 +3771,13 @@
     <string name="color_temperature" msgid="2070126836910615605">"ৰঙৰ উষ্মতা শীতল"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"শীতল ডিছপ্লে ৰং ব্যৱহাৰ কৰক"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"ৰঙৰ সাল-সলনি প্ৰযোগ্য হ\'বলৈ স্ক্ৰীণ অফ কৰক"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"সংযোগ নিৰীক্ষক"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitorএ সংযোগ সম্পৰ্কীয় কিবা বিসংগতি দেখা পালে লগ সংগ্ৰহ কৰিব আৰু ব্যৱহাৰকাৰীক বাগ ফাইল কৰিবলৈ মনত পেলাই দিব"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"সংযোগ নিৰীক্ষকৰ সাল-সলনি প্ৰযোজ্য কৰিবলৈ ডিভাইচ ৰিবুট কৰক"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"কেমেৰা লেজাৰ ছেন্সৰ"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"ডিফ\'ল্ট হিচাপে লজিকেল কেমেৰা ছেট কৰা আছে"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"স্বয়ংক্ৰিয় ছিষ্টেম আপডেটসমূহ"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"ডিভাইচটো ৰিষ্টাৰ্ট হ\'লে আপডেট প্ৰয়োগ কৰক"</string>
     <string name="usage" msgid="2977875522080448986">"ব্যৱহাৰ"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"ম\'বাইল ডেটাৰ ব্যৱহাৰ"</string>
-    <string name="app_cellular_data_usage" msgid="5468472735806533448">"এপ্ ডেটাৰ ব্যৱহাৰ"</string>
+    <string name="app_cellular_data_usage" msgid="5468472735806533448">"এপে ব্যৱহাৰ কৰা ডেটা"</string>
     <string name="wifi_data_usage" msgid="771603760674507659">"ৱাই-ফাই ডেটাৰ ব্যৱহাৰ"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"ইথাৰনেট ডেটাৰ ব্যৱহাৰ"</string>
     <string name="wifi" msgid="1081550856200013637">"ৱাই-ফাই"</string>
@@ -3800,7 +3788,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> ডেটা সতৰ্কবাণী"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> ডেটা ব্যৱহাৰৰ সকীয়নি / <xliff:g id="ID_2">%2$s</xliff:g> ডেটাৰ সীমা"</string>
     <string name="billing_cycle" msgid="6614597736285325497">"ডেটা ব্যৱহাৰৰ সকীয়নি আৰু সীমা"</string>
-    <string name="app_usage_cycle" msgid="8877223251648092131">"এপ্ ডেটাৰ ব্যৱহাৰৰ চক্ৰ"</string>
+    <string name="app_usage_cycle" msgid="8877223251648092131">"এপে ব্যৱহাৰ কৰা ডেটাৰ চক্ৰ"</string>
     <string name="cell_data_warning" msgid="1985956818884847057">"ডেটাৰ ব্য়ৱহাৰ সম্পৰ্কীয় সকীয়নি <xliff:g id="ID_1">^1</xliff:g>"</string>
     <string name="cell_data_limit" msgid="1578367585799358854">"ডেটাৰ সীমা <xliff:g id="ID_1">^1</xliff:g>"</string>
     <string name="cell_data_warning_and_limit" msgid="6888825370687743208">"ডেটাৰ ব্যৱহাৰ সম্পৰ্কীয় সকীয়নি <xliff:g id="ID_1">^1</xliff:g> / ডেটাৰ সীমা <xliff:g id="ID_2">^2</xliff:g>"</string>
@@ -3981,7 +3969,7 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"জাননীসমূহ চাবলৈ আপোনাৰ ডিভাইচৰ পিছফালে থকা ফিংগাৰপ্ৰিণ্ট ছেন্সৰক তলৰ ফালে ছুৱাইপ কৰক।"</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"জাননীসমূহ খৰতকীয়াকৈ চাওক"</string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"অন কৰক"</string>
-    <string name="gesture_setting_off" msgid="5230169535435881894">"বন্ধ"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"অফ হৈ আছে"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"বুটল\'ডাৰক ইতিমধ্যে আনলক কৰা হৈছে"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="3361344735430813695">"প্ৰথমে ইণ্টাৰনেটলৈ সংযোগ কৰক"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="2479038689567925511">"ইণ্টাৰনেটৰ সৈতে সংযোগ কৰক বা আপোনাৰ বাহকৰ লগত যোগাযোগ কৰক"</string>
@@ -4094,8 +4082,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"স্বয়ংপূৰ্তি সেৱা"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"স্বয়ং, পূৰ কৰা, স্বয়ংপূৰ্তি"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;আপুনি এই এপটোক বিশ্বাস কৰাটো নিশ্চিত কৰক&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; এ স্বয়ংভৰ্তিৰ বাবে নিৰ্ধাৰণ কৰিবলৈ আপোনাৰ স্ক্ৰীণত দেখা দিয়া বস্তুবোৰ ব্য়ৱহাৰ কৰে।"</string>
-    <string name="device_theme" msgid="4571803018917608588">"ডিভাইচৰ থিম"</string>
+    <string name="color_theme" msgid="1535685696756738324">"ৰঙৰ থীম"</string>
     <string name="default_theme" msgid="7085644992078579076">"ডিফ\'ল্ট"</string>
+    <string name="device_theme" msgid="4571803018917608588">"ডিভাইচৰ থিম"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"স্বয়ংক্ৰিয় (ৱালপেপাৰৰ ওপৰত নিৰ্ভৰশীল)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"পাতল"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"গাঢ়"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"নেটৱৰ্কৰ নাম"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"স্থিতি বাৰত নেটৱৰ্কৰ নাম দেখুৱাওক"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"সঞ্চয়াগাৰ পৰিচালক: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4107,7 +4099,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"বাহকৰ প্ৰ\'ভিজনিং তথ্য"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"কেৰিয়াৰ প্ৰভিজনিং সূচনা কৰক"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"অসুবিধা নিদিব-ক আপডেট কৰক"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"মনোযোগ বৰ্তাই ৰাখিবলৈ জাননীসমূহ বন্ধ কৰক"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"মনোযোগ বৰ্তাই ৰাখিবলৈ জাননী বন্ধ কৰক"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"নতুন আৰু আকৰ্ষণীয় কি আছে?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"আপোনাৰ নতুন ফ\'নটো চলাই চাওক"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"আপোনাৰ নতুন টে\'বলেটটো চলাই চাওক"</string>
diff --git a/res/values-az/arrays.xml b/res/values-az/arrays.xml
index 236362f..663c135 100644
--- a/res/values-az/arrays.xml
+++ b/res/values-az/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Həmişə aktiv"</item>
     <item msgid="6385301106124765323">"Həmişə deaktiv"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 6e1d1e5..6a43ae6 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Planşetə yaxınlıqdakı Bluetooth cihazları ilə əlaqə yaratmaq icazəsi verin"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Cihaza yaxınlıqdakı Bluetooth cihazları ilə əlaqə yaratmaq icazəsi verin"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Telefona yaxınlıqdakı Bluetooth cihazları ilə əlaqə yaratmaq icazəsi verin"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Bluetooth A2DP proqram köçürülməsini deaktiv edin"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Cihaz yenidən başladılsın?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Bu ayarı dəyişmək üçün cihazı yenidən başlatmalısınız."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Yenidən başladın"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Ləğv edin"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Əlçatan media cihazları"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Əlçatan zəng cihazları"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Ən son qoşulmuş cihazlar"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Bağlantı tərcihləri"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Əvvəl qoşulmuş cihazlar"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Əvvəl qoşulmusunuz"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Vaxt və tarix"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Vaxt zonasını seçin"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Daxil etdiyiniz port etibarlı deyil."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP proksi brauzer tərəfindən istifadə olunur və digər tətbiqlər tərəfindən istifadə edilə bilməz."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL Buraxılışı (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL Buraxılışı (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Xananın məkan infosu (tövsiyə olunmur):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Qonşunun mobil infosu (tövsiyə olunmur):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE Fiziki Kanal Konfiqurasiyası:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Mobil İnfo Təzələmə Ölçüsü:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Bütün Mobil Ölçmə İnfosu:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Data bağlantısı Real Zaman İnfosu:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Data Xidməti:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaminq:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Avtomatik parlaqlıq"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Oyatmaq üçün qaldırın"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ətraf mühit displeyi"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Həmişə aktiv / Batareya istifadəsi artırıldı"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Yeni bildiriş"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Nə vaxt göstərmək lazımdır"</string>
     <string name="doze_title" msgid="2375510714460456687">"Yeni bildiriş"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Bildirişlər aldığınız zaman ekran oyansın"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">Yanlış SIM PIN kodu, cihazınızı kiliddən çıxarmaq üçün operatorunuzla əlaqə saxlamadan öncə <xliff:g id="NUMBER_0">%d</xliff:g> cəhdiniz qalır.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM PIN əməliyyatı alınmadı!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Planşet statusu"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefon statusu"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Sistem güncəlləmələri"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android versiyası"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Arxa fon istifadəsi məhdudlaşdırıla bilər"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Arxa fon fəaliyyəti məhdudlaşdırılsın?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Tətbiqin arxa fon fəaliyyətini məhdudlaşdırsanız, o səhv işləyə bilər"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Bu tətbiqdə batareyanın optimallaşdırılması ayarlanmadığına görə onu məhdudlaşdıra bilməzsiniz.\n\nTətbiqi məhdudlaşdırmaq üçün əvvəlcə batareya optimallaşdırmasını aktiv edin."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Tam doldurmadan sonrakı ekran istifadəsi"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Ekranın enerji sərfiyyatı"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobil şəbəkənin skan edilməsi"</string>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Təcili zəng siqnalı"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Təcili zəng olduqda davranış təyin et"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Yedək"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Aktiv"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Deaktiv"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Yedəkləyin &amp; bərpa edin"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Şəxsi məlumat"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Məlumatlarımın rezervlə"</string>
@@ -2761,6 +2766,12 @@
       <item quantity="one">Sertifikatı yoxlayın</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Çoxsaylı istifadəçilər"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"İstifadəçilər və profillər"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"İstifadəçi və ya profil əlavə edin"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"İstifadəçi əlavə edin"</string>
@@ -2943,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"data istifadəsi"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Qoşulmuş cihazlar"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, sürücülük rejimi, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, sürücülük rejimi"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Tətbiq və bildirişlər"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"İcazələr, defolt tətbiqlər"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Hesablar"</string>
@@ -2967,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"işə salan, defolt, tətbiqlər"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ekran, taçskrin"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"qara ekran, toxunuş ekranı, batareya, parlaq"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"tutqun ekran, taçskrin, batareya"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"qara ekran, gecə, rəng, gecə növbəsi, parlaqlıq, ekran rəngi, rəng, rəng"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"arxa fon, özəlləşdirin, ekranı fərdiləşdirin"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"mətn ölçüsü"</string>
@@ -3008,8 +3014,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"şəbəkə, mobil şəbəkə vəziyyəti, servis vəziyyəti, siqnalın gücü, mobil şəbəkə növü, roaminq, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"seriya nömrəsi, proqram versiyası"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android təhlükəsizliyinin yenilənmə səviyyəsi, baseband versiyası, kernel versiyası"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambient displey, Kilid ekranı"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"barmaq izi"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"qara ekran, sensor ekran, batareya, yeni parlaqlıq, dinamik parlaqlıq"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"fırladın, çevirin, fırlatma, portret, mənzərə, orientir, vertikal, horizontal"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"güncəlləyin, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, cədvəl, bildiriş, blok, səssiz, vibrasiya, yuxu, iş, fokus, səs, səssiz, gün, həftə içi, həftə sonu, həftə gecəsi, tədbir"</string>
@@ -3092,18 +3101,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Görünən siqnallara icazə verin"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"\"Narahat Etməyin\" aktiv olan zaman"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Bildirişlər"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Bildirişləri səssiz göstərin"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Bildirişlər susduralacaq"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Bildirişlər səs çıxarmır"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Ekranda bildirişləri görəcəksiniz"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Bildirişlər gəldikdə telefon səs çıxarmayacaq və vibrasiya etməyəcək."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Bildirişləri gizlədin"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Yeni və ya mövcud bildirişləri görməyəcəksiniz"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Bildirişlər görünməyəcək və səs çıxartmayacaq"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Bildirişləri görməyəcəksiniz və ya eşitməyəcəksiniz"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Telefon yeni və ya mövcud bildirişləri göstərməyəcək, eyni zamanda səs çıxarmayacaq və ya vibrasiya etməyəcək. Ekranın yuxarısından sürüşdürdüyünüz zaman bildirişlər görünməyəcək.\n\nYadda saxlayın ki, telefon fəaliyyəti və status üçün mühüm bildirişlər görünəcək."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Fərdi"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Fərdi ayarı aktiv edin"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Fərdi ayarı silin"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Görünəcək"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Bildirişlər səs çıxarmır"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Qismən gizlədilib"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Gizli"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Bildirişlər görünməyəcək və səs çıxartmayacaq"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Fərdi məhdudiyyətlər"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Ekran yanılı olduqda"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Ekran sönülü olduqda"</string>
@@ -3162,19 +3171,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Səssizdir, <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> və <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> icazəli olamlıdır"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mesaj, tədbir və xatırlatmalar"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"\"Narahat Etməyin\" aktiv olduğu zaman yuxarıda seçdiyiniz elementlər istisna olmaqla mesaj, xatırlatma və tədbirlər səssiz ediləcək. Dostlar, ailə və digər kontaktların Sizinlə əlaqə saxlaması üçün ayarları nizamlaya bilərsiniz."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Hazırdır"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Ayarlar"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Bildirişlər görünməyəcək və səs çıxartmayacaq"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Bildirişlər səs çıxarmır"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Bildirişlərə baxa və ya eşidə bilməyəcəksiniz. Ulduzlanmış kontaktlar və təkrarlanan zənglər icazəlidir."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Cari ayarlar)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"\"Narahat Etməyin\" bildiriş ayarları dəyişdirilsin?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"İş profili səsləri"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Şəxsi profil səslərini istifadə edin"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"İş və şəxsi profil səsləri eynidir"</string>
@@ -3346,10 +3349,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Zənglərə icazə verin"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"\"Narahat Etməyin\" aktiv olduğu zaman gələn zənglər blok edilir. Dostlar, ailə və digər kontaktların Sizinlə əlaqə saxlaması üçün ayarları nizamlaya bilərsiniz."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Ulduzlanmış kontaktlar"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">və <xliff:g id="NUM_PEOPLE">%d</xliff:g> digəri</item>
-      <item quantity="one">və 1 digəri</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mesajlar"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Mesajlara icazə verin"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Mesajlaşma"</string>
@@ -3779,10 +3779,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Sərin rəng temperaturu"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Serinləşdirici ekran rənglərini istifadə edin"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Rəng dəyişikliyini tətbiq etmək üçün ekranı söndürün"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Bağlantı Monitoru"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Bağlantı Monitoru bağlantı problemi aşkarladıqda qeydləri əldə edərək istifadəçiyə baq bildirməsi üçün bildiriş göndərəcək"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Bağlantı monitoruna dəyişiklik etmək üçün cihazı yenidən başladın"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kamera Lazer Sensoru"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Defolt olaraq Məntiqi Kamera"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Avtomatik sistem güncəlləmələri"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Cihaz yenidən başladıqda güncəlləmələri tətbiq edin"</string>
     <string name="usage" msgid="2977875522080448986">"İstifadə"</string>
@@ -4092,8 +4090,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Avtodoldurma xidməti"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"avtomatik, doldurmaq, avtomatik doldurmaq"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Bu tətbiqə etibar etdiyinizə əmin olun&lt;b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=tətbiq_adı nümunə=Google Avtodoldurma &gt;%%1$s&lt;/xliff:g&gt; nəyin avtomatik doldurula biləcəyini müəyyən etmək üçün ekrandakılardan istifadə edir."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Cihaz teması"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Rəng teması"</string>
     <string name="default_theme" msgid="7085644992078579076">"Defolt"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Cihaz teması"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Avtomatik (divar kağızına əsasən)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"İşıq"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Tünd"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Şəbəkə adı"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Status panelində şəbəkə adı göstərilsin"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Yaddaş Meneceri: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4105,7 +4107,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operator Təchizat Məlumatı"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Operator Təchizatlanmasını Tətikləyin"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"\"Narahat Etməyin\" rejimini yeniləyin"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Fokuslanmaq üçün bildirişləri gizlədin"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Foksulanmağa davam etmək üçün bildirişləri dayandırın"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Yeni və maraqlı olan nədir?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Yeni telefonunuz ilə tanış olun"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Yeni planşetiniz ilə tanış olun"</string>
diff --git a/res/values-b+sr+Latn/arrays.xml b/res/values-b+sr+Latn/arrays.xml
index 4aa902a..91e3a64 100644
--- a/res/values-b+sr+Latn/arrays.xml
+++ b/res/values-b+sr+Latn/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Uvek uključeno"</item>
     <item msgid="6385301106124765323">"Uvek isključeno"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index c898b8b..1fd9cc4 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -174,6 +174,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Omogućite tabletu da komunicira sa Bluetooth uređajima u blizini"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Omogućite uređaju da komunicira sa Bluetooth uređajima u blizini"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Omogućite telefonu da komunicira sa Bluetooth uređajima u blizini"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Onemogući Bluetooth A2DP hardversko rasterećenje"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Restartujete uređaj?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Restartujte uređaj da biste promenili ovo podešavanje."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Restartuj"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Otkaži"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Dostupni medijski uređaji"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Dostupni uređaji za pozivanje"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Trenutno povezani"</string>
@@ -183,6 +188,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Podešavanja veze"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Prethodno povezani uređaji"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Prethodno povezani"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Datum i vreme"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Izbor vremenske zone"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -208,11 +215,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Uneli ste nevažeći port."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Pregledač koristi HTTP proksi, ali druge aplikacije ne mogu da ga koriste."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL propusni opseg (kb/s):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL propusni opseg (kb/s):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Informacije o lokaciji predajnika (zastarelo):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Informacije o susednom predajniku (zastarelo):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Konfiguracija LTE fizičkog kanala:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Brzina osvežavanja informacija o predajniku:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Sve informacije o merenju za predajnik:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Informacije o vezi za prenos podataka u realnom vremenu:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Usluga prenosa podataka:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1162,8 +1170,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatski nivo osvetljenosti"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Podigni za aktivaciju"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambijentalni ekran"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Uvek uključeno/veća potrošnja baterije"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nova obaveštenja"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kada da se prikazuje"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nova obaveštenja"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Probudi ekran kada primim obaveštenja"</string>
@@ -1209,8 +1215,6 @@
       <item quantity="other">Netačan SIM PIN kôd. Imate još <xliff:g id="NUMBER_1">%d</xliff:g> pokušaja.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Radnja sa SIM PIN kodom nije uspela!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status tableta"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Status telefona"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Ažuriranja sistema"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android verzija"</string>
@@ -2140,8 +2144,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Aplikacije u pozadini ne možete da ograničite"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Želite li da ograničite aktivnosti u pozadini?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ako ograničite aktivnosti aplikacije u pozadini, možda će se ponašati neočekivano."</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Apl. nije podešena za optimizaciju baterije, pa ne možete da je ograničite. \n\nZa ogr. apl. uključite optimizaciju baterije."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Korišćenje ekrana od potpunog punjenja"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Potrošnja za ekran"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Skeniranje mobilnih mreža"</string>
@@ -2468,6 +2471,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Signal za hitne pozive"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Podešavanje ponašanja kada se uspostavlja hitan poziv"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Rezervne kopije"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Uključeno"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Isključeno"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Rezervna kopija i resetovanje"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Lični podaci"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Pravljenje rezervnih kopija podataka"</string>
@@ -2798,6 +2803,12 @@
       <item quantity="other">Proveri sertifikate</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Više korisnika"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Korisnici i profili"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Dodaj korisnika ili profil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Dodaj korisnika"</string>
@@ -2981,14 +2992,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"potrošnja podataka"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Povezani uređaji"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, režim za vožnju, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, režim za vožnju"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacije i obaveštenja"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Dozvole, podrazumevane aplikacije"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Nalozi"</string>
@@ -3005,7 +3012,6 @@
     <string name="keywords_home" msgid="294182527446892659">"pokretač, podrazumevano, aplikacije"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ekran, dodirni ekran"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"zatamni ekran, dodirni ekran, baterija, svetlo"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"zatamniti ekran, dodirni ekran, baterija"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"zatamni ekran, noć, senka, treća smena, osvetljenost, boja ekrana, boja"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"pozadina, personalizovati, prilagoditi ekran"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"veličina teksta"</string>
@@ -3046,8 +3052,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"mreža, stanje mobilne mreže, stanje usluge, jačina signala, tip mobilne mreže, roming, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"serijski broj, verzija hardvera"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"nivo bezbednosne zakrpe za android, verzija osnovnog propusnog opsega, verzija jezgra"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambijentalni ekran, prikaz na zaključanom ekranu"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"digitalni otisak"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"rotiraj, obrni, rotacija, uspravno, vodoravno, položaj, vertikalno, horizontalno"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"nadogradnja, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"ne uznemiravaj, raspored, obaveštenja, blokiraj, tišina, vibracija, spavanje, rad, koncentracija, zvuk, isključi zvuk, dan, radni dan, vikend, radni dan uveče, događaj"</string>
@@ -3131,18 +3141,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Dozvoli vizuelne signale"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Kada je uključen režim Ne uznemiravaj"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Obaveštenja"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Prikazuj obaveštenja bez zvuka"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Zvuk obaveštenja će biti isključen"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Bez zvučnog signala za obaveštenja"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Videćete obaveštenja na ekranu"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Telefon neće emitovati zvuk ni vibrirati kada stignu obaveštenja."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Sakrij obaveštenja"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Nećete videti nova ni postojeća obaveštenja"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Bez zvučnog signala ili vizuelnog obaveštenja"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Nećete videti niti čuti obaveštenja"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Telefon neće prikazivati nova ili postojeća obaveštenja i neće emitovati zvuk ni vibrirati. Obaveštenja se neće prikazivati kada prevučete nadole od vrha ekrana.\n\nImajte u vidu da će se važna obaveštenja o aktivnostima i statusu telefona i dalje prikazivati."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Prilagođeno"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Omogući prilagođeno podešavanje"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Ukloni prilagođeno podešavanje"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Prikazivaće se"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Bez zvučnog signala za obaveštenja"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Delimično skriveno"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Skriveno"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Bez zvučnog signala ili vizuelnog obaveštenja"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Prilagođena ograničenja"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Kada je ekran uključen"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Kada je ekran isključen"</string>
@@ -3203,19 +3213,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Zvuk je isključen, ali dozvoli za: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> i <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Poruke, događaji i podsetnici"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Kada je uključen režim Ne uznemiravaj, zvukovi obaveštenja za poruke, podsetnike i događaje će biti isključeni, osim za stavke koje ste dozvolili iznad. Možete da prilagodite podešavanja da biste dozvolili prijateljima, članovima porodice ili drugim kontaktima da vas kontaktiraju."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Gotovo"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Podešavanja"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Bez zvučnog signala ili vizuelnog obaveštenja"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Bez zvučnog signala za obaveštenja"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Nećete videti niti čuti obaveštenja. Pozivi od kontakata sa zvezdicom i ponovnih pozivalaca su dozvoljeni."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(trenutno podešavanje)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Želite li da promenite podešavanja obaveštenja za režim Ne uznemiravaj?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Zvuci za profil za Work"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Koristi zvuke ličnog profila"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Zvukovi profila za Work su isti kao i zvukovi za lične profile"</string>
@@ -3391,11 +3395,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Dozvoli pozive"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Kada je uključen režim Ne uznemiravaj, dolazni pozivi su blokirani. Možete da prilagodite podešavanja da biste dozvolili prijateljima, članovima porodice ili drugim kontaktima da vas kontaktiraju."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Kontakti sa zvezdicom"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">i još <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="few">i još <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="other">i još <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Poruke"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Dozvoli poruke"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Poruke"</string>
@@ -3838,10 +3838,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Hladna temperatura boje"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Koristi hladnije boje ekrana"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Da biste primenili promenu boje, isključite ekran"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"ConnectivityMonitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor će prikupljati evidenciju kada otkrije problem sa povezivanjem i zatražiće od korisnika da prijavi grešku"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Restartujte uređaj da biste primenili promenu ConnectivityMonitor-a"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Senzor lasera Kamere"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Logička kamera kao podrazumevana"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatska ažuriranja sistema"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Primeni ispravke kad se uređaj ponovo pokrene"</string>
     <string name="usage" msgid="2977875522080448986">"Potrošnja"</string>
@@ -4165,8 +4163,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Usluga automatskog popunjavanja"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatski, popunjavanje, automatsko popunjavanje"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Uverite se da je ova aplikacija pouzdana&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google automatsko popunjavanje&gt;%1$s&lt;/xliff:g&gt; koristi sadržaj ekrana za utvrđivanje podataka koji mogu automatski da se popune."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Tema uređaja"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Tema sa bojom"</string>
     <string name="default_theme" msgid="7085644992078579076">"Podrazumevana"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Tema uređaja"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automatska (na osnovu pozadine)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Svetla"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Tamna"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Naziv mreže"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Prikazuje naziv mreže na statusnoj traci"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Menadžer memorijskog prostora: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4178,7 +4180,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informacije o dodeli mobilnog operatera"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Pokretanje dodele mobilnog operatera"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Ažurirajte režim Ne uznemiravaj"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Sakrij obaveštenja radi bolje koncentracije"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pauzirajte obaveštenja radi bolje koncentracije"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Šta je novo i uzbudljivo?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Upoznajte novi telefon"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Upoznajte novi tablet"</string>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index bbdd8ed..a6c6b9d 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Заўсёды ўключана"</item>
     <item msgid="6385301106124765323">"Заўсёды выключана"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index ccdfda7..be0e3c2 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -175,6 +175,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Дазволіць планшэту абменьвацца данымі з іншымі прыладамі праз Bluetooth"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Дазволіць прыладзе абменьвацца данымі з іншымі прыладамі праз Bluetooth"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Дазволіць тэлефону абменьвацца данымі з іншымі прыладамі праз Bluetooth"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Адключыць выгрузку Bluetooth A2DP"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Перазапусціць?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Каб змяніць гэту наладу, трэба перазапусціць прыладу."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Перазапуск"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Скасаваць"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Даступныя медыяпрылады"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Даступныя прылады для выклікаў"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Зараз падключана"</string>
@@ -184,6 +189,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Параметры падключэння"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Раней падключаныя прылады"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Раней падключаныя"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Дата і час"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Вылучыце гадзінны пояс"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -209,11 +216,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Вы ўвялі несапраўднае імя порта."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Проксі HTTP выкарыстоўваецца браўзэрам, але ён не можа выкарыстоўвацца іншымі прыкладаннямi"</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"URL аўтаканфіг. проксі: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Паласа прапускання спампоўкі (кбіт/с):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Паласа прапускання запампоўкі (кбіт/с):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Інфармацыя пра месцазнаходжанне сотавай ячэйкі (састарэлая):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Даныя суседняй сотавай ячэйкі (састарэлыя):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Канфігурацыя фізічнага канала LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Частата абнаўлення даных сотавай ячэйкі:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Усе даныя вымярэнняў сотавай ячэйкі:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Інфармацыя злучэння для перадачы даных у рэальным часе:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Служба перадачы даных:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Роўмінг:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1179,8 +1187,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Аўтаматычная яркасць"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Абуджэнне пры падняцці"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Аўтаматычнае ўключэнне экрана"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Заўсёды ўключаны / павышае спажыванне зараду"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Новыя апавяшчэнні"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Калі паказваць"</string>
     <string name="doze_title" msgid="2375510714460456687">"Новыя апавяшчэнні"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Абуджаць экран, калі вы атрымліваеце апавяшчэнні"</string>
@@ -1227,8 +1233,6 @@
       <item quantity="other">Няправільны PIN-код SIM-карты, у вас засталося <xliff:g id="NUMBER_1">%d</xliff:g> спробы.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Разблакір. SIM PIN-кодам не атрымалася!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Стан планшэта"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Стан тэлефону"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Абнаўленні сiстэмы"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Версія Android"</string>
@@ -2167,8 +2171,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Не ўдалося абмежаваць работу ў фонавым рэжыме"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Абмежаваць фонавую дзейнасць?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Абмежаванне фонавай дзейнасці праграмы можа прывесці да збояў"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Паколькі ў гэтай праграме не наладжана аптымізацыя выкарыстання зараду акумулятара, вы не можаце абмежаваць яе працу. \n\n Для гэтага спачатку  ўключыце аптымізацыю акумулятара."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Выкарыстанне экрана пасля поўнай зарадкі"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Расход зараду на падсвечванне экрана"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Сканіраванне мабільнай сеткі"</string>
@@ -2502,6 +2505,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Сігнал набору нумару ў аварыйнай сітуацыі"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Задаць паводзіны на выпадак экстранага выкліку"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Рэзервовае капіраванне"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Укл."</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Выкл."</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Рэзервовае капіяванне і аднаўленне"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Асабістыя дадзеныя"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Рэзервовае капіяванне дадзеных"</string>
@@ -2836,6 +2841,12 @@
       <item quantity="other">Праверыць сертыфікаты</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Некалькі карыстальнікаў"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Карыстальнікi і профілi"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Дадаць карыстальніка або профіль"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Дадаць карыстальніка"</string>
@@ -3020,14 +3031,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"выкарыстанне трафіка"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"хот-спот"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Падключаныя прылады"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, рэжым \"За рулём\", NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, рэжым \"За рулём\""</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Праграмы і апавяшчэнні"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Дазволы, стандартныя праграмы"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Уліковыя запісы"</string>
@@ -3044,7 +3051,6 @@
     <string name="keywords_home" msgid="294182527446892659">"праграма запуску, стандартныя, праграмы"</string>
     <string name="keywords_display" msgid="8910345814565493016">"экран, сэнсарны экран"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"зацямненне экрана, сэнсарны экран, акумулятар, яркі"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"зацемнены экран, сэнсарны экран, акумулятар"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"зацямненне экрана, ноч, адценне, начная змена, яркасць, колер экрана, колер, фарба"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"фон, персаналізаваць, дапасаваць дысплэй"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"памер тэксту"</string>
@@ -3085,8 +3091,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"сетка, стан мабільнай сеткі, рабочы стан, моц сігналу, тып мабільнай сеткі, роўмінг, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"серыйны нумар, версія апаратнага забеспячэння"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"узровень патчу бяспекі android, версія дыяпазону, версія ядра"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Аўтаматычнае ўключэнне экрана, экран блакіроўкі"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"адбітак пальца"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"павярнуць, пераключыцца, паварот, кніжная, альбомная, арыентацыя, вертыкальная, гарызантальная"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"абнавіць, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"не турбаваць, расклад, апавяшчэнні, заблакіраваць, адключыць гук, вібрацыя, рэжым сну, актыўны рэжым, фокус, гук, без гуку, дзень, будні дзень, выхадныя дні, будні вечар, падзея"</string>
@@ -3171,18 +3181,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Дазволіць візуальныя сігналы"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Калі ўключаны рэжым \"Не турбаваць\""</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Апавяшчэнні"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Паказваць апавяшчэнні бязгучна"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Гук для апавяшчэнняў будзе выключаны"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Апавяшчэнні без гуку"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Апавяшчэнні будуць паказвацца на экране"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Калі будуць прыходзіць апавяшчэнні, тэлефон не будзе званіць ці вібрыраваць."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Схаваць апавяшчэнні"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Новыя ці існыя апавяшчэнні будуць схаваны"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Апавяшчэнні без візуальных элементаў і гуку"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Апавяшчэнні не будуць паказвацца ці гучаць"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Ваш тэлефон не будзе паказваць новыя ці існыя апавяшчэнні, не будзе званіць ці вібрыраваць. Апавяшчэнні не будуць з\'яўляцца, калі правесці пальцам па экране зверху ўніз.\n\nМайце на ўвазе, што самыя неабходныя апавяшчэнні пра асноўныя дзеянні тэлефона і яго статус не будуць схаваны."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Карыстальніцкія налады"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Уключыць карыстальніцкую наладу"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Выдаліць карыстальніцкую наладу"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Паказваць"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Апавяшчэнні без гуку"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Часткова схаваць"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Схаваць"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Апавяшчэнні без візуальных элементаў і гуку"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Карыстальніцкія абмежаванні"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Калі экран уключаны"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Калі экран выключаны"</string>
@@ -3245,19 +3255,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Без гуку, акрамя элементаў \"<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>\", \"<xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>\" і \"<xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>\""</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Паведамленні, падзеі і напаміны"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Калі ўключаны рэжым \"Не турбаваць\", выключаецца гук для паведамленняў, напамінаў і падзей, акрамя выбраных вамі элементаў вышэй. Вы можаце змяніць налады паведамленняў, каб дазволіць сябрам, членам сям\'і і іншым кантактам звязацца з вамі."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Гатова"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Налады"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Апавяшчэнні без візуальных элементаў і гуку"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Апавяшчэнні без гуку"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Апавяшчэнні не будуць паказвацца ці гучаць. Дазволены выклікі ад пазначаных кантактаў і абанентаў, якія выклікаюць паўторна."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Бягучая налада)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Змяніць налады апавяшчэнняў у рэжыме \"Не турбаваць\"?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Гукі працоўнага профілю"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Выкар. гукі асабістага профілю"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"У працоўным і асабістым профілях гукі аднолькавыя"</string>
@@ -3437,12 +3441,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Дазволіць выклікі"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Калі ўключаны рэжым \"Не турбаваць\", уваходныя выклікі блакіруюцца. Вы можаце змяніць налады, каб дазволіць сябрам, членам сям\'і і іншым кантактам звязацца з вамі."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Пазначаныя кантакты"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">і яшчэ <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="few">і яшчэ <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="many">і яшчэ <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="other">і яшчэ <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Паведамленні"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Дазволіць паведамленні"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Паведамленні"</string>
@@ -3899,10 +3898,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Халодная каляровая тэмпература"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Выкарыстоўваць больш халодныя колеры экрана"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Каб прымяніць змяненне колеру, адключыце экран"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Сродак адсочвання падключэнняў"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Сродак адсочвання падключэнняў будзе заносіць у журналы выпадкі выяўлення праблем з падключэннямі, а таксама паказваць карыстальніку адпаведнае апавяшчэнне з прапановай адпраўкі паведамлення пра памылку"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Каб змены ў сродку адсочвання падключэнняў былі прыменены, перазагрузіце прыладу"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Лазерны датчык камеры"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Стандартная лагічная камера"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Аўтаматычныя абнаўленні сістэмы"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Ужыць абнаўленні падчас перазапуску прылады"</string>
     <string name="usage" msgid="2977875522080448986">"Выкарыстанне"</string>
@@ -4240,8 +4237,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Сэрвіс аўтазапаўнення"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"аўтаматычнае, запаўненне, аўтазапаўненне"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Упэўніцеся, што давяраеце гэтай праграме&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Аўтазапаўненне Google&gt;%1$s&lt;/xliff:g&gt; выкарыстоўвае тое, што знаходзіцца на вашым экране, каб вызначыць, што можна запоўніць аўтаматычна."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Тэма прылады"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Каляровая тэма"</string>
     <string name="default_theme" msgid="7085644992078579076">"Стандартная"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Тэма прылады"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Аўтаматычна (на аснове колеру шпалер)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Светлая"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Цёмная"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Імя сеткі"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Паказваць імя сеткі на панэлі стану"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Менеджар сховішча: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4253,7 +4254,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Інфармацыя аператара"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Уключыць/выключыць забеспячэнне аператарам"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Абнавіце рэжым \"Не турбаваць\""</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Схавайце апавяшчэнні, каб яны не адцягвалі ўвагу"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Прыпыніце апавяшчэнні, каб яны не адцягвалі ўвагу"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Што новага і цікавага?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Аглядны тур па новаму тэлефону"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Аглядны тур па новаму планшэту"</string>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 93b3a06..11a0a1e 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Винаги включено"</item>
     <item msgid="6385301106124765323">"Винаги изключено"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 1e13535..08d8239 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Разрешете на таблета си да се свързва с устройства с Bluetooth в близост"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Разрешете на устройството си да се свързва с устройства с Bluetooth в близост"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Разрешаване на телефона да се свързва с устройства с Bluetooth в близост"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Деакт. на разтоварв. чрез хардуер на Bluetooth с код A2DP"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Рестарт. на у-вото?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"За да промените настройката, трябва да рестарт. у-вото си."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Рестарт"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Отказ"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Налични устройства за мултимедия"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Налични устройства за обаждания"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Понастоящем свързано"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Предпочитания за свързването"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"По-рано свързвани устройства"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"По-рано свързвани"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Дата и час"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Избор на часова зона"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Въведеният от вас порт е невалиден."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP прокси сървърът се използва от браузъра, но не и от други приложения."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"URL адрес на PAC файла: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Скорост на връзката за DL (кб/сек):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Скорост на връзката за UL (кб/сек):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Информация за местоположението на клетките (оттеглено):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Информация за съседните клетки (оттеглено):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Конфигурация на физическия канал на LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Честота на опресняване на информацията за клетките:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Цялата измервателна информация за клетките:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Информация в реално време за връзката за данни:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Услуга за данни:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Роуминг:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматична яркост"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Събуждане при повдигане"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Дисплей, открояващ важни неща"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Винаги вкл./по-интензивно използване на батерията"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Нови известия"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Кога да се показва"</string>
     <string name="doze_title" msgid="2375510714460456687">"Нови известия"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Включване на екрана при получаване на известия"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">Неправилен ПИН код за SIM картата – остава ви <xliff:g id="NUMBER_0">%d</xliff:g> опит, преди да трябва да се свържете с оператора си, за да отключите устройството.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Операцията с ПИН кода за SIM картата не бе успешна!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Състояние на таблета"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Състояние на телефона"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Актуализации на системата"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Версия на Android"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Използването на заден план не може да бъде ограничено"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Да се ограничи ли активността на заден план?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ако ограничите активността на заден за дадено приложение, то може да не функционира правилно"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Тъй като прил. не е зададено да оптимизира батерията, можете да го ограничите.\n\nЗа тази цел първо включете оптим. на батерията."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Ползване на екрана след пълно зареждане"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Консумация от екрана"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Сканиране за мобилни мрежи"</string>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Сигнал за набиране при спешен случай"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Задаване на поведение при спешно обаждане"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Резервно копие"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Включено"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Изключено"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Резервни копия и възстановяване"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Лични данни"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Резервно копие на данните ми"</string>
@@ -2761,6 +2766,12 @@
       <item quantity="one">Проверка на сертификата</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Няколко потребители"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Потребители и потребителски профили"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Добавяне на потр. или потр. профил"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Добавяне на потребител"</string>
@@ -2943,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"пренос на данни"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"точка за достъп"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Свързани устройства"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, режим за шофиране, КБП"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, режим за шофиране"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, КБП"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Приложения и известия"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Разрешения, приложения по подразбиране"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Профили"</string>
@@ -2967,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"стартов панел, по подразбиране, приложения"</string>
     <string name="keywords_display" msgid="8910345814565493016">"екран, сензорен екран"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"затъмняване на екрана, сензорен екран, батерия, светло"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"затъмняване на екрана, сензорен екран, батерия"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"затъмняване на екрана, нощ, нюансиране, нощен режим, яркост, цвят на екрана, цвят, цветно"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"фон, персонализиране, персонализиране на дисплея"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"размер на текста"</string>
@@ -3008,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"мрежа, състояние на мобилната мрежа, състояние на услугата, сила на сигнала, тип мобилна мрежа, роуминг, идентификатор на карта с ИС"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"сериен номер, версия на хардуера"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"ниво на корекцията на сигурността под Android, версия на радиомодула, версия на ядрото"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Дисплей, открояващ важни неща, дисплей на заключения екран"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"отпечатък"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"завъртане, обръщане, завъртане, вертикален режим, хоризонтален режим, ориентация, вертикално, хоризонтално"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"надстройване, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"режим „Не безпокойте“, график, известия, блокиране, тих режим, вибриране, спящ режим, работа, фокусиране, звук, заглушаване, спиране, ден, ден от седмицата, уикенд, делнична нощ, събитие"</string>
@@ -3092,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Визуални сигнали: Разрешаване"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Когато режимът „Не безпокойте“ е включен"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Известия"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Показване на известията без звук"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Известията ще бъдат спрени"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Без звук от известията"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Ще виждате известия на екрана си"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"При получаване на известия телефонът ви няма да издава звуци, нито ще вибрира."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Скриване на известията"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Няма да виждате новите, нито съществуващите известия"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Без визуално прекъсване или звук от известията"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Няма да виждате, нито да чувате известията"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Телефонът ви няма да показва новите, нито съществуващите известия и няма да издава звуци или да вибрира. Известията няма да се показват, когато прекарате пръст надолу от горната част на екрана.\n\nИмайте предвид, че критичните известия, свързани с активността и състоянието на телефона, пак ще се показват."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Персонализирано"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Активиране на персонализираната настройка"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Премахване на персонализираната настройка"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Ще се показват"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Без звук от известията"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Частично скрити"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Скрити"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Без визуално прекъсване или звук от известията"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Персонализирани ограничения"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Когато екранът е включен"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Когато екранът е изключен"</string>
@@ -3162,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Звукът е спрян, но <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> и <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> са разрешени"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Съобщения, събития и напомняния"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Когато режимът „Не безпокойте“ е включен, съобщенията, напомнянията и събитията ще бъдат спрени – това не се отнася за елементите, разрешени от вас по-горе. Можете да коригирате настройките за съобщенията, за да разрешите на близки и приятели и други контакти да се свързват с вас."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Готово"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Настройки"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Без визуално прекъсване или звук от известията"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Без звук от известията"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Няма да виждате, нито да чувате известията. Обажданията от контактите със звезда и повторно обаждащите се са разрешени."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Текуща настройка)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Да се променят ли настройките за известията в режима „Не безпокойте“?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Звуци за служебния потребителски профил"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Използване на звуците за личния потребителски профил"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Звуците за служебния и личния потребителски профил са едни и същи"</string>
@@ -3346,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Разрешаване на обаждания"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Когато режимът „Не безпокойте“ е вкл., вх. обаждания се блокират. Можете да коригирате настройките, за да разрешите на близки и приятели и др. контакти да се свързват с вас."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Контакти със звезда"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">и още <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="one">и още 1</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Съобщения"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Разрешаване на съобщения"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Съобщения"</string>
@@ -3779,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Студена цветова гама"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Използване на по-студени цветове за дисплея"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"За да приложите промяната на цветовете, изключете екрана"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Наблюдение на връзката"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Функцията за наблюдение на връзката ще събира регистрационни файлове, когато установи проблем с връзката, и ще изпрати на потребителя известие с подкана да подаде сигнал за програмна грешка"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"За да приложите промяната във функцията за наблюдение на връзката, рестартирайте устройството"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Сензор на лазера на камерата"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Логическа камера по подразбиране"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматични системни актуализации"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Прилагане на актуализациите, когато устройството се рестартира"</string>
     <string name="usage" msgid="2977875522080448986">"Пренос на данни"</string>
@@ -4092,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Услуга за автоматично попълване"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"автомативно, попълване, автоматично попълване"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Уверете се, че имате доверие на това приложение&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Функцията на Google за автоматично попълване&gt;%1$s&lt;/xliff:g&gt; използва това, което е на екрана ви, за да определи какво може да се попълни автоматично."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Тема на устройството"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Цветова тема"</string>
     <string name="default_theme" msgid="7085644992078579076">"Стандартно"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Тема на устройството"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Автоматична (въз основа на тапета)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Светла"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Тъмна"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Име на мрежата"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Показване на името на мрежата в лентата на състоянието"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Мениджър на хранилището: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4105,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Carrier Provisioning Info"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Задействане на обезпечаването от оператора"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Актуализиране на режима „Не безпокойте“"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Скрийте известията, за да не ви разсейват"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Поставете известията на пауза, за да не ви разсейват"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Нови и вълнуващи неща"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Запознайте се с новия си телефон"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Запознайте се с новия си таблет"</string>
diff --git a/res/values-bn/arrays.xml b/res/values-bn/arrays.xml
index 507de46..314f626 100644
--- a/res/values-bn/arrays.xml
+++ b/res/values-bn/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"৪"</item>
+    <item msgid="5900372418924184351">"০"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"সবসময় চালু"</item>
     <item msgid="6385301106124765323">"সবসময় বন্ধ"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 6900a5f..07dabbb 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"আপনার ট্যাবলেটটিকে আশেপাশের ব্লুটুথ ডিভাইসগুলির সাথে যোগাযোগ করার অনুমতি দিন"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"আপনার ডিভাইসটিকে আশেপাশের ব্লুটুথ ডিভাইসগুলির সাথে যোগাযোগ করার অনুমতি দিন"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"আপনার ফোনটিকে আশেপাশের ব্লুটুথ ডিভাইসগুলির সাথে যোগাযোগ করার অনুমতি দিন"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"ব্লুটুথ A2DP হার্ডওয়্যার অফলোড বন্ধ করুন"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"রিস্টার্ট করবেন?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"এই সেটিং পরিবর্তন করতে আপনার ডিভাইস রিস্টার্ট করতে হবে"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"রিস্টার্ট"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"বাতিল"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"উপলভ্য মিডিয়া ডিভাইস"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"কল করার জন্য উপলভ্য ডিভাইস"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"এখন কানেক্ট"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"পছন্দের কানেকশন"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"আগে কানেক্ট করা ডিভাইস"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"আগে কানেক্ট করা"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"দিন ও তারিখ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"সময় অঞ্চল বেছে নিন"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"আপনার টাইপ করা পোর্টটি বৈধ নয।"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP প্রক্সি ব্রাউজার দ্বারা ব্যবহৃত হয় কিন্তু অন্য অ্যাপ্লিকেশানগুলির দ্বারা ব্যবহৃত না হতেও পারে৷"</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"ডিএল ব্যান্ডউইথ (কেবিপিএস):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"ইউএল ব্যান্ডউইথ (কেবিপিএস):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"সেল লোকেশন তথ্য (থামানো হয়েছে):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"প্রতিবেশী সেল তথ্য (থামানো হয়েছে):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"এলটিই ফিজিক্যাল চ্যানেল কনফিগারেশন:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"সেল তথ্যে রিফ্রেশ রেট:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"সমস্ত সেল পরিমাপ তথ্য:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"ডেটা সংযোগের রিয়েল-টাইম তথ্য:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"ডেটা পরিষেবা:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"রোমিং:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1007,16 +1015,11 @@
     <string name="emergency_address_title" msgid="932729250447887545">"জরুরি ঠিকানা"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"ওয়াই-ফাই নেটওয়ার্ক ব্যবহার করে জরুরি কল করার সময় আপনার লোকেশন হিসেবে ব্যবহার করা হয়"</string>
     <string name="private_dns_help_message" msgid="3299567069152568958">"ব্যক্তিগত ডিএনএস বৈশিষ্ট্যের বিষয়ে "<annotation id="url">"আরও জানুন"</annotation></string>
-    <!-- no translation found for wifi_calling_pref_managed_by_carrier (6845711858866828986) -->
-    <skip />
-    <!-- no translation found for wifi_calling_settings_activation_instructions (7492509632478260955) -->
-    <skip />
-    <!-- no translation found for wifi_calling_turn_on (1171403510313983983) -->
-    <skip />
-    <!-- no translation found for wifi_calling_not_supported (7878640438907807754) -->
-    <skip />
-    <!-- no translation found for carrier (5264014738689761132) -->
-    <skip />
+    <string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"পরিষেবা প্রদানকারী দ্বারা সেটিং ম্যানেজ করা হয়"</string>
+    <string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"ওয়াই-ফাই দিয়ে কল করার সুবিধা অ্যাক্টিভেট করুন"</string>
+    <string name="wifi_calling_turn_on" msgid="1171403510313983983">"ওয়াই-ফাই দিয়ে কল করার সুবিধা চালু করুন"</string>
+    <string name="wifi_calling_not_supported" msgid="7878640438907807754">"%1$s-এ ওয়াই-ফাই দিয়ে কল করা যায় না"</string>
+    <string name="carrier" msgid="5264014738689761132">"পরিষেবা প্রদানকারী"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ডিসপ্লে"</string>
     <string name="sound_settings" msgid="5534671337768745343">"সাউন্ড"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ভলিউম"</string>
@@ -1151,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"স্বয়ংক্রিয় উজ্জ্বলতা"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"সক্রিয় করতে লিফ্ট করুন"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"অ্যাম্বিয়েন্ট ডিসপ্লে"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"সর্বদা চালু / ব্যাটারির ব্যবহার বেড়ে যায়"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"নতুন বিজ্ঞপ্তি"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"কখন দেখানো হবে"</string>
     <string name="doze_title" msgid="2375510714460456687">"নতুন বিজ্ঞপ্তি"</string>
     <string name="doze_summary" msgid="3846219936142814032">"বিজ্ঞপ্তি এলে স্ক্রিনের আলো জ্বলবে"</string>
@@ -1197,8 +1198,6 @@
       <item quantity="other">সিমের পিন কোডটি ভুল, আপনি আর <xliff:g id="NUMBER_1">%d</xliff:g> বার চেষ্টা করতে পারেন।</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"সিম পিন ক্রিয়াকলাপটি ব্যর্থ হয়েছে!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"ট্যাবলেট স্থিতি"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"ফোন স্থিতি"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"সিস্টেম আপডেটগুলি"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android ভার্সন"</string>
@@ -2119,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"ব্যাকগ্রাউন্ডে ব্যবহারের সীমা নির্দিষ্ট করা যায় না"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"ব্যাকগ্রাউন্ড কার্যকলাপ সীমিত করবেন?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"কোনও অ্যাপের ব্যাকগ্রাউন্ড কার্যকলাপ সীমিত করলে তা সঠিক ভাবে কাজ নাও করতে পারে"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"যেহেতু এই অ্যাপটিকে ব্যাটারি অপ্টিমাইজ করার জন্য সেট করা হয়নি, তাই আপনি এটির কার্যকলাপ সীমিত করতে পারবেন না।\n\nঅ্যাপের কার্যকলাপ সীমিত করতে আগে ব্যাটারি অপ্টিমাইজেশন চালু করুন।"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"সম্পূর্ণ চার্জ করার সময় থেকে স্ক্রিনের ব্যবহার"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"স্ক্রিনের জন্য ব্যবহার"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"মোবাইল নেটওয়ার্ক স্ক্যান করা"</string>
@@ -2440,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"আপদকালীন ডায়ালিং সিগন্যাল"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"জরুরি কল স্থাপন করা সময় কি ধরণের কার্যকলাপ করবে তা সেট করুন"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"ব্যাক-আপ"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"চালু"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"বন্ধ"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"ব্যাকআপ ও পুনরুদ্ধার"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"ব্যক্তিগত ডেটা"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"আমার তথ্য ব্যাকআপ করুন"</string>
@@ -2766,6 +2766,12 @@
       <item quantity="other">টি সার্টিফিকেট পরীক্ষা করুন</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"একাধিক ব্যবহারকারী"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"ব্যবহারকারীরা ও প্রোফাইলগুলি"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ব্যবহারকারী অথবা প্রোফাইল যোগ করুন"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"ব্যবহারকারীকে যোগ করুন"</string>
@@ -2948,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ডেটার ব্যবহার"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"হটস্পট"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"কানেক্ট ডিভাইস"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"ব্লুটুথ, ড্রাইভিং মোড, এনএফসি"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"ব্লুটুথ, ড্রাইভিং মোড"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"ব্লুটুথ, এনএফসি"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"ব্লুটুথ"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"অ্যাপ ও বিজ্ঞপ্তি"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"অনুমতিগুলি, ডিফল্ট অ্যাপ্স"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"অ্যাকাউন্ট"</string>
@@ -2972,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"লঞ্চার, ডিফল্ট, অ্যাপ"</string>
     <string name="keywords_display" msgid="8910345814565493016">"স্ক্রিন, টাচস্ক্রিন"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"অনুজ্জ্বল স্ক্রিন, টাচস্ক্রিন, ব্যাটারি, উজ্জ্বল"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"স্ক্রিন অস্পষ্ট করুন, টাচস্ক্রিন, ব্যাটারি"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"অনুজ্জ্বল স্ক্রিন, রাত্রি, আভা, নাইট শিফট, উজ্জ্বলতা, স্ক্রিনের রঙ, রঙ, রঙ"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"ব্যাকগ্রাউন্ড, ব্যক্তিগতকরণ, কাস্টমাইজ ডিসপ্লে"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"পাঠ্য আকার"</string>
@@ -3013,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"নেটওয়ার্ক, মোবাইল নেটওয়ার্কের অবস্থা, পরিষেবার অবস্থা, সিগন্যালের অবস্থা, মোবাইল নেটওয়ার্কের ধরন, রোমিং, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"সিরিয়াল নম্বর, হার্ডওয়্যার ভার্সন"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"Android নিরাপত্তা প্যাচের স্তর, বেসব্যান্ড ভার্সন, কার্নেল ভার্সন"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"অ্যাম্বিয়েন্ট ডিসপ্লে, লক স্ক্রিন ডিসপ্লে"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"আঙ্গুলের ছাপ"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"ঘোরান, উল্টান, ঘূর্ণন, পোর্ট্রেট, ল্যান্ডস্কেপ, সজ্জা, উল্লম্ব, অনুভূমিক"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"আপগ্রেড করুন, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"ডিএনডি, সময়সূচি, বিজ্ঞপ্তি, ব্লক করুন, নীরবতা, ভাইব্রেট, স্লিপ, অফিস, ফোকাস, সাউন্ড, মিউট, দিন, কাজের দিন, সপ্তাহান্ত, সপ্তাহের রাত্রি, ইভেন্ট"</string>
@@ -3095,27 +3100,20 @@
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"ভিজ্যুয়াল ব্যাঘাতগুলিকে ব্লক করুন"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"ভিজুয়াল সঙ্কেতগুলি চালু করুন"</string>
-    <!-- no translation found for zen_mode_settings_category (3982039687186952865) -->
-    <skip />
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"যখন \'বিরক্ত করবেন না\' মোড চালু থাকবে তখন"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"বিজ্ঞপ্তি"</string>
-    <!-- no translation found for zen_mode_restrict_notifications_mute (8649062661635246283) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_summary (8450964969807231275) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_footer (3465600930732602159) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide (9070829387109283980) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_summary (3832808022882158781) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_footer (6559283246372102465) -->
-    <skip />
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"বিজ্ঞপ্তি থেকে কোনও সাউন্ড হবে না"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"আপনার স্ক্রিনে বিজ্ঞপ্তি দেখতে পাবেন"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"বিজ্ঞপ্তি দেখানো হলে ফোনে সাউন্ড বা ভাইব্রেশন হবে না।"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"বিজ্ঞপ্তি থেকে কোনওকিছু দেখা বা শোনা যাবে না"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"আপনি কোনও বিজ্ঞপ্তি দেখতে বা শুনতে পাবেন না"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"আপনার ফোনে নতুন অথবা এখনকার বিজ্ঞপ্তি দেখানো হবে না এবং কোনও সাউন্ড বা ভাইব্রেশন হবে না। স্ক্রিনের উপর থেকে নিচের দিকে সোয়াইপ করলে বিজ্ঞপ্তি দেখানো হবে না।\n\nমনে রাখবেন, ফোনের অ্যাক্টিভিটি এবং স্ট্যাটাস সংক্রান্ত জরুরি বিজ্ঞপ্তি দেখানো হবে।"</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"কাস্টম"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"কাস্টম সেটিং চালু করুন"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"কাস্টম সেটিং সরান"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"দেখা যাবে"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"বিজ্ঞপ্তি থেকে কোনও সাউন্ড হবে না"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"আংশিকভাবে আড়াল করা"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"আড়াল করা"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"বিজ্ঞপ্তি থেকে কোনওকিছু দেখা বা শোনা যাবে না"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"কাস্টম সীমাবদ্ধতা"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"যখন স্ক্রিনটি চালু থাকে"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"যখন স্ক্রিনটি বন্ধ থাকে"</string>
@@ -3161,45 +3159,26 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g>টি নিয়ম নিজে থেকে চালু হতে পারে</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>টি নিয়ম নিজে থেকে চালু হতে পারে</item>
     </plurals>
-    <!-- no translation found for zen_category_behavior (2989256030084350296) -->
-    <skip />
-    <!-- no translation found for zen_category_exceptions (7601136604273265629) -->
-    <skip />
-    <!-- no translation found for zen_category_schedule (9000447592251450453) -->
-    <skip />
-    <!-- no translation found for zen_sound_title (424490228488531372) -->
-    <skip />
-    <!-- no translation found for zen_sound_footer (7621745273287208979) -->
-    <skip />
-    <!-- no translation found for zen_sound_category_title (4336596939661729188) -->
-    <skip />
-    <!-- no translation found for zen_sound_all_muted (4850363350480968114) -->
-    <skip />
-    <!-- no translation found for zen_sound_none_muted (3938508512103612527) -->
-    <skip />
-    <!-- no translation found for zen_sound_one_allowed (8447313454438932276) -->
-    <skip />
-    <!-- no translation found for zen_sound_two_allowed (980491120444358550) -->
-    <skip />
-    <!-- no translation found for zen_sound_three_allowed (3455767205934547985) -->
-    <skip />
-    <!-- no translation found for zen_msg_event_reminder_title (5137894077488924820) -->
-    <skip />
-    <!-- no translation found for zen_msg_event_reminder_footer (3242847055412790819) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_category_behavior" msgid="2989256030084350296">"আচরণ"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"ব্যতিক্রম"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"সময় ঠিক করুন"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"সাউন্ড ও ভাইব্রেশন"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"\'বিরক্ত করবেন না\' মোড চালু থাকলে আপনি উপরে যে আইটেমগুলি ব্যতিক্রম হিসেবে চিহ্নিত করবেন সেগুলি ছাড়া বাকি সবকিছুর ক্ষেত্রে সাউন্ড এবং ভাইব্রেশন মিউট করা হবে।"</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"এগুলি ছাড়া সবকিছু মিউট করুন"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"মিউট করা আছে"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"মিউট করা নেই"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"মিউট করা, কিন্তু <xliff:g id="SOUND_TYPE">%1$s</xliff:g>-এর অনুমতি দিন"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"মিউট করা, কিন্তু <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> এবং <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>-এর অনুমতি দিন"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"মিউট করা, কিন্তু <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> এবং <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>-এর অনুমতি দিন"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"মেসেজ, ইভেন্ট ও রিমাইন্ডার"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"\'বিরক্ত করবেন না\' মোড চালু থাকলে আপনি উপরে যে আইটেমগুলি ব্যতিক্রম হিসেবে চিহ্নিত করবেন সেগুলি ছাড়া বাকি সমস্ত মেসেজ, রিমাইন্ডার এবং ইভেন্ট মিউট করা হবে। আপনার বন্ধুবান্ধব, পরিবারের সদস্য অথবা অন্য পরিচিতিরা যাতে আপনার সাথে যোগাযোগ করতে পারেন তার জন্য আপনি মেসেজের সেটিংস অ্যাডজাস্ট করে নিতে পারেন।"</string>
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"হয়ে গেছে"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"সেটিংস"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"বিজ্ঞপ্তি থেকে কোনওকিছু দেখা বা শোনা যাবে না"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"বিজ্ঞপ্তি থেকে কোনও সাউন্ড হবে না"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"আপনি কোনও বিজ্ঞপ্তি দেখতে বা শুনতে পাবেন না। যারা তারা চিহ্নিত পরিচিতি এবং আগে যারা ফোন করেছেন তারা আবার ফোন করতে পারবেন।"</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(বর্তমান সেটিং)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"\"বিরক্ত করবেন না\" মোডের বিজ্ঞপ্তির সেটিংস পরিবর্তন করবেন?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"কর্মস্থলের প্রোফাইলের ধ্বনিগুলি"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"ব্যক্তিগত প্রোফাইলের ধ্বনিগুলি ব্যবহার করুন"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"কাজ এবং ব্যক্তিগত প্রোফাইলের জন্য একই শব্দ"</string>
@@ -3368,54 +3347,35 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> থেকে <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"কল"</string>
-    <!-- no translation found for zen_mode_calls_title (623395033931747661) -->
-    <skip />
-    <!-- no translation found for zen_mode_calls_footer (3618700268458237781) -->
-    <skip />
+    <string name="zen_mode_calls_title" msgid="623395033931747661">"কলের অনুমতি দিন"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"\'বিরক্ত করবেন না\' মোড চালু থাকলে ইনকামিং কল ব্লক করা হয়। আপনার বন্ধুবান্ধব, পরিবারের সদস্য অথবা অন্য পরিচিতিরা যাতে আপনার সাথে যোগাযোগ করতে পারেন তার জন্য আপনি সেটিংস অ্যাডজাস্ট করে নিতে পারেন।"</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"তারা চিহ্নিত পরিচিতি"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">এবং আরও <xliff:g id="NUM_PEOPLE">%d</xliff:g> জন</item>
-      <item quantity="other">এবং আরও <xliff:g id="NUM_PEOPLE">%d</xliff:g> জন</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"মেসেজ"</string>
-    <!-- no translation found for zen_mode_messages_title (7729380010396411129) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_messages (8257021584561639816) -->
-    <skip />
-    <!-- no translation found for zen_mode_selected_messages (1047355526202106114) -->
-    <skip />
+    <string name="zen_mode_messages_title" msgid="7729380010396411129">"মেসেজের অনুমতি দিন"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"মেসেজ"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"কিছু মেসেজ"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"যে কোনো ব্যক্তির কাছ থেকে"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"শুধুমাত্র পরিচিতিদের থেকে"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"শুধুমাত্র তারকাচিহ্নিত পরিচিতিদের থেকে"</string>
-    <!-- no translation found for zen_calls_summary_starred_repeat (4046151920710059778) -->
-    <skip />
-    <!-- no translation found for zen_calls_summary_contacts_repeat (1528716671301999084) -->
-    <skip />
-    <!-- no translation found for zen_calls_summary_repeat_only (7105261473107715445) -->
-    <skip />
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"যারা তারা চিহ্নিত পরিচিতি এবং আগে যারা ফোন করেছেন তারা আবার ফোন করলে"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"পরিচিতি এবং আগে যারা ফোন করেছেন তারা আবার ফোন করলে"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"শুধুমাত্র আগে যারা ফোন করেছেন তারা আবার ফোন করলে"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"কোনো কিছুই নয়"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"অ্যালার্মগুলি"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"মিডিয়া"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"টাচ সাউন্ড"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"রিমাইন্ডার"</string>
-    <!-- no translation found for zen_mode_reminders_title (2345044406347406902) -->
-    <skip />
+    <string name="zen_mode_reminders_title" msgid="2345044406347406902">"রিমাইন্ডারের অনুমতি দিন"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ইভেন্টগুলি"</string>
-    <!-- no translation found for zen_mode_events_title (5597241655883329085) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_callers (2378065871253871057) -->
-    <skip />
-    <!-- no translation found for zen_mode_contacts_callers (5569804103920394175) -->
-    <skip />
-    <!-- no translation found for zen_mode_starred_callers (1023167821338514140) -->
-    <skip />
+    <string name="zen_mode_events_title" msgid="5597241655883329085">"ইভেন্টের অনুমতি দিন"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"যেকেউ"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"পরিচিতি"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"তারা চিহ্নিত পরিচিতি"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"রিপিট কলার"</string>
-    <!-- no translation found for zen_mode_repeat_callers_title (8553876328249671783) -->
-    <skip />
-    <!-- no translation found for zen_mode_calls_summary_one (3972333792749874863) -->
-    <skip />
-    <!-- no translation found for zen_mode_calls_summary_two (6592821501321201329) -->
-    <skip />
+    <string name="zen_mode_repeat_callers_title" msgid="8553876328249671783">"রিপিট কলারের অনুমতি দিন"</string>
+    <string name="zen_mode_calls_summary_one" msgid="3972333792749874863">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> থেকে"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> এবং <xliff:g id="CALLERT_TPYE">%2$s</xliff:g> ফোন করলে"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"একই ব্যক্তি <xliff:g id="MINUTES">%d</xliff:g> এর ভিতরে দ্বিতীয়বার কল করলে"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"কাস্টম"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"স্বয়ংক্রিয়ভাবে চালু"</string>
@@ -3820,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"কুল রঙের টেম্পারেচার"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"কুলার প্রদর্শনী রঙগুলি ব্যবহার করুন"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"রঙের পরিবর্তন প্রয়োগ করতে, স্ক্রিন বন্ধ করুন"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"কানেক্ট মনিটর"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"কানেক্টে কোনও সমস্যা শনাক্ত হলে কানেক্ট মনিটর লগ সংগ্রহ করবে ও ব্যবহারকারীকে বিজ্ঞপ্তি পাঠিয়ে সমস্যার বিষয়ে অভিযোগ করতে বলবে"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"কানেক্ট মনিটরে করা পরিবর্তন প্রয়োগ করতে ডিভাইসটি রিবুট করুন"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"ক্যামেরা লেজার সেন্সর"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"লজিক্যাল ক্যামেরা ডিফল্ট"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"অটোমেটিক সিস্টেম আপডেটগুলি"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"ডিভাইস রিস্টার্ট হওয়ার সময় আপগ্রেড প্রয়োগ করুন"</string>
     <string name="usage" msgid="2977875522080448986">"ব্যবহার"</string>
@@ -3952,8 +3910,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"লক স্ক্রিনে নিয়ন্ত্রণের তথ্য"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"বিজ্ঞপ্তির কন্টেন্ট দেখুন বা লুকান"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"সমস্ত"</string>
-    <!-- no translation found for page_tab_title_support (4407600495101788249) -->
-    <skip />
+    <string name="page_tab_title_support" msgid="4407600495101788249">"পরামর্শ ও সহায়তা"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"সবচেয়ে কম প্রস্থ"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ইনস্টল করা কোনো অ্যাপ্লিকেশানই প্রিমিয়াম SMS অ্যাক্সেসের অনুরোধ করেনি"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"প্রিমিয়াম SMS এর জন্য অর্থ খরচ হতে পারে এবং আপনার পরিষেবা প্রদানকারীর বিলে যোগ করা হবে৷ আপনি যদি কোনো অ্যাপ্লিকেশানের জন্য অনুমতি সক্ষম করেন তাহলে আপনি সেই অ্যাপ্লিকেশানটি ব্যবহার করে প্রিমিয়াম SMS পাঠাতে পারবেন৷"</string>
@@ -4134,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"আপনাআপনি পূরণ করার পরিষেবা"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"স্বতঃ, পূরণ, স্বতঃপূরণ"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;নিশ্চিত করুন যে এই অ্যাপটি বিশ্বাসযোগ্য&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; কোনও তথ্য নিজে থেকে পূরণ করা যাবে কি না, তা নির্ণয় করতে &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; অ্যাপটি আপনার স্ক্রিনে যা দেখা যাচ্ছে সেই অনুযায়ী সিদ্ধান্ত নেয়।"</string>
-    <string name="device_theme" msgid="4571803018917608588">"ডিভাইসের থিম"</string>
+    <string name="color_theme" msgid="1535685696756738324">"রঙীন থিম"</string>
     <string name="default_theme" msgid="7085644992078579076">"ডিফল্ট"</string>
+    <string name="device_theme" msgid="4571803018917608588">"ডিভাইসের থিম"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"অটোমেটিক (ওয়ালপেপারের উপর ভিত্তি করে)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"হালকা"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"গাঢ়"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"নেটওয়ার্কের নাম"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"নেটওয়ার্কের নাম স্ট্যাটাস বারে দেখুন"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"স্টোরেজ ম্যানেজার: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4147,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"পরিষেবা প্রদানকারীর ব্যবস্থামূলক তথ্য"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ট্রিগার পরিষেবা প্রদানকারীর ব্যবস্থা"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"\'বিরক্ত করবেন না\' মোডটি আপডেট করুন"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"যাতে বিরক্ত হতে না হয় তার জন্য বিজ্ঞপ্তি লুকান"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"যাতে বিরক্ত হতে না হয় তার জন্য বিজ্ঞপ্তি পজ করুন"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"নতুন এবং উত্তেজনাপূর্ণ আর কি আছে?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"আপনার নতুন ফোন চালিয়ে দেখুন"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"আপনার নতুন ট্যাবলেট চালিয়ে দেখুন"</string>
diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml
index 4c4f5c0..5af1cde 100644
--- a/res/values-bs/arrays.xml
+++ b/res/values-bs/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Uvijek uključeno"</item>
     <item msgid="6385301106124765323">"Uvijek isključeno"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index a94aeb6..91dd984 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -174,6 +174,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Omogućite tabletu da komunicira s Bluetooth uređajima u blizini"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Omogućite uređaju da komunicira s Bluetooth uređajima u blizini"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Omogućite telefonu da komunicira s Bluetooth uređajima u blizini"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Onemogući rasterećenje Bluetootha A2DP"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Ponovo pokrenuti?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Da promijenite ovu postavku, treba ponovo pokrenuti uređaj."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Pokreni opet"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Otkaži"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Dostupni mediji"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Dostupni uređaji za pozivanje"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Trenutno povezani"</string>
@@ -183,6 +188,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Postavke veze"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Prethodno povezani uređaji"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Prethodno povezani"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Datum i vrijeme"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Odaberite vremensku zonu"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -208,11 +215,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Uneseni port nije važeći."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Preglednik koristi HTTP proksi, ali je moguće da ga ne koriste druge aplikacije."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"URL za PAC: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL propusnost (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL propusnost (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Informacije o lokaciji ćelije (zastarjele):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Informacije o susjednim ćelijama (zastarjela):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Konfiguracija LTE fizičkog kanala:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Interval osvježavanja informacija o ćeliji"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Sve informacije o mjerenju ćelije"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Informacije u stvarnom vremenu o vezi za prijenos podataka:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Prijenos podataka:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1162,8 +1170,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatsko osvjetljenje"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Podignite za buđenje"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambijentalni prikaz"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Uvijek uključeno/povećana potrošnja baterije"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nova obavještenja"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kada prikazati"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nova obavještenja"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Ekran se aktivira kada primite obavještenja"</string>
@@ -1209,8 +1215,6 @@
       <item quantity="other">PIN za SIM je netačan. Preostalo vam je još <xliff:g id="NUMBER_1">%d</xliff:g> pokušaja.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Operacija PIN-a za SIM nije uspjela!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status tableta"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Status telefona"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Ažuriranja sistema"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Verzija Androida"</string>
@@ -2140,7 +2144,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Nije moguće ograničiti upotrebu u pozadini"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Ograničiti aktivnost u pozadini?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ako aplikaciji ograničite aktivnost u pozadini, može raditi nepravilno"</string>
-    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Aplikacija nije postavljena za optimizaciju baterije, pa je ne možete ograničiti.\n\nZa ograničenje uključite optimizaciju."</string>
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Aplikaciju ne možete ograničiti jer nije postavljena optimizacija baterije.\n\nDa je ograničite prvo uključite optimizaciju."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Korištenje ekrana od potpune napunjenosti"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Potrošnja ekrana"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Skeniranje mobilne mreže"</string>
@@ -2467,6 +2471,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Signal za hitne pozive"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Postavi ponašanje prilikom upućivanja poziva za hitne situacije"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Izrada sigurnosnih kopija"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Uključeno"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Isključeno"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Sigurnosna kopija i vraćanje"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Lični podaci"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Izrada sigurnosnih kopija podataka"</string>
@@ -2797,6 +2803,12 @@
       <item quantity="other">Provjerite certifikate</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Više korisnika"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Korisnici i profili"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Dodaj korisnika ili profil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Dodaj korisnika"</string>
@@ -2980,14 +2992,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"prijenos podataka"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"pristupna tačka"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Povezani uređaji"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, način rada za vožnju, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, način rada za vožnju"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacije i obavještenja"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Odobrenja, zadane aplikacije"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Računi"</string>
@@ -3004,7 +3012,6 @@
     <string name="keywords_home" msgid="294182527446892659">"pokretač, zadano, aplikacije"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ekran, osjetljiv na dodir"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"zatamnjeni ekran, osjetljiv na dodir, baterija, svijetlo"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"zatamnjenje ekrana, osjetljiv na dodir, baterija"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"zatamnjeni ekran, noć, boja, noćna smjena, osvjetljenje, boja ekrana, boja"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"pozadina, personalizirati, prilagoditi ekran"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"veličina teksta"</string>
@@ -3045,8 +3052,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"mreža, stanje mobilne mreže, stanje usluge, jačina signala, vrsta mobilne mreže, roming, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"serijski broj, verzija hardvera"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"nivo sigurnosne zakrpe za android, verzija nemoduliranog signala, osnovna verzija"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambijentalni prikaz, Prikaz zaključavanja ekrana"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"otisak prsta"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"zatamnjenje ekrana, ekran osjetljiv na dodir, baterija, pametna osvijetljenost, dinamička osvijetljenost"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"rotirati, obrnuti, rotacija, uspravno, vodoravno, orijentacija, vertikalno, horizontalno"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"nadograditi, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, raspored, obavještenja, blokirati, tišina, vibriranje, stanje mirovanja, rad, fokusiranje, zvuk, isključenje zvuka, dan, radni dan, vikend, radni dan uvečer, događaj"</string>
@@ -3130,18 +3140,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Dozvolite vizualnu signalizaciju"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Kada je uključen način rada Ne ometaj"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Obavještenja"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Nečujno prikaži obavještenja"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Zvuk obavještenja će biti isključen"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Obavještenja bez zvuka"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Obavještenja ćete vidjeti na ekranu"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Telefon neće puštati zvuk ili vibrirati kada stignu nova obavještenja."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Sakrij obavještenja"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Nećete vidjeti nova ili postojeća obavještenja"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Obavještenja bez vizuelnih elemenata ili zvuka"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Obavještenja nećete vidjeti niti čuti"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Telefon neće prikazivati nova ili postojeća obavještenja, puštati zvuk ili vibrirati. Obavještenja se neće prikazivati kada prevučete od vrha ekrana prema dolje.\n\nImajte na umu da će se kritična obavještenja o aktivnosti i statusu telefona i dalje pojavljivati."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Prilagođeno"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Omogući prilagođenu postavku"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Ukloni prilagođenu postavku"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Prikazat će se"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Obavještenja bez zvuka"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Djelimično skriveno"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Skriveno"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Obavještenja bez vizuelnih elemenata ili zvuka"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Prilagođena ograničenja"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Kada je ekran uključen"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Kada je ekran isključen"</string>
@@ -3202,19 +3212,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Zvuk je isključen, ali omogući <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> i <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Poruke, događaji i podsjetnici"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Kada je uključen način rada Ne ometaj, zvuk poruka, podsjetnika i događaja će biti isključen, osim za stavke koje omogućite iznad. Postavke poruka možete podesiti tako da omogućite prijateljima, porodici ili drugim kontaktima da vas kontaktiraju."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Gotovo"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Postavke"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Obavještenja bez vizuelnih elemenata ili zvuka"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Obavještenja bez zvuka"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Obavještenja nećete vidjeti ili čuti. Dozvoljeni su pozivi od kontakata označenih zvjezdicom i ponovljenih pozivalaca."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Trenutna postavka)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Promijeniti postavke obavještenja načina rada Ne ometaj?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Zvukovi radnog profila"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Koristite zvukove ličnog profila"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Zvukovi su isti za radni i lični profil"</string>
@@ -3390,11 +3394,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Dozvoli pozive"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Kada je uključen način rada Ne ometaj, blokirani su dolazni pozivi. Postavke možete podesiti tako da omogućite prijateljima, porodici ili drugim kontaktima da vas kontaktiraju."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Kontakti označeni zvjezdicom"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">i još <xliff:g id="NUM_PEOPLE">%d</xliff:g> osoba</item>
-      <item quantity="few">i još <xliff:g id="NUM_PEOPLE">%d</xliff:g> osobe</item>
-      <item quantity="other">i još <xliff:g id="NUM_PEOPLE">%d</xliff:g> osoba</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Poruke"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Dozvoli poruke"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Poruke"</string>
@@ -3418,7 +3418,7 @@
     <string name="zen_mode_starred_callers" msgid="1023167821338514140">"kontakti označeni zvjezdicom"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Ponovni pozivaoci"</string>
     <string name="zen_mode_repeat_callers_title" msgid="8553876328249671783">"Dozvoli ponovne pozivaoce"</string>
-    <string name="zen_mode_calls_summary_one" msgid="3972333792749874863">"Iz <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_calls_summary_one" msgid="3972333792749874863">"Vrsta pozivaoca: <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
     <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Od pozivaoca <xliff:g id="CALLER_TYPE">%1$s</xliff:g> i <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Ukoliko ista osoba pozove ponovo u roku od <xliff:g id="MINUTES">%d</xliff:g> min"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Prilagođeno"</string>
@@ -3837,10 +3837,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Hladna temperatura boje"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Koristite hladnije boje prikaza"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Isključite ekran kako biste primijenili promjenu boje"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Nadzor povezivanja"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Nadzor povezivanja će prikupiti zapisnike kada otkrije problem sa povezivanjem i obavijestiti korisnika da prijavi grešku"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Da primijenite promjenu na nadzoru povezivanja, ponovo pokrenite uređaj"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Laserski senzor kamere"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Logička kamera kao zadana"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatsko ažuriranje sistema"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Ažuriraj nakon što se uređaj ponovo pokrene"</string>
     <string name="usage" msgid="2977875522080448986">"Potrošnja"</string>
@@ -3882,7 +3880,7 @@
       <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> aplikacije smiju upotrebljavati neograničene podatke kada je Ušteda podataka uključena</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplikacija smije upotrebljavati neograničene podatke kada je Ušteda podataka uključena</item>
     </plurals>
-    <string name="data_usage_title" msgid="3659356290392241789">"Primarni podaci"</string>
+    <string name="data_usage_title" msgid="3659356290392241789">"Primarni plan prijenosa podataka"</string>
     <string name="data_usage_wifi_title" msgid="7063659423081820720">"Wi‑Fi podaci"</string>
     <string name="data_used" msgid="5116389957228457203">"<xliff:g id="ID_1">^1</xliff:g> iskorišteno"</string>
     <string name="data_used_formatted" msgid="2989129931961311051">"Iskorišteno je <xliff:g id="ID_1">^1</xliff:g> <xliff:g id="ID_2">^2</xliff:g>"</string>
@@ -4164,8 +4162,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Usluga automatskog popunjavanja"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatski, popunjavanje, automatsko popunjavanje"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Vodite računa da je to pouzdana aplikacija&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Automatsko popunjavanje&gt;%1$s&lt;/xliff:g&gt; koristi sadržaj na vašem ekranu da odredi šta se može automatski popuniti."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Tema uređaja"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Boja teme"</string>
     <string name="default_theme" msgid="7085644992078579076">"Zadano"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Tema uređaja"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automatski (na osnovu pozadinske slike)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Svijetlo"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Tamno"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Naziv mreže"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Prikaz naziva mreže na statusnoj traci"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Upravitelj pohranom: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4177,7 +4179,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operater koji pruža informacije"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktiviranje dodjele resursa operatera"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Ažurirajte način rada Ne ometaj"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Sakrijte obavještenja da ostanete fokusirani"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pauzirajte obavještenja da ostanete fokusirani"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Šta je novo i uzbudljivo?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Upoznajte se s novim telefonom"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Upoznajte se s novim tabletom"</string>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 3be4072..2334a65 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Sempre activat"</item>
     <item msgid="6385301106124765323">"Sempre desactivat"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 6c0c885..22d8802 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Permet que la tauleta es comuniqui amb dispositius Bluetooth que estiguin a prop"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Permet que el dispositiu es comuniqui amb dispositius Bluetooth que estiguin a prop"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Permet que el telèfon es comuniqui amb dispositius Bluetooth que estiguin a prop"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Desactiva baixada de maquinari (BT A2DP)"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Vols reiniciar-lo?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Has de reiniciar el dispositiu per canviar aquesta opció."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Reinicia"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Cancel·la"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Dispositius multimèdia disponibles"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Dispositius de trucada disponibles"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Connectats actualment"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Preferències de connexió"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Dispositius connectats prèviament"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Connectats prèviament"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Data i hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Selecció de la zona horària"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"El port que has escrit no és vàlid."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"El navegador utilitza un servidor intermediari HTTP, però pot ser que la resta d\'aplicacions no."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"URL PAC: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Amplada de banda de baixada (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Amplada de banda de pujada (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Informació d\'ubicació del mòbil (obsoleta):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Informació dels mòbils adjacents (obsoleta):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Configuració del canal físic d\'LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Freqüència d\'actualització de la informació del mòbil:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Tota la informació de mesures del mòbil:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Informació en temps real de la connexió de dades:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Servei de dades:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Itinerància:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillantor automàtica"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Aixeca el dispositiu per activar-lo"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Pantalla ambient"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Sempre activada / Consumeix més bateria"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Notificacions noves"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Quan es mostra"</string>
     <string name="doze_title" msgid="2375510714460456687">"Notificacions noves"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Activa la pantalla en rebre notificacions"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">El codi PIN de la SIM no és correcte. Et queda <xliff:g id="NUMBER_0">%d</xliff:g> intent; si no l\'encertes, contacta amb l\'operador de telefonia mòbil per desbloquejar el dispositiu.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Hi ha hagut un problema en l\'operació del PIN de la SIM."</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Estat de la tauleta"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Estat del telèfon"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Actualitzacions del sistema"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versió d\'Android"</string>
@@ -2434,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Senyal de trucada d\'emergència"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Defineix el comportament quan es fa una trucada d\'emergència"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Còpia de seguretat"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Activada"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Desactivada"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Còpia de seguretat i restauració"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dades personals"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Còpia de seguretat de les meves dades"</string>
@@ -2760,6 +2766,12 @@
       <item quantity="one">Comprova el certificat</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Diversos usuaris"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Usuaris i perfils"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Afegeix un usuari o un perfil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Afegeix un usuari"</string>
@@ -2942,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ús de dades"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"punt d\'accés Wi-Fi"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositius connectats"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, mode de conducció, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, mode de conducció"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicacions i notificacions"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permisos, aplicacions predeterminades"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Comptes"</string>
@@ -2966,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"launcher, menú d\'aplicacions, predeterminat, aplicacions"</string>
     <string name="keywords_display" msgid="8910345814565493016">"pantalla, pantalla tàctil"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"pantalla atenuada, pantalla tàctil, bateria, brillantor"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"pantalla atenuada, pantalla tàctil, bateria"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"pantalla atenuada, nit, color, canvi nocturn, brillantor, color de la pantalla, colors"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"fons de pantalla, personalitzar, personalitzar la pantalla"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"mida del text"</string>
@@ -3007,8 +3014,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"xarxa, estat de la xarxa mòbil, estat del servei, intensitat del senyal, tipus de xarxa mòbil, itinerància, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"número de sèrie, versió de maquinari"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"nivell de pedaç de seguretat d\'Android, versió de banda base, versió de kernel"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Pantalla ambient, pantalla de bloqueig"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"empremta digital"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"pantalla atenuada, pantalla tàctil, bateria, brillantor intel·ligent, brillantor dinàmica"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"gir, canvi, rotació, retrat, paisatge, orientació, vertical, horitzontal"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"actualitzar, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"no molestis, programar, notificacions, bloqueig, silenci, vibrar, mentre dormo, mentre treballo, concentració, so, silenciar, dia, dia laborable, cap de setmana, nit entre setmana, esdeveniment"</string>
@@ -3091,18 +3101,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permet senyals visuals"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Quan el mode No molestis estigui activat"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notificacions"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Mostra les notificacions de manera silenciosa"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Les notificacions se silenciaran"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Notificacions sense so"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Veuràs notificacions a la pantalla"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Quan arribin notificacions, el telèfon no emetrà cap so ni vibrarà."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Amaga les notificacions"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"No veuràs cap notificació nova ni anterior"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Notificacions sense so ni elements visuals"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"No veuràs ni sentiràs notificacions"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"El telèfon no et mostrarà les notificacions noves o anteriors ni tampoc vibrarà ni emetrà cap so. No veuràs les notificacions quan llisquis cap avall des de la part superior de la pantalla.\n\nTingues en compte que les notificacions importants relacionades amb l\'activitat i l\'estat del telèfon es continuaran mostrant."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Personalitzat"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Activa la configuració personalitzada"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Suprimeix la configuració personalitzada"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"No ocultes"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Notificacions sense so"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Parcialment ocultes"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Ocultes"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Notificacions sense so ni elements visuals"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Restriccions personalitzades"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Quan la pantalla estigui activada"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Quan la pantalla estigui desactivada"</string>
@@ -3161,25 +3171,19 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Silenciat, però permet <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> i <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Missatges, esdeveniments i recordatoris"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Quan actives el mode No molestis, els missatges, els recordatoris i els esdeveniments se silencien, excepte aquells elements que hagis permès més amunt. Pots ajustar la configuració dels missatges per permetre que amics, familiars i altres contactes puguin contactar amb tu."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Fet"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Configuració"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Notificacions sense so ni elements visuals"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Notificacions sense so"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"No veuràs ni sentiràs notificacions. Estan permeses les trucades dels contactes destacats i les trucades repetides."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(configuració actual)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Vols canviar la configuració de notificacions del mode No molestis?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Sons del perfil professional"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Utilitza sons del perfil pers."</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Els sons del perfil professional i personal són els mateixos"</string>
     <string name="work_ringtone_title" msgid="5806657896300235315">"So de trucada professional"</string>
     <string name="work_notification_ringtone_title" msgid="6081247402404510004">"So de notificació professional predeterminat"</string>
-    <string name="work_alarm_ringtone_title" msgid="1441926676833738891">"So d\'alarma professional predeterminat"</string>
+    <string name="work_alarm_ringtone_title" msgid="1441926676833738891">"So d\'alarma de la feina predeterminat"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Igual que al perfil personal"</string>
     <string name="work_sync_dialog_title" msgid="7123973297187354813">"Vols substituir els sons?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Substitueix"</string>
@@ -3345,10 +3349,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Permet les trucades"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Quan actives el mode No molestis, les trucades entrants es bloquegen. Pots ajustar la configuració per permetre que amics, familiars i altres persones puguin contactar amb tu."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Contactes destacats"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">i <xliff:g id="NUM_PEOPLE">%d</xliff:g> més</item>
-      <item quantity="one">i 1 més</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Missatges"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Permet els missatges"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Missatges"</string>
@@ -3778,10 +3779,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de color freda"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilitza colors de pantalla més freds"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Desactiva la pantalla per aplicar el canvi de color"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitor de connectivitat"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor recopila registres en detectar un problema de connexió i mostra una notificació a l\'usuari perquè informi de l\'error"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Per aplicar canvis al monitor de connectivitat, reinicia el dispositiu"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor del làser de la càmera"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Utilitza la càmera lògica com a predeterminada"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Actualitzacions del sistema automàtiques"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Aplica les actualitzacions quan es reiniciï el dispositiu"</string>
     <string name="usage" msgid="2977875522080448986">"Ús"</string>
@@ -4091,8 +4090,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Servei Emplenament automàtic"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automàtic, emplenament, emplenament automàtic"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Assegura\'t que confies en aquesta aplicació&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Emplenament automàtic de Google&gt;%1$s&lt;/xliff:g&gt; utilitza el contingut que es mostra a la pantalla per determinar què es pot emplenar automàticament."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Tema del dispositiu"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Tema de color"</string>
     <string name="default_theme" msgid="7085644992078579076">"Predeterminat"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Tema del dispositiu"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automàtic (segons el fons de pantalla)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Clar"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Fosc"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Nom de la xarxa"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Mostra el nom de la xarxa a la barra d\'estat"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gestor d\'emmagatzematge: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4104,7 +4107,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informació de serveis de l\'operador de telefonia mòbil"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Activa els serveis de l\'operador de telefonia mòbil"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Actualitza el mode No molestis"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Amaga les notificacions per centrar l\'atenció"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Posa en pausa les notificacions per centrar l\'atenció"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Quines són les novetats més importants?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Dona una ullada al teu telèfon nou"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Dona una ullada a la teva tauleta nova"</string>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 718082e..0514c0b 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Vždy zapnuto"</item>
     <item msgid="6385301106124765323">"Vždy vypnuto"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 9cab652..a87c0d5 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -175,6 +175,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Povolte tabletu komunikovat se zařízeními Bluetooth v okolí"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Povolte zařízení komunikovat se zařízeními Bluetooth v okolí"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Povolte telefonu komunikovat se zařízeními Bluetooth v okolí"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Zakázat hardwarové snížení zátěže Bluetooth (A2DP)"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Restartovat zařízení?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Ke změně nastavení je nutné restartovat zařízení."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Restartovat"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Zrušit"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Dostupná mediální zařízení"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Dostupná telefonní zařízení"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Momentálně připojeno"</string>
@@ -184,6 +189,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Předvolby připojení"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Dříve připojená zařízení"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Dříve připojeno"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Datum a čas"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Vybrat časové pásmo"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -209,11 +216,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Zadaný port není platný."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy server protokolu HTTP může používat prohlížeč, ale nesmí jej používat další aplikace."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"Adresa URL PAC: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Rychlost stahování (kB/s):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Rychlost nahrávání (kB/s):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Informace o poloze mobilní sítě (podpora ukončena):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Informace o sousední mobilní síti (podpora ukončena):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Konfigurace fyzického kanálu LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Interval obnovení informací o mobilní síti:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Všechny údaje o měření mobilní sítě:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Informace o datovém připojení v reálném čase:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Datová služba:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1178,8 +1186,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Probudit zvednutím zařízení"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambientní displej"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Vždy zapnuto (zvýšené využití baterie)"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nová oznámení"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kdy zobrazit"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nová oznámení"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Probudit obrazovku, když dostanete oznámení"</string>
@@ -1226,8 +1232,6 @@
       <item quantity="one">Zadali jste nesprávný PIN SIM karty. Zbývá <xliff:g id="NUMBER_0">%d</xliff:g> pokus, poté bude muset zařízení odemknout operátor.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Operace pomocí kódu PIN SIM karty se nezdařila!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stav tabletu"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Stav telefonu"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Aktualizace systému"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Verze systému Android"</string>
@@ -2166,8 +2170,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Využití na pozadí omezit nelze"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Omezit aktivitu na pozadí?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Pokud u aplikace omezíte aktivitu na pozadí, může dojít k nepředvídatelnému chování"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Aplikace není nastavena k optimalizaci baterie, nelze ji tedy omezit.\n\nChcete-li ji omezit, nejprve zapněte optimalizaci."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Využití obrazovky od úplného nabití"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Spotřeba obrazovky"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Vyhledávání mobilních sítí"</string>
@@ -2501,6 +2504,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Signál nouzového vytáčení"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Nastavit chování při tísňovém volání"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Záloha"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Zapnuto"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Vypnuto"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Zálohování a obnovení"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Osobní údaje"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Zálohování mých dat"</string>
@@ -2835,6 +2840,12 @@
       <item quantity="one">Zkontrolovat certifikát</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Více uživatelů"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Uživatelé a profily"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Přidat uživatele nebo profil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Přidat uživatele"</string>
@@ -3019,14 +3030,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"využití dat"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Připojená zařízení"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, režim jízdy autem, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, režim jízdy autem"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikace a oznámení"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Oprávnění, výchozí aplikace"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Účty"</string>
@@ -3043,7 +3050,6 @@
     <string name="keywords_home" msgid="294182527446892659">"spouštěč, výchozí, aplikace"</string>
     <string name="keywords_display" msgid="8910345814565493016">"displej, dotyková obrazovka"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"ztlumení obrazovky, dotyková obrazovka, baterie, jas"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"ztlumení obrazovky, dotyková obrazovka, baterie"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"ztlumení obrazovky, noc, tónování, noční směna, jas, barva obrazovky, barvy"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"pozadí, personalizace, přizpůsobení displeje"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"velikost textu"</string>
@@ -3084,8 +3090,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"síť, stav mobilní sítě, stav služby, síla signálu, typ mobilní sítě, roaming, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"sériové číslo, verze hardwaru"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"úroveň opravy zabezpečení androidu, verze základního pásma, verze jádra"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambientní displej, displej zámku obrazovky"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"otisk prstu"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"ztlumení obrazovky, dotyková obrazovka, baterie, chytrý jas, dynamický jas"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"otočení, překlopení, rotace, na výšku, na šířku, orientace, vertikální, horizontální"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"upgradovat, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"nerušit, plán, oznámení, blokovat, ticho, vibrace, spánek, práce, soustředění, zvuk, ztlumení, den, pracovní den, víkend, noc, událost"</string>
@@ -3170,18 +3179,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Povolit vizuální signály"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Když je zapnut režim Nerušit"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Oznámení"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Zobrazovat oznámení tiše"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Oznámení budou ztlumena"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Oznámení bez zvukového upozornění"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Oznámení se zobrazí na obrazovce"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Nová oznámení nebudou vydávat zvuk ani vibrovat"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Skrýt oznámení"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Nebudou se zobrazovat nová ani stávající oznámení."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Oznámení bez vizuálního a zvukového upozornění"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Oznámení nebudou vidět ani slyšet"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Telefon nebude zobrazovat nová ani stávající oznámení a nebude vydávat zvuky ani vibrovat. Oznámení se nezobrazí, ani když přejedete prstem z horní části obrazovky.\n\nKritická oznámení související s aktivitou a stavem telefonu se však nadále zobrazovat budou."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Vlastní"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Aktivovat vlastní nastavení"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Odstranit vlastní nastavení"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Zobrazí se"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Oznámení bez zvukového upozornění"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Částečně skryté"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Skryté"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Oznámení bez vizuálního a zvukového upozornění"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Vlastní omezení"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Když je obrazovka zapnutá"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Když je obrazovka vypnutá"</string>
@@ -3244,19 +3253,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Ztlumeno, ale povolit <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> a <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Zprávy, události a připomenutí"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Když je zapnut režim Nerušit, zprávy, připomenutí a události budou ztlumeny (kromě položek, které povolíte výše). Nastavení zpráv můžete upravit, aby vás mohli kontaktovat kamarádi, členové rodiny nebo jiní vybraní lidé."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Hotovo"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Nastavení"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Oznámení bez vizuálního a zvukového upozornění"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Oznámení bez zvukového upozornění"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Oznámení nebudou vidět ani slyšet. Hovory od kontaktů s hvězdičkou a lidí, co volají opakovaně, jsou povoleny."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Aktuální nastavení)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Chcete změnit nastavení oznámeni režimu Nerušit?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Zvuky pracovního profilu"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Použít zvuky osobního profilu"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Zvuky pracovního a osobního profilu jsou stejné"</string>
@@ -3436,12 +3439,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Povolit hovory"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Když je zapnut režim Nerušit, příchozí hovory jsou blokovány. Nastavení můžete upravit, aby se vám dovolali kamarádi, členové rodiny nebo jiné vybrané kontakty."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Kontakty označené hvězdičkou"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="few">a <xliff:g id="NUM_PEOPLE">%d</xliff:g> další</item>
-      <item quantity="many">a <xliff:g id="NUM_PEOPLE">%d</xliff:g> dalšího</item>
-      <item quantity="other">a <xliff:g id="NUM_PEOPLE">%d</xliff:g> dalších</item>
-      <item quantity="one">a 1 další</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Zprávy"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Povolit zprávy"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Zprávy"</string>
@@ -3897,10 +3895,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Studené barvy"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Použijí se studenější barvy zobrazení"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Chcete-li změnu barev použít, vypněte obrazovku"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Služba ConnectivityMonitor při problému s připojením vygeneruje protokoly a zobrazí uživateli oznámení s výzvou k nahlášení chyby"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Chcete-li použít změnu sledování připojení, restartujte zařízení"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Laserový senzor fotoaparátu"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Logický fotoaparát jako výchozí"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatické aktualizace systému"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Nainstalovat aktualizace po restartu zařízení"</string>
     <string name="usage" msgid="2977875522080448986">"Využití"</string>
@@ -4238,8 +4234,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Služba automatického vyplňování"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatické vyplňování, vyplňování"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Zkontrolujte, zda se jedná o důvěryhodnou aplikaci&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Automatické doplňování Google&gt;%1$s&lt;/xliff:g&gt; určuje na základě obsahu obrazovky, co lze automaticky vyplnit."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Motiv zařízení"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Barevný motiv"</string>
     <string name="default_theme" msgid="7085644992078579076">"Výchozí"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Motiv zařízení"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automatický (podle tapety)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Světlý"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Tmavý"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Název sítě"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Zobrazovat název sítě na stavovém řádku"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Správce úložiště: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4251,7 +4251,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informace o zprovoznění služby u operátora"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Spustit zprovoznění služby u operátora"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Aktualizujte režim Nerušit"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Pokud nechcete být rušeni, skryjte oznámení"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pokud nechcete být rušeni, oznámení pozastavte"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Co je nové a zajímavé?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Prohlédněte si svůj nový telefon"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Prohlédněte si svůj nový tablet"</string>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index ab89d3b..0c35f2e 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Altid aktiveret"</item>
     <item msgid="6385301106124765323">"Altid deaktiveret"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 2e759be..88b74b4 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Tillad, at din tablet kommunikerer med Bluetooth-enheder i nærheden"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Tillad, at enheden kommunikerer med Bluetooth-enheder i nærheden"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Tillad, at telefonen kommunikerer med Bluetooth-enheder i nærheden"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Deaktiver Bluetooth A2DP-hardwareaflastning"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Genstart enheden?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Genstart enheden for at skifte indstilling"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Genstart"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Annuller"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Tilgængelige medieenheder"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Tilgængelige opkaldsenheder"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Forbundet lige nu"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Præferencer for forbindelse"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Tidligere tilsluttede enheder"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Tidligere forbindelser"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Dato og klokkeslæt"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Vælg tidszone"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Den indtastede port er ikke gyldig."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP-proxyen anvendes af browseren, men må ikke bruges af andre apps."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"Webadresse til PAC: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Båndbredde til download (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Båndbredde til upload (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Oplysning om placering af celle (udfaset):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Oplysninger om naboceller (udfaset):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Fysisk kanalkonfiguration for LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Opdateringsfrekvens for celleoplysninger:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Alle oplysninger om cellemåling:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Oplysninger om dataforbindelse i realtid:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Datatjeneste:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI-nummer:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Løft enheden for at vække den"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Aktiv låseskærm"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Altid aktiveret/Øget batteriforbrug"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nye underretninger"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Hvornår skal den vises"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nye underretninger"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Væk skærmen, når du modtager underretninger"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="other">Forkert pinkode til SIM-kort. Du har <xliff:g id="NUMBER_1">%d</xliff:g> forsøg tilbage.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Pinkoden til SIM-kortet blev afvist."</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status for tabletcomputeren"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefonstatus"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Systemopdateringer"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android-version"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Baggrundsforbruget kan ikke begrænses"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Vil du begrænse baggrundsaktiviteten?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Hvis du begrænser en apps baggrundsaktivitet, kan det medføre, at den ikke fungerer korrekt"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Appen kan ikke begrænses, da batterioptimering er deaktiveret.\n\nAktivér batterioptimering for at begrænse appen."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Brug af skærmen siden fuld opladning"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Skærmens strømforbrug"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Scanning af mobilnetværk"</string>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Ringesignal i nødsituationer"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Angiv adfærd ved nødopkald"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Backup"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Til"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Fra"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Backup og gendannelse"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personlige oplysninger"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Sikkerhedskopiér data"</string>
@@ -2569,7 +2574,7 @@
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"Mobildata"</string>
     <string name="data_usage_data_limit" msgid="1193930999713192703">"Angiv datagrænse"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Cyklus for dataforbrug"</string>
-    <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"Appforbrug"</string>
+    <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"Appbrug"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Dataroaming"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Begræns baggrundsdata"</string>
     <string name="data_usage_menu_allow_background" msgid="2694761978633359223">"Tillad baggrundsdata"</string>
@@ -2761,6 +2766,12 @@
       <item quantity="other">Tjek certifikater</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Flere brugere"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Brugere og profiler"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Tilføj en bruger eller en profil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Tilføj bruger"</string>
@@ -2943,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"dataforbrug"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Forbundne enheder"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, køretilstand, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, køretilstand"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps og underretninger"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Tilladelser, standardapps"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Konti"</string>
@@ -2967,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"starter, standard, apps"</string>
     <string name="keywords_display" msgid="8910345814565493016">"skærm, touchskærm"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"nedtone skærm, touchskærm, batteri, lys"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"nedton skærm, touchskærm, batteri"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"dæmpe skærm, aften, nat, farvetone, night shift, lysstyrke, skærmfarve, farve"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"baggrund, tilpas, tilpas skærm"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tekststørrelse"</string>
@@ -3008,8 +3014,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"netværk, mobilnetværkstilstand, netværkstilstand, signalstyrke, type mobilnetværk, roaming, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"serienummer, hardwareversion"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"niveau for programrettelse i Android, basebandversion, kernesystem"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Aktiv låseskærm, visning af låseskærm"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"fingeraftryk"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"dæmp skærmlys, touchskærm, batteri, intelligent lysstyrke, dynamisk klarhed"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"rotere, vende, rotation, stående, liggende, retning, lodret, vandret"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"opgradere, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"forstyr ikke, planlægge, underretninger, blokere, lydløs, vibrere, sove, arbejde, fokusere, lyd, slå lyden fra, dag, hverdag, weekend, hverdagsaften, begivenhed"</string>
@@ -3092,18 +3101,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Tillad visuelle signaler"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Når Forstyr ikke er aktiveret"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Underretninger"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Vis underretninger lydløst"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Lyden slås fra for underretninger"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Ingen lyd fra underretninger"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Underretninger vises på skærmen"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Din telefon vil ikke afspille lyd eller vibrere, når du får underretninger."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Skjul underretninger"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Du får ikke vist nogen nye eller eksisterende underretninger"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Ingen lyd eller visuelle signaler fra underretninger"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Underretninger kan ikke ses eller høres"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Din telefon vil ikke vise nye eller eksisterende underretninger på din telefon, og den vil ikke afspille lyd eller vibrere. Der bliver ikke vist underretninger, når du stryger nedad fra toppen af skærmen.\n\nHusk! Der vises stadig kritiske underretninger for telefonaktivitet og -status."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Tilpassede indstillinger"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Aktivér tilpasset indstilling"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Fjern tilpasset indstilling"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Vises"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Ingen lyd fra underretninger"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Delvist skjult"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Skjult"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Ingen lyd eller visuelle signaler fra underretninger"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Tilpassede begrænsninger"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Når skærmen er tændt"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Når skærmen er slukket"</string>
@@ -3162,19 +3171,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Lyden er slået fra, men tillad <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> og <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Beskeder, begivenheder og påmindelser"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Når Forstyr ikke er aktiveret, slås lyden fra for beskeder, påmindelser og begivenheder med undtagelse af de elementer, du tillader ovenfor. Du kan ændre beskedindstillingerne, så dine venner, din familie eller andre kontaktpersoner kan få fat i dig."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Udfør"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Indstillinger"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Ingen lyd eller visuelle signaler fra underretninger"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Ingen lyd fra underretninger"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Underretninger kan ikke ses eller høres. Opkald fra stjernemarkerede kontaktpersoner og gentagne opkald er tilladt."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(aktuel indstilling)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Vil du ændre underretningsindstillingerne for Forstyr ikke?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Lyde for arbejdsprofil"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Brug lyde fra privat profil"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Lydene er de samme for din arbejdsprofil og din personlige profil"</string>
@@ -3346,10 +3349,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Tillad opkald"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Når Forstyr ikke er aktiveret, blokeres indgående opkald. Du kan ændre indstillingerne, så dine venner, dine familie eller andre kontaktpersoner kan få fat i dig."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Stjernemarkerede kontaktpersoner"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">og <xliff:g id="NUM_PEOPLE">%d</xliff:g> anden</item>
-      <item quantity="other">og <xliff:g id="NUM_PEOPLE">%d</xliff:g> andre</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Beskeder"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Tillad beskeder"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Beskeder"</string>
@@ -3530,7 +3530,7 @@
     <string name="apps_storage" msgid="4353308027210435513">"Applagerplads"</string>
     <string name="usage_access" msgid="5479504953931038165">"Adgang til forbrug"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"Tillad adgang til forbrug"</string>
-    <string name="app_usage_preference" msgid="7065701732733134991">"Præferencer for appforbrug"</string>
+    <string name="app_usage_preference" msgid="7065701732733134991">"Præferencer for appbrug"</string>
     <string name="time_spent_in_app_pref_title" msgid="649419747540933845">"Tidsforbrug i appen"</string>
     <string name="usage_access_description" msgid="1352111094596416795">"Med adgang til forbrug kan en app aflæse, hvilke andre apps du anvender og hvor ofte, samt dit mobilselskab, dine sprogindstillinger og andre oplysninger."</string>
     <string name="memory_settings_title" msgid="7490541005204254222">"Hukommelse"</string>
@@ -3619,7 +3619,7 @@
     <string name="average_memory_use" msgid="829566450150198512">"Gennemsnitligt hukommelsesforbrug"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"Maksimal hukommelsesforbrug"</string>
     <string name="memory_usage" msgid="1781358557214390033">"Hukommelsesforbrug"</string>
-    <string name="app_list_memory_use" msgid="6987417883876419338">"Appforbrug"</string>
+    <string name="app_list_memory_use" msgid="6987417883876419338">"Appbrug"</string>
     <string name="memory_details" msgid="5943436005716991782">"Oplysninger"</string>
     <string name="memory_use_summary" msgid="5608257211903075754">"Der er i gennemsnit brugt <xliff:g id="SIZE">%1$s</xliff:g> hukommelse inden for de sidste tre timer"</string>
     <string name="no_memory_use_summary" msgid="2016900536806235588">"Der er ikke brugt hukommelse inden for de sidste tre timer"</string>
@@ -3779,10 +3779,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Kølig farvetemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Brug køligere skærmfarver"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Du skal slå skærmen fra, før du kan anvende farveændringer"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Overvågning af forbindelse"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor indsamler logfiler, når der registreres et forbindelseproblem, og sender brugeren en underretning for at bede vedkommende om at indsende en fejlrapport"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Genstart enheden for at anvende ændringen i forbindelse med overvågning af forbindelse"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameraets lasersensor"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Logisk kamera som standard"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatiske systemopdateringer"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Anvend opdateringer, når enheden genstarter"</string>
     <string name="usage" msgid="2977875522080448986">"Forbrug"</string>
@@ -4092,8 +4090,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"AutoFyld-tjenesten"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatisk, udfyld, autofyld"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Sørg for, at du har tillid til denne app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; anvender indholdet af din skærm til at fastslå, hvad der kan udfyldes automatisk."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Enhedstema"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Farvetema"</string>
     <string name="default_theme" msgid="7085644992078579076">"Standard"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Enhedstema"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automatisk (baseret på baggrunden)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Lyst"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Mørkt"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Netværksnavn"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Vis netværksnavn på statusbjælken"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Lagerstyring: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4105,7 +4107,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Oplysninger om mobilselskab"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktivér mobilselskab"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Opdater Forstyr ikke"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Skjul underretninger for at bevare dit fokus"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Sæt underretninger på pause, så du kan koncentrere dig"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Hvad er nyt og spændende?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Få en rundvisning på din nye telefon"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Få en rundvisning på din nye tablet"</string>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index c30bb9b..d15265b 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Immer an"</item>
     <item msgid="6385301106124765323">"Immer aus"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 695bb88..7de37cf 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -172,6 +172,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Kommunikation zwischen deinem Tablet und Bluetooth-Geräten in der Nähe zulassen"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Kommunikation zwischen deinem Gerät und Bluetooth-Geräten in der Nähe zulassen"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Kommunikation zwischen deinem Smartphone und Bluetooth-Geräten in der Nähe zulassen"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Bluetooth-A2DP-Hardware-Offload deaktivieren"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Jetzt neu starten?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Die Änderung erfordert einen Neustart des Geräts."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Neu starten"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Abbrechen"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Verfügbare Mediengeräte"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Verfügbare Anrufgeräte"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Derzeit verbunden"</string>
@@ -181,6 +186,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Verbindungseinstellungen"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Zuvor verbundene Geräte"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Zuvor verbundene Geräte"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Datum &amp; Uhrzeit"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Zeitzone wählen"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -206,11 +213,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Der eingegebene Port ist ungültig."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Der HTTP-Proxy wird vom Browser verwendet, möglicherweise aber nicht von anderen Apps."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC-URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL-Bandbreite (kbit/s):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL-Bandbreite (kbit/s):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Standortinformationen des Mobiltelefons (eingestellt):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Informationen zu Mobiltelefon in der Umgebung (eingestellt):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Konfiguration des physischen LTE-Kanals:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Aktualisierungsrate der Mobiltelefoninformationen:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Alle Informationen zu Mobiltelefonmesswerten:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Echtzeit-Informationen zur Datenverbindung:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Datendienst:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1101,7 +1109,7 @@
     <string name="night_display_title" msgid="2626451512200357686">"Nachtlicht"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Beim Nachtlicht wird das Display gelb gefärbt. Dadurch kannst du den Bildschirm bei schwachem Licht leichter lesen und er wirkt beim Einschlafen nicht störend."</string>
     <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Zeitplan"</string>
-    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Keins"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Kein Zeitplan"</string>
     <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Zu benutzerdefinierter Zeit aktiv"</string>
     <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Nachts aktiv"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Beginn"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische Helligkeit"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Zum Aktivieren anheben"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Inaktivitätsdisplay"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Immer aktiviert/erhöhter Akkuverbrauch"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Neue Benachrichtigungen"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Anzeige"</string>
     <string name="doze_title" msgid="2375510714460456687">"Neue Benachrichtigungen"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Bei Benachrichtigungen Bildschirm aktivieren"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">Falscher PIN-Code der SIM-Karte. Noch <xliff:g id="NUMBER_0">%d</xliff:g> Versuch, bevor Gerät vom Mobilfunkanbieter entsperrt werden muss</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Fehler beim Entsperren mit der PIN der SIM-Karte"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tablet-Status"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefonstatus"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Systemupdates"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android-Version"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Hintergrundnutzung kann nicht eingeschränkt werden"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Hintergrundaktivität einschränken?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Wenn du die Hintergrundaktivität einer App einschränkst, kann dies zu unerwünschtem Verhalten führen"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Da bei dieser App der Akkuverbrauch nicht optimiert wird, kannst du sie nicht einschränken.\n\nDazu musst du zuerst die Akkuoptimierung aktivieren."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Displaynutzung seit letzter vollständiger Aufladung"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Displayverbrauch"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobilfunknetzsuche"</string>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Notrufsignal"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Verhalten bei einem Notruf festlegen"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Sicherung"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"An"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Aus"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Sicherung &amp; Wiederherstellung"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personenbezogene Daten"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Meine Daten sichern"</string>
@@ -2761,6 +2766,12 @@
       <item quantity="one">Zertifikat prüfen</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Mehrere Nutzer"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Nutzer &amp; Profile"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Nutzer oder Profil hinzufügen"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Nutzer hinzufügen"</string>
@@ -2943,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"Datennutzung"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"Hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Verbundene Geräte"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, Fahrmodus, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, Fahrmodus"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps &amp; Benachrichtigungen"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Berechtigungen, Standard-Apps"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Konten"</string>
@@ -2967,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"launcher, standard, apps"</string>
     <string name="keywords_display" msgid="8910345814565493016">"bildschirm, display, touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"display dimmen, touchscreen, akku, hell"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"display dimmen, bildschirm dimmen, touchscreen, akku"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"display dimmen, nacht, farbton, night shift, helligkeit, displayfarbe, farbe, nachtmodus"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"hintergrund, personalisieren, display anpassen, bildschirm anpassen"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"textgröße"</string>
@@ -3008,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"netzwerk, status des mobilfunknetz, servicestatus, signalstärke, art des mobilfunknetzes, roaming, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"seriennummer, hardwareversion"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"stand der sicherheitsupdates android, baseband version, kernel version"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Inaktivitätsdisplay, Sperrbildschirm"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"Fingerabdruck"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"drehen, spiegeln, drehung, hochformat, querformat, ausrichtung, vertikal, horizontal"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"upgrade, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, zeitplan, benachrichtigungen, blockieren, lautlos, vibrieren, schlaf, arbeit, fokus, ton, stumm, tag, wochentag, wochenende, wochenende, ereignis"</string>
@@ -3092,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Visuelle Signale zulassen"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Wenn \"Bitte nicht stören\" aktiviert ist"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Benachrichtigungen"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Benachrichtigungen ohne Ton anzeigen lassen"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Benachrichtigungen werden stummgeschaltet"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Kein akustisches Signal bei Benachrichtigungen"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Benachrichtigungen werden angezeigt"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Wenn auf deinem Smartphone neue Benachrichtigungen eingehen, ist weder ein akustisches Signal zu hören noch eine Vibration zu spüren."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Benachrichtigungen ausblenden"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Du siehst keine neuen oder vorhandenen Benachrichtigungen"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Keine optisches oder akustisches Signal bei Benachrichtigungen"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Du siehst und hörst keine Benachrichtigungen"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Auf deinem Smartphone werden keine neuen oder vorhandenen Benachrichtigungen angezeigt. Es ist weder ein akustisches Signal zu hören noch eine Vibration zu spüren. Es erscheinen auch keine Benachrichtigungen, wenn du vom oberen Bildschirmrand nach unten wischst.\n\nBenachrichtigungen für grundlegende Smartphone-Aktivitäten und den Smartphone-Status werden weiterhin angezeigt."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Benutzerdefiniert"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Benutzerdefinierte Einstellung aktivieren"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Benutzerdefinierte Einstellung entfernen"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Werden angezeigt"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Kein akustisches Signal bei Benachrichtigungen"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Teilweise ausgeblendet"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Ausgeblendet"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Keine optisches oder akustisches Signal bei Benachrichtigungen"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Benutzerdefinierte Einschränkungen"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Bei aktiviertem Display"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Bei deaktiviertem Display"</string>
@@ -3162,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Stummgeschaltet, aber <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> und <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> erlauben"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Nachrichten, Termine &amp; Erinnerungen"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Wenn \"Bitte nicht stören\" aktiviert ist, werden alle Nachrichten, Erinnerungen und Termine stummgeschaltet, die du oben nicht ausdrücklich zulässt. Die Nachrichteneinstellungen lassen sich anpassen, damit dich Freunde, Familie oder andere Kontakte erreichen können."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Fertig"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Einstellungen"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Keine optisches oder akustisches Signal bei Benachrichtigungen"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Kein Ton bei Benachrichtigungen"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Du siehst oder hörst keine Benachrichtigungen. Anrufe von markierten Kontakten und wiederholten Anrufern sind erlaubt."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Aktuelle Einstellung)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Einstellungen für \"Bitte nicht stören\" ändern?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Töne für Arbeitsprofil"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Töne vom persönlichen Profil verwenden"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Töne in Arbeits- und privaten Profilen stimmen überein"</string>
@@ -3346,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Anrufe zulassen"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Wenn \"Bitte nicht stören\" aktiviert ist, werden eingehende Anrufe blockiert. Die Einstellungen lassen sich anpassen, sodass Freunde, Familie oder andere Kontakte dich erreichen können."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Markierte Kontakte"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">und <xliff:g id="NUM_PEOPLE">%d</xliff:g> weitere</item>
-      <item quantity="one">und 1 weitere</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Nachrichten"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Nachrichten zulassen"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Nachrichten"</string>
@@ -3779,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Kalte Farbtemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Kältere Displayfarben verwenden"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Deaktiviere den Bildschirm, um die neue Farbeinstellung zu übernehmen"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Mit Connectivity Monitor werden Protokolle erfasst, wenn ein Verbindungsproblem entdeckt wird. Nutzer werden dazu aufgefordert, den Programmfehler zu melden."</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Gerät neu starten, damit die Änderungen bei Connectivity Monitor wirksam werden"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kamera-Lasersensor"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Logical Camera als Standard"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatische Systemupdates"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Updates anwenden, sobald das Gerät neu gestartet wird"</string>
     <string name="usage" msgid="2977875522080448986">"Nutzung"</string>
@@ -4092,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"AutoFill-Dienst"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatisch, ausfüllen, füllen, autofill"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Findest du diese App vertrauenswürdig?&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; entscheidet anhand der Inhalte auf dem Display, welche Informationen automatisch ausgefüllt werden können."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Gerätedesign"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Farbdesign"</string>
     <string name="default_theme" msgid="7085644992078579076">"Standard"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Gerätedesign"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automatisch (je nach Hintergrund)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Hell"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Dunkel"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Netzwerkname"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Netzwerkname in Statusleiste anzeigen"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Speichermanager: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4105,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informationen zur Nutzerverwaltung durch den Anbieter"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Nutzerverwaltung durch den Anbieter auslösen"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"\"Bitte nicht stören\" aktualisieren"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Benachrichtigungen zur besseren Konzentration ausblenden"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Zur besseren Konzentration Benachrichtigungen pausieren"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Was gibt\'s Neues?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Lass dir zeigen, was dein neues Smartphone alles kann"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Lass dir zeigen, was dein neues Tablet alles kann"</string>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index ccffec8..a324383 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Πάντα ενεργή"</item>
     <item msgid="6385301106124765323">"Πάντα ανενεργή"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 8c3174c..f2e5c3b 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Θα επιτρέπεται στο tablet σας να επικοινωνεί με συσκευές Bluetooth σε κοντινή απόσταση"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Θα επιτρέπεται στη συσκευή σας να επικοινωνεί με συσκευές Bluetooth σε κοντινή απόσταση"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Θα επιτρέπεται στο τηλέφωνό σας να επικοινωνεί με συσκευές Bluetooth σε κοντινή απόσταση"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Απεν. μείωσ. φόρτ. εξοπλ. Bluetooth A2DP"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Επανεκ. συσκευής;"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Πρέπει να επανεκκινηθεί η συσκευή για να αλλάξει η ρύθμιση."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Επανεκ."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Ακύρωση"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Διαθέσιμες συσκευές μέσων"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Διαθέσιμες συσκευές κλήσης"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Συνδεδεμένες αυτήν τη στιγμή"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Προτιμήσεις σύνδεσης"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Συσκευές που έχουν συνδεθεί στο παρελθόν"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Συνδέθηκαν στο παρελθόν"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Ημερομηνία &amp; ώρα"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Επιλέξτε ζώνη ώρας"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Η θύρα που πληκτρολογήσατε δεν είναι έγκυρη."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Ο διακ/στής μεσ/σης ΗΤΤΡ μπορεί να χρησ/θεί απο το πρ/μα περ/σης, αλλά όχι από άλλες εφαρμογές."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"URL PAC: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Εύρος ζώνης DL (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Εύρος ζώνης UL (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Πληροφορίες τοποθεσίας κινητής τηλεφωνίας (καταργήθηκε):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Γειτονικές πληροφορίες κινητής τηλεφωνίας (καταργήθηκε):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Διαμόρφωση φυσικού καναλιού LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Ρυθμός ανανέωσης στοιχείων κινητής τηλεφωνίας:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Όλα τα στοιχεία μετρήσεων κινητής τηλεφωνίας:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Πληροφορίες σύνδεσης δεδομένων σε πραγματικό χρόνο:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Υπηρεσία δεδομένων:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Περιαγωγή:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"Αριθμός IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Αυτόματη φωτεινότητα"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Σηκώστε για ενεργοποίηση"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Οθόνη περιβάλλοντος"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Πάντα ενεργή/Αυξημένη χρήση μπαταρίας"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Νέες ειδοποιήσεις"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Χρόνος εμφάνισης"</string>
     <string name="doze_title" msgid="2375510714460456687">"Νέες ειδοποιήσεις"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Αφύπνιση οθόνης κατά τη λήψη ειδοποιήσεων"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">Λανθασμένος κωδικός PIN κάρτας SIM. Απομένει άλλη <xliff:g id="NUMBER_0">%d</xliff:g> προσπάθεια. Στη συνέχεια, θα πρέπει να επικοινωνήσετε με τον πάροχο κινητής τηλεφωνίας σας για να ξεκλειδώσετε τη συσκευή σας.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Αποτυχία λειτουργίας κωδικού PIN κάρτας SIM!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Κατάσταση tablet"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Κατάσταση τηλεφώνου"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Ενημερώσεις συστήματος"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Έκδοση Android"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Δεν είναι δυνατός ο περιορισμός της χρήσης στο παρασκήνιο"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Να περιοριστεί η δραστηριότητα στο παρασκήνιο;"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Εάν περιορίσετε τη δραστηριότητα στο παρασκήνιο για μια εφαρμογή, μπορεί να μην λειτουργήσει σωστά"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Εφόσον δεν έχει οριστεί βελτιστοποίηση μπαταρίας, δεν είναι δυνατός ο περιορισμός της εφαρμογής.\n\nΓια περιορισμό, ενεργοποιήστε τη βελτιστοποίηση."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Χρήση οθόνης από την πλήρη φόρτιση"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Κατανάλωση οθόνης"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Σάρωση δικτύου κινητής τηλεφωνίας"</string>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Σήμα κλήσης έκτακτης ανάγκης"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Ορισμός συμπεριφοράς κατά την πραγματοποίηση κλήσης επείγουσας ανάγκης"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Δημιουργία αντιγράφων ασφαλείας"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Ενεργή"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Ανενεργή"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Δημιουργία αντιγράφου ασφαλείας και επαναφορά"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Προσωπικά δεδομένα"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Δημ/γία αντ/φων ασφ."</string>
@@ -2761,6 +2766,12 @@
       <item quantity="one">Έλεγχος πιστοποιητικού</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Πολλοί χρήστες"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Χρήστες και προφίλ"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Προσθήκη χρήστη ή προφίλ"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Προσθήκη χρήστη"</string>
@@ -2943,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"χρήση δεδομένων"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"σημείο πρόσβασης Wi-Fi"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Συνδεδεμένες συσκευές"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, λειτουργία οδήγησης, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, λειτουργία οδήγησης"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Εφαρμογές και ειδοποιήσεις"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Άδειες, προεπιλεγμένες εφαρμογές"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Λογαριασμοί"</string>
@@ -2967,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"εφαρμογή εκκίνησης, προεπιλογή, εφαρμογές"</string>
     <string name="keywords_display" msgid="8910345814565493016">"οθόνη, οθόνη αφής"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"μείωση φωτεινότητας οθόνης, οθόνη αφής, μπαταρία, φωτεινό"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"μείωση φωτεινότητας οθόνης, οθόνη αφής, μπαταρία"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"μείωση φωτεινότητας οθόνης, νύχτα, απόχρωση, νυχτερινή βάρδια, φωτεινότητα, χρώμα οθόνης, χρώμα"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"φόντο, εξατομίκευση, προσαρμογή οθόνης"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"μέγεθος κειμένου"</string>
@@ -3008,8 +3014,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"δίκτυο, κατάσταση δικτύου κινητής τηλεφωνίας, κατάσταση υπηρεσίας, ισχύς σήματος, τύπος δικτύου κινητής τηλεφωνίας, περιαγωγή, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"σειριακός αριθμός, έκδοση εξοπλισμού"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"επίπεδο ενημέρωσης κώδικα ασφαλείας Android, έκδοση βασικού φάσματος, έκδοση πυρήνα"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Οθόνη περιβάλλοντος, Οθόνη κλειδώματος οθόνης"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"δακτυλικό αποτύπωμα"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"μείωση φωτεινότητας οθόνης, οθόνη αφής, μπαταρία, έξυπνη φωτεινότητα, δυναμική φωτεινότητα"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"περιστρέφω, αναστροφή, περιστροφή, πορτραίτο, οριζόντια, προσανατολισμός, κάθετος, οριζόντιος"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"αναβάθμιση, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, χρονοδιάγραμμα, ειδοποιήσεις, αποκλεισμός, σίγαση, δόνηση, αδράνεια, εργασία, εστίαση, ήχος, σίγαση, ημέρα, καθημερινή, σαββατοκύριακο, νύχτα καθημερινής, συμβάν"</string>
@@ -3092,18 +3101,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Να επιτρέπονται οπτικά σήματα"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Όταν είναι ενεργή η λειτουργία \"Μην ενοχλείτε\""</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Ειδοποιήσεις"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Εμφάνιση ειδοποιήσεων χωρίς ήχο"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Οι ειδοποιήσεις θα τεθούν σε σίγαση"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Ειδοποιήσεις χωρίς ήχο"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Θα βλέπετε ειδοποιήσεις στην οθόνη σας"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Όταν φτάνουν ειδοποιήσεις στο τηλέφωνό σας, θα ειδοποιείστε με κάποιον ήχο ή δόνηση."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Απόκρυψη ειδοποιήσεων"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Δεν θα βλέπετε νέες ή υπάρχουσες ειδοποιήσεις"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Ειδοποιήσεις χωρίς οπτικά στοιχεία και ήχο"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Δεν θα βλέπετε και δεν θα ακούτε ειδοποιήσεις"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Το τηλέφωνό σας δεν θα εμφανίζει νέες ή υπάρχουσες ειδοποιήσεις και δεν θα χρησιμοποιεί ήχους ή δόνηση. Οι ειδοποιήσεις δεν θα εμφανίζονται όταν κάνετε ολίσθηση προς τα κάτω από την κορυφή της οθόνης σας.\n\nΛάβετε υπόψη ότι θα εξακολουθήσουν να εμφανίζονται σημαντικές ειδοποιήσεις για τη δραστηριότητα και την κατάσταση του τηλεφώνου."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Προσαρμοσμένες"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Ενεργοποίηση προσαρμοσμένης ρύθμισης"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Κατάργηση προσαρμοσμένης ρύθμισης"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Θα εμφανίζεται"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Ειδοποιήσεις χωρίς ήχο"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Μερικώς κρυφή"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Κρυφή"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Ειδοποιήσεις χωρίς οπτικά στοιχεία και ήχο"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Προσαρμοσμένοι περιορισμοί"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Όταν η οθόνη είναι ενεργοποιημένη"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Όταν η οθόνη είναι απενεργοποιημένη"</string>
@@ -3162,19 +3171,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Σε σίγαση, αλλά να επιτρέπονται <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> και <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Μηνύματα, συμβάντα και υπενθυμίσεις"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Όταν είναι ενεργή η λειτουργία \"Μην ενοχλείτε\", τα μηνύματα, οι υπενθυμίσεις και τα συμβάντα θα τίθενται σε σίγαση, εκτός από τα στοιχεία που επιτρέπετε παραπάνω. Μπορείτε να προσαρμόσετε τις ρυθμίσεις μηνυμάτων για να επιτρέπετε στους φίλους και την οικογένειά σας ή σε άλλες επαφές να επικοινωνούν μαζί σας."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Τέλος"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Ρυθμίσεις"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Ειδοποιήσεις χωρίς οπτικά στοιχεία και ήχο"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Ειδοποιήσεις χωρίς ήχο"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Δεν θα βλέπετε και δεν θα ακούτε ειδοποιήσεις. Επιτρέπονται οι κλήσεις από επαφές με αστέρι και καλούντες κατ\' επανάληψη."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Τρέχουσα ρύθμιση)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Θέλετε να αλλάξετε τις ρυθμίσεις ειδοποιήσεων της λειτουργίας \"Μην ενοχλείτε\";"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Ήχοι προφίλ εργασίας"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Χρήση ήχων προσωπικού προφίλ"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Οι ήχοι είναι ίδιοι για τα προφίλ εργασίας και τα προσωπικά προφίλ"</string>
@@ -3346,10 +3349,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Να επιτρέπονται οι κλήσεις"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Όταν είναι ενεργή η λειτουργία \"Μην ενοχλείτε\", οι εισερχόμενες κλήσεις αποκλείονται. Μπορείτε να προσαρμόσετε τις ρυθμίσεις για να επιτρέπετε στους φίλους και την οικογένειά σας ή σε άλλες επαφές να επικοινωνούν μαζί σας."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Επαφές με αστέρι"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">και <xliff:g id="NUM_PEOPLE">%d</xliff:g> ακόμη</item>
-      <item quantity="one">και 1 ακόμη</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Μηνύματα"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Να επιτρέπονται τα μηνύματα"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Μηνύματα"</string>
@@ -3779,10 +3779,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Ψυχρή θερμοκρασία χρώματος"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Χρήση πιο ψυχρών χρωμάτων οθόνης"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Για να εφαρμόσετε μια αλλαγή στο χρώμα, απενεργοποιήστε την οθόνη"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Παρακολούθηση συνδεσιμότητας"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Η υπηρεσία ConnectivityMonitor θα συλλέξει αρχεία καταγραφής μόλις εντοπίσει κάποιο πρόβλημα συνδεσιμότητας και θα εμφανίσει μια ειδοποίηση στον χρήστη για να υποβάλει αναφορά σφάλματος"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Για να πραγματοποιήσετε αλλαγές στην παρακολούθηση συνδεσιμότητας, επανεκκινήστε τη συσκευή"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Αισθητήρας λέιζερ κάμερας"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Logical Camera ως προεπιλογή"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Αυτόματες ενημερώσεις συστήματος"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Εφαρμογή ενημερώσεων κατά την επανεκκίνηση της συσκευής"</string>
     <string name="usage" msgid="2977875522080448986">"Χρήση"</string>
@@ -4092,8 +4090,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Υπηρεσία αυτόμ. συμπλήρωσης"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"αυτόματη, συμπλήρωση, αυτόματη συμπλήρωση"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Βεβαιωθείτε ότι εμπιστεύεστε αυτήν την εφαρμογή&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; χρησιμοποιεί το περιεχόμενο της οθόνης σας για να διαπιστώσει τι μπορεί να συμπληρωθεί αυτόματα."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Θέμα συσκευής"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Θέμα χρωμάτων"</string>
     <string name="default_theme" msgid="7085644992078579076">"Προεπιλογή"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Θέμα συσκευής"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Αυτόματο (βάσει της ταπετσαρίας)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Φωτεινό"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Σκοτεινό"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Όνομα δικτύου"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Προβολή ονόματος δικτύου στη γραμμή κατάστασης"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Διαχείριση αποθηκευτικού χώρου: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4105,7 +4107,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Πληροφορίες παροχής εταιρείας κινητής τηλεφωνίας"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Ενεργοποίηση παροχής εταιρείας κινητής τηλεφωνίας"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Ενημέρωση λειτουργίας \"Μην ενοχλείτε\""</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Αποκρύψτε τις ειδοποιήσεις για να παραμένετε συγκεντρωμένοι"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Θέστε σε παύση τις ειδοποιήσεις για να παραμένετε συγκεντρωμένοι"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Τι νέο και συναρπαστικό υπάρχει;"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Περιηγηθείτε στο νέο τηλέφωνό σας"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Περιηγηθείτε στο νέο σας tablet"</string>
diff --git a/res/values-en-rAU/arrays.xml b/res/values-en-rAU/arrays.xml
index cd282d3..50f6aec 100644
--- a/res/values-en-rAU/arrays.xml
+++ b/res/values-en-rAU/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Always on"</item>
     <item msgid="6385301106124765323">"Always off"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index bdf5121..c0891de 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Allow your tablet to communicate with nearby Bluetooth devices"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Allow your device to communicate with nearby Bluetooth devices"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Allow your phone to communicate with nearby Bluetooth devices"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Disable Bluetooth A2DP hardware offload"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Restart Device?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"You need to restart your device to change this setting."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Restart"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Cancel"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Available media devices"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Available call devices"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Currently connected"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Connection preferences"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Previously connected devices"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Previously connected"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Date &amp; time"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Choose time zone"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"The port that you typed is not valid."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"The HTTP proxy is used by the browser but may not be used by the other apps."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL Bandwidth (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL Bandwidth (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Mobile location info (deprecated):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Neighbour mobile info (deprecated):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE Physical Channel Configuration:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Mobile info refresh rate:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"All mobile measurement info:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Data connection real-time info:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Data service:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatic brightness"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lift to wake"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambient display"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Always on/Increased battery usage"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"New notifications"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"When to show"</string>
     <string name="doze_title" msgid="2375510714460456687">"New notifications"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Wake screen when you receive notifications"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_0">%d</xliff:g> remaining attempt before you must contact your operator to unlock your device.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM PIN operation failed!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tablet status"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Phone status"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"System updates"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android version"</string>
@@ -2434,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Emergency dialling signal"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Set behaviour when an emergency call is placed"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Backup"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"On"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Off"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Backup &amp; restore"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personal data"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Back up my data"</string>
@@ -2760,6 +2766,12 @@
       <item quantity="one">Check certificate</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Multiple users"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Users &amp; profiles"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Add user or profile"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Add user"</string>
@@ -2942,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"Data usage"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"Hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Connected devices"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, driving mode, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, driving mode"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps &amp; notifications"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permissions, default apps"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Accounts"</string>
@@ -2966,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"launcher, default, apps"</string>
     <string name="keywords_display" msgid="8910345814565493016">"screen, touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"dim screen, touchscreen, battery, bright"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"dim screen, touchscreen, battery"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"dim screen, night, tint, night shift, brightness, screen colour, colour, color"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"background, personalise, customise display"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"text size"</string>
@@ -3007,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"network, mobile network state, service state, signal strength, mobile network type, roaming, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"serial number, hardware version"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android security patch level, baseband version, kernel version"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambient display, Lock screen display"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"fingerprint"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"rotate, flip, rotation, portrait, landscape, orientation, vertical, horizontal"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"upgrade, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, schedule, notifications, block, silence, vibrate, sleep, work, focus, sound, mute, day, weekday, weekend, weeknight, event"</string>
@@ -3091,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Allow visual signals"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"When Do Not Disturb is turned on"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notifications"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Show notifications silently"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Notifications will be muted"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"No sound from notifications"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"You will see notifications on your screen"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"When notifications arrive, your phone won’t make a sound or vibrate."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Hide notifications"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"You won’t see new or existing notifications"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"No visuals or sound from notifications"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"You won’t see or hear notifications"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Your phone won’t show new or existing notifications, and won’t make a sound or vibrate. Notifications won’t appear when you swipe down from the top of your screen.\n\nKeep in mind, critical notifications for phone activity and status will still appear."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Custom"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Enable custom setting"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Remove custom setting"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Will appear"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"No sound from notifications"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Partially hidden"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Hidden"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"No visuals or sound from notifications"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Custom restrictions"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"When the screen is on"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"When the screen is off"</string>
@@ -3161,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Muted, but allow <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> and <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Messages, events &amp; reminders"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"When Do Not Disturb is on, messages, reminders and events will be muted, except for the items that you allow above. You can adjust messages settings to allow your friends, family or other contacts to reach you."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Finished"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Settings"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"No visuals or sound from notifications"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"No sound from notifications"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"You won’t see or hear notifications. Calls from starred contacts and repeat callers are allowed."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Current setting)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Change Do Not Disturb notification settings?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Work profile sounds"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Use personal profile sounds"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Sounds are the same for work and personal profiles"</string>
@@ -3345,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Allow calls"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"When Do Not Disturb is on, incoming calls are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Starred contacts"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">and <xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
-      <item quantity="one">and 1 other</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messages"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Allow messages"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Messages"</string>
@@ -3778,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Cool colour temperature"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Use cooler display colours"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"To apply colour change, turn off screen"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Connectivity Monitor will collect logs when it detects a connectivity problem and prompt notification to user to file a bug"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"To apply connectivity monitor change, reboot device"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Camera laser sensor"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Logical Camera As Default"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatic system updates"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Apply updates when device restarts"</string>
     <string name="usage" msgid="2977875522080448986">"Usage"</string>
@@ -4091,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Auto-fill service"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"auto, fill, auto-fill"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Make sure that you trust this app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Auto-fill&gt;%1$s&lt;/xliff:g&gt; uses what\'s on your screen to determine what can be auto-filled."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Device theme"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Colour theme"</string>
     <string name="default_theme" msgid="7085644992078579076">"Default"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Device theme"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automatic (based on wallpaper)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Light"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Dark"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Network name"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Display network name in status bar"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Storage Manager: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4104,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operator Provisioning Info"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Operator Provisioning"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Update Do Not Disturb"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Hide notifications to stay focused"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pause notifications to stay focused"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"What\'s new and exciting?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Take a tour of your new phone"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Take a tour of your new tablet"</string>
diff --git a/res/values-en-rCA/arrays.xml b/res/values-en-rCA/arrays.xml
index cd282d3..50f6aec 100644
--- a/res/values-en-rCA/arrays.xml
+++ b/res/values-en-rCA/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Always on"</item>
     <item msgid="6385301106124765323">"Always off"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index ecc438a..351a058 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Allow your tablet to communicate with nearby Bluetooth devices"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Allow your device to communicate with nearby Bluetooth devices"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Allow your phone to communicate with nearby Bluetooth devices"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Disable Bluetooth A2DP hardware offload"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Restart Device?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"You need to restart your device to change this setting."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Restart"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Cancel"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Available media devices"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Available call devices"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Currently connected"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Connection preferences"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Previously connected devices"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Previously connected"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Date &amp; time"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Choose time zone"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"The port that you typed is not valid."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"The HTTP proxy is used by the browser but may not be used by the other apps."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL Bandwidth (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL Bandwidth (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Mobile location info (deprecated):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Neighbour mobile info (deprecated):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE Physical Channel Configuration:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Mobile info refresh rate:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"All mobile measurement info:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Data connection real-time info:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Data service:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatic brightness"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lift to wake"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambient display"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Always on/Increased battery usage"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"New notifications"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"When to show"</string>
     <string name="doze_title" msgid="2375510714460456687">"New notifications"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Wake screen when you receive notifications"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_0">%d</xliff:g> remaining attempt before you must contact your operator to unlock your device.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM PIN operation failed!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tablet status"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Phone status"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"System updates"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android version"</string>
@@ -2434,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Emergency dialling signal"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Set behaviour when an emergency call is placed"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Backup"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"On"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Off"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Backup &amp; restore"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personal data"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Back up my data"</string>
@@ -2760,6 +2766,12 @@
       <item quantity="one">Check certificate</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Multiple users"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Users &amp; profiles"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Add user or profile"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Add user"</string>
@@ -2942,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"Data usage"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"Hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Connected devices"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, driving mode, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, driving mode"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps &amp; notifications"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permissions, default apps"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Accounts"</string>
@@ -2966,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"launcher, default, apps"</string>
     <string name="keywords_display" msgid="8910345814565493016">"screen, touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"dim screen, touchscreen, battery, bright"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"dim screen, touchscreen, battery"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"dim screen, night, tint, night shift, brightness, screen colour, colour, color"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"background, personalise, customise display"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"text size"</string>
@@ -3007,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"network, mobile network state, service state, signal strength, mobile network type, roaming, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"serial number, hardware version"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android security patch level, baseband version, kernel version"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambient display, Lock screen display"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"fingerprint"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"rotate, flip, rotation, portrait, landscape, orientation, vertical, horizontal"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"upgrade, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, schedule, notifications, block, silence, vibrate, sleep, work, focus, sound, mute, day, weekday, weekend, weeknight, event"</string>
@@ -3091,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Allow visual signals"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"When Do Not Disturb is turned on"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notifications"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Show notifications silently"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Notifications will be muted"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"No sound from notifications"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"You will see notifications on your screen"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"When notifications arrive, your phone won’t make a sound or vibrate."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Hide notifications"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"You won’t see new or existing notifications"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"No visuals or sound from notifications"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"You won’t see or hear notifications"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Your phone won’t show new or existing notifications, and won’t make a sound or vibrate. Notifications won’t appear when you swipe down from the top of your screen.\n\nKeep in mind, critical notifications for phone activity and status will still appear."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Custom"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Enable custom setting"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Remove custom setting"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Will appear"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"No sound from notifications"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Partially hidden"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Hidden"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"No visuals or sound from notifications"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Custom restrictions"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"When the screen is on"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"When the screen is off"</string>
@@ -3161,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Muted, but allow <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> and <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Messages, events &amp; reminders"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"When Do Not Disturb is on, messages, reminders and events will be muted, except for the items that you allow above. You can adjust messages settings to allow your friends, family or other contacts to reach you."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Finished"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Settings"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"No visuals or sound from notifications"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"No sound from notifications"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"You won’t see or hear notifications. Calls from starred contacts and repeat callers are allowed."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Current setting)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Change Do Not Disturb notification settings?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Work profile sounds"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Use personal profile sounds"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Sounds are the same for work and personal profiles"</string>
@@ -3345,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Allow calls"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"When Do Not Disturb is on, incoming calls are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Starred contacts"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">and <xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
-      <item quantity="one">and 1 other</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messages"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Allow messages"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Messages"</string>
@@ -3778,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Cool colour temperature"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Use cooler display colours"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"To apply colour change, turn off screen"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Connectivity Monitor will collect logs when it detects a connectivity problem and prompt notification to user to file a bug"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"To apply connectivity monitor change, reboot device"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Camera laser sensor"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Logical Camera As Default"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatic system updates"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Apply updates when device restarts"</string>
     <string name="usage" msgid="2977875522080448986">"Usage"</string>
@@ -4091,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Auto-fill service"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"auto, fill, auto-fill"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Make sure that you trust this app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Auto-fill&gt;%1$s&lt;/xliff:g&gt; uses what\'s on your screen to determine what can be auto-filled."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Device theme"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Colour theme"</string>
     <string name="default_theme" msgid="7085644992078579076">"Default"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Device theme"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automatic (based on wallpaper)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Light"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Dark"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Network name"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Display network name in status bar"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Storage Manager: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4104,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operator Provisioning Info"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Operator Provisioning"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Update Do Not Disturb"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Hide notifications to stay focused"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pause notifications to stay focused"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"What\'s new and exciting?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Take a tour of your new phone"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Take a tour of your new tablet"</string>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index cd282d3..50f6aec 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Always on"</item>
     <item msgid="6385301106124765323">"Always off"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index bdf5121..c0891de 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Allow your tablet to communicate with nearby Bluetooth devices"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Allow your device to communicate with nearby Bluetooth devices"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Allow your phone to communicate with nearby Bluetooth devices"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Disable Bluetooth A2DP hardware offload"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Restart Device?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"You need to restart your device to change this setting."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Restart"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Cancel"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Available media devices"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Available call devices"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Currently connected"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Connection preferences"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Previously connected devices"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Previously connected"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Date &amp; time"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Choose time zone"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"The port that you typed is not valid."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"The HTTP proxy is used by the browser but may not be used by the other apps."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL Bandwidth (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL Bandwidth (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Mobile location info (deprecated):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Neighbour mobile info (deprecated):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE Physical Channel Configuration:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Mobile info refresh rate:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"All mobile measurement info:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Data connection real-time info:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Data service:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatic brightness"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lift to wake"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambient display"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Always on/Increased battery usage"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"New notifications"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"When to show"</string>
     <string name="doze_title" msgid="2375510714460456687">"New notifications"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Wake screen when you receive notifications"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_0">%d</xliff:g> remaining attempt before you must contact your operator to unlock your device.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM PIN operation failed!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tablet status"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Phone status"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"System updates"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android version"</string>
@@ -2434,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Emergency dialling signal"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Set behaviour when an emergency call is placed"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Backup"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"On"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Off"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Backup &amp; restore"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personal data"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Back up my data"</string>
@@ -2760,6 +2766,12 @@
       <item quantity="one">Check certificate</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Multiple users"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Users &amp; profiles"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Add user or profile"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Add user"</string>
@@ -2942,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"Data usage"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"Hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Connected devices"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, driving mode, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, driving mode"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps &amp; notifications"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permissions, default apps"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Accounts"</string>
@@ -2966,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"launcher, default, apps"</string>
     <string name="keywords_display" msgid="8910345814565493016">"screen, touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"dim screen, touchscreen, battery, bright"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"dim screen, touchscreen, battery"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"dim screen, night, tint, night shift, brightness, screen colour, colour, color"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"background, personalise, customise display"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"text size"</string>
@@ -3007,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"network, mobile network state, service state, signal strength, mobile network type, roaming, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"serial number, hardware version"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android security patch level, baseband version, kernel version"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambient display, Lock screen display"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"fingerprint"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"rotate, flip, rotation, portrait, landscape, orientation, vertical, horizontal"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"upgrade, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, schedule, notifications, block, silence, vibrate, sleep, work, focus, sound, mute, day, weekday, weekend, weeknight, event"</string>
@@ -3091,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Allow visual signals"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"When Do Not Disturb is turned on"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notifications"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Show notifications silently"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Notifications will be muted"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"No sound from notifications"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"You will see notifications on your screen"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"When notifications arrive, your phone won’t make a sound or vibrate."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Hide notifications"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"You won’t see new or existing notifications"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"No visuals or sound from notifications"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"You won’t see or hear notifications"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Your phone won’t show new or existing notifications, and won’t make a sound or vibrate. Notifications won’t appear when you swipe down from the top of your screen.\n\nKeep in mind, critical notifications for phone activity and status will still appear."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Custom"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Enable custom setting"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Remove custom setting"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Will appear"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"No sound from notifications"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Partially hidden"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Hidden"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"No visuals or sound from notifications"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Custom restrictions"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"When the screen is on"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"When the screen is off"</string>
@@ -3161,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Muted, but allow <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> and <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Messages, events &amp; reminders"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"When Do Not Disturb is on, messages, reminders and events will be muted, except for the items that you allow above. You can adjust messages settings to allow your friends, family or other contacts to reach you."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Finished"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Settings"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"No visuals or sound from notifications"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"No sound from notifications"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"You won’t see or hear notifications. Calls from starred contacts and repeat callers are allowed."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Current setting)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Change Do Not Disturb notification settings?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Work profile sounds"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Use personal profile sounds"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Sounds are the same for work and personal profiles"</string>
@@ -3345,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Allow calls"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"When Do Not Disturb is on, incoming calls are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Starred contacts"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">and <xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
-      <item quantity="one">and 1 other</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messages"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Allow messages"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Messages"</string>
@@ -3778,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Cool colour temperature"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Use cooler display colours"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"To apply colour change, turn off screen"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Connectivity Monitor will collect logs when it detects a connectivity problem and prompt notification to user to file a bug"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"To apply connectivity monitor change, reboot device"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Camera laser sensor"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Logical Camera As Default"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatic system updates"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Apply updates when device restarts"</string>
     <string name="usage" msgid="2977875522080448986">"Usage"</string>
@@ -4091,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Auto-fill service"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"auto, fill, auto-fill"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Make sure that you trust this app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Auto-fill&gt;%1$s&lt;/xliff:g&gt; uses what\'s on your screen to determine what can be auto-filled."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Device theme"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Colour theme"</string>
     <string name="default_theme" msgid="7085644992078579076">"Default"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Device theme"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automatic (based on wallpaper)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Light"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Dark"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Network name"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Display network name in status bar"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Storage Manager: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4104,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operator Provisioning Info"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Operator Provisioning"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Update Do Not Disturb"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Hide notifications to stay focused"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pause notifications to stay focused"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"What\'s new and exciting?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Take a tour of your new phone"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Take a tour of your new tablet"</string>
diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml
index cd282d3..50f6aec 100644
--- a/res/values-en-rIN/arrays.xml
+++ b/res/values-en-rIN/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Always on"</item>
     <item msgid="6385301106124765323">"Always off"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index bdf5121..c0891de 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Allow your tablet to communicate with nearby Bluetooth devices"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Allow your device to communicate with nearby Bluetooth devices"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Allow your phone to communicate with nearby Bluetooth devices"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Disable Bluetooth A2DP hardware offload"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Restart Device?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"You need to restart your device to change this setting."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Restart"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Cancel"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Available media devices"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Available call devices"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Currently connected"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Connection preferences"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Previously connected devices"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Previously connected"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Date &amp; time"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Choose time zone"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"The port that you typed is not valid."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"The HTTP proxy is used by the browser but may not be used by the other apps."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL Bandwidth (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL Bandwidth (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Mobile location info (deprecated):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Neighbour mobile info (deprecated):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE Physical Channel Configuration:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Mobile info refresh rate:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"All mobile measurement info:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Data connection real-time info:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Data service:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatic brightness"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lift to wake"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambient display"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Always on/Increased battery usage"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"New notifications"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"When to show"</string>
     <string name="doze_title" msgid="2375510714460456687">"New notifications"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Wake screen when you receive notifications"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_0">%d</xliff:g> remaining attempt before you must contact your operator to unlock your device.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM PIN operation failed!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tablet status"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Phone status"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"System updates"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android version"</string>
@@ -2434,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Emergency dialling signal"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Set behaviour when an emergency call is placed"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Backup"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"On"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Off"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Backup &amp; restore"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personal data"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Back up my data"</string>
@@ -2760,6 +2766,12 @@
       <item quantity="one">Check certificate</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Multiple users"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Users &amp; profiles"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Add user or profile"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Add user"</string>
@@ -2942,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"Data usage"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"Hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Connected devices"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, driving mode, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, driving mode"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps &amp; notifications"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permissions, default apps"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Accounts"</string>
@@ -2966,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"launcher, default, apps"</string>
     <string name="keywords_display" msgid="8910345814565493016">"screen, touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"dim screen, touchscreen, battery, bright"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"dim screen, touchscreen, battery"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"dim screen, night, tint, night shift, brightness, screen colour, colour, color"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"background, personalise, customise display"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"text size"</string>
@@ -3007,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"network, mobile network state, service state, signal strength, mobile network type, roaming, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"serial number, hardware version"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android security patch level, baseband version, kernel version"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambient display, Lock screen display"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"fingerprint"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"rotate, flip, rotation, portrait, landscape, orientation, vertical, horizontal"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"upgrade, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, schedule, notifications, block, silence, vibrate, sleep, work, focus, sound, mute, day, weekday, weekend, weeknight, event"</string>
@@ -3091,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Allow visual signals"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"When Do Not Disturb is turned on"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notifications"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Show notifications silently"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Notifications will be muted"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"No sound from notifications"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"You will see notifications on your screen"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"When notifications arrive, your phone won’t make a sound or vibrate."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Hide notifications"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"You won’t see new or existing notifications"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"No visuals or sound from notifications"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"You won’t see or hear notifications"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Your phone won’t show new or existing notifications, and won’t make a sound or vibrate. Notifications won’t appear when you swipe down from the top of your screen.\n\nKeep in mind, critical notifications for phone activity and status will still appear."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Custom"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Enable custom setting"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Remove custom setting"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Will appear"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"No sound from notifications"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Partially hidden"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Hidden"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"No visuals or sound from notifications"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Custom restrictions"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"When the screen is on"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"When the screen is off"</string>
@@ -3161,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Muted, but allow <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> and <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Messages, events &amp; reminders"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"When Do Not Disturb is on, messages, reminders and events will be muted, except for the items that you allow above. You can adjust messages settings to allow your friends, family or other contacts to reach you."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Finished"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Settings"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"No visuals or sound from notifications"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"No sound from notifications"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"You won’t see or hear notifications. Calls from starred contacts and repeat callers are allowed."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Current setting)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Change Do Not Disturb notification settings?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Work profile sounds"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Use personal profile sounds"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Sounds are the same for work and personal profiles"</string>
@@ -3345,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Allow calls"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"When Do Not Disturb is on, incoming calls are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Starred contacts"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">and <xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
-      <item quantity="one">and 1 other</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messages"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Allow messages"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Messages"</string>
@@ -3778,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Cool colour temperature"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Use cooler display colours"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"To apply colour change, turn off screen"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Connectivity Monitor will collect logs when it detects a connectivity problem and prompt notification to user to file a bug"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"To apply connectivity monitor change, reboot device"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Camera laser sensor"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Logical Camera As Default"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatic system updates"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Apply updates when device restarts"</string>
     <string name="usage" msgid="2977875522080448986">"Usage"</string>
@@ -4091,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Auto-fill service"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"auto, fill, auto-fill"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Make sure that you trust this app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Auto-fill&gt;%1$s&lt;/xliff:g&gt; uses what\'s on your screen to determine what can be auto-filled."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Device theme"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Colour theme"</string>
     <string name="default_theme" msgid="7085644992078579076">"Default"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Device theme"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automatic (based on wallpaper)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Light"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Dark"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Network name"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Display network name in status bar"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Storage Manager: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4104,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operator Provisioning Info"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Operator Provisioning"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Update Do Not Disturb"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Hide notifications to stay focused"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pause notifications to stay focused"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"What\'s new and exciting?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Take a tour of your new phone"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Take a tour of your new tablet"</string>
diff --git a/res/values-en-rXC/arrays.xml b/res/values-en-rXC/arrays.xml
index bb1a502..6931250 100644
--- a/res/values-en-rXC/arrays.xml
+++ b/res/values-en-rXC/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‎‎‎‎‎‎‏‎‏‎‏‎‏‏‎‎‏‎‎‎‎‏‎‏‎‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‎‏‎‎‏‏‎‎4‎‏‎‎‏‎"</item>
+    <item msgid="5900372418924184351">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‎‎‏‎‎‏‎‏‎‏‎‏‎‏‏‏‎‏‎‎‎‎‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‎‎‏‏‏‏‏‎0‎‏‎‎‏‎"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‎‏‏‏‎‏‏‎‎‏‏‏‏‎‏‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‏‎‏‎Always on‎‏‎‎‏‎"</item>
     <item msgid="6385301106124765323">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‏‎‏‎‎‏‎‎‏‎‏‏‎‎‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎‏‏‎Always off‎‏‎‎‏‎"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index e01807f..9f97cf4 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -172,6 +172,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‏‎‏‏‎‎‏‏‎‏‎‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‎‏‎‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎Allow your tablet to communicate with nearby Bluetooth devices‎‏‎‎‏‎"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎‏‎‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‏‏‏‏‏‎‎Allow your device to communicate with nearby Bluetooth devices‎‏‎‎‏‎"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‎‏‏‎‏‎‎‏‎‏‎‏‏‎‎‎‎‎‎‏‏‏‎‏‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‎‎‏‎‏‎‏‏‏‎Allow your phone to communicate with nearby Bluetooth devices‎‏‎‎‏‎"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‎‎‎‏‎‎‏‎‏‏‏‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‎‏‏‎‎‏‏‎‏‎‎‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‎Disable Bluetooth A2DP hardware offload‎‏‎‎‏‎"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‏‎‎‎‏‏‎‎‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‏‎‏‎‎‏‏‏‏‏‎‏‏‏‎‎‎Restart Device?‎‏‎‎‏‎"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‏‎‏‏‎‎‎‏‏‎‏‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‎‎‎You need to restart your device to change this setting.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‎‎‎‎‏‎‎‎‏‎‏‎‎‏‎‏‎‎‏‎‏‏‎‏‏‎‏‎‎‏‏‎‎‏‏‎‏‎‎‎‏‏‏‏‎‏‎‎‎‏‏‏‎Restart‎‏‎‎‏‎"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‎‏‏‎‎‎‎‎‏‏‏‎‏‏‎‏‎‎‏‎‏‎‏‏‏‏‏‏‎‎‏‎‎‎‏‏‎‎‎Cancel‎‏‎‎‏‎"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‎‎‏‏‏‎‎‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‏‏‎‏‏‏‏‎‎‏‎‎‎‏‏‏‎‏‏‏‎‎‎‎‏‎‏‎Available media devices‎‏‎‎‏‎"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‏‎‏‏‎‎‏‏‎‎‏‎‏‎‎‏‏‏‏‎‎‎‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎Available call devices‎‏‎‎‏‎"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‏‏‏‎‎‏‎‎‎‎‎‏‏‎‎‏‏‎‎‏‏‎‏‏‏‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‎‏‎‎‎‎‎‎‎‎‏‏‎‎Currently connected‎‏‎‎‏‎"</string>
@@ -181,6 +186,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‏‏‎‎‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‎‏‎‎‎‏‎‏‎‏‏‏‎‎‏‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎Connection preferences‎‏‎‎‏‎"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‏‏‎‏‎‎‏‏‎‎‎‏‎‎‎‎‏‎‎‎‏‏‏‎‏‏‎‏‏‏‎‏‏‎‏‎‎‏‏‏‏‏‏‎‎‎Previously connected devices‎‏‎‎‏‎"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‏‎‎‏‎‏‏‎‏‏‏‎‎‏‏‎‎‏‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‏‎‎‎‎‏‏‎Previously connected‎‏‎‎‏‎"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‏‎‏‏‎‎‏‎‏‏‏‏‎‎‎‏‏‎‏‎‎‏‎‎‏‏‏‏‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‎Date &amp; time‎‏‎‎‏‎"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‏‎‎‏‏‏‎‎‎‎‏‎‏‏‎‎‎‎‏‏‎‏‎‏‎‏‏‎‎‏‎‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎‎‏‎‎‏‎‎Choose time zone‎‏‎‎‏‎"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -206,11 +213,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‏‎‏‎‏‎‎‏‏‏‎‎‎‎‎‎‎‏‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎The port you typed isn’t valid.‎‏‎‎‏‎"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‎‎‏‏‏‏‎‎‎‎‏‏‏‏‎‏‎‎‏‏‎‎‎‎‏‎‏‏‏‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‏‏‏‎‎The HTTP proxy is used by the browser but may not be used by the other apps.‎‏‎‎‏‎"</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‎‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‏‎‏‎‎‏‏‎‏‎‏‏‎‏‏‏‎‏‏‏‎PAC URL: ‎‏‎‎‏‎ "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‎‎‎‏‎‎‏‎‎‏‎‎‎‏‏‎‎‎‎‎DL Bandwidth (kbps):‎‏‎‎‏‎"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‎‎‎‎‎‎‏‏‏‎‎UL Bandwidth (kbps):‎‏‎‎‏‎"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‏‎‏‏‎‏‎‏‎‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‎‏‏‏‎‎‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‏‎‎‎‎Cell Location Info (deprecated):‎‏‎‎‏‎"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎‎‏‎‏‎‎‎‎‎‏‎‎‏‏‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‎‏‎‏‎‎‎‏‎‏‏‎‏‎‏‎Neighbor Cell Info (deprecated):‎‏‎‎‏‎"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‏‎‏‎‎‎‎‎‎‎‏‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‏‏‏‏‎‏‏‎‎‎LTE Physical Channel Configuration:‎‏‎‎‏‎"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‎‎‏‎‎‎‎‎‎‎‏‏‎‏‏‎‎‏‏‎‏‎‎‏‏‎‏‎‎‏‏‏‎‏‎‏‎‎‏‏‏‎‎‎‎‎‏‏‏‎‎‎‎‎Cell Info Refresh Rate:‎‏‎‎‏‎"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‎‏‎‏‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‎‏‏‏‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎All Cell Measurement Info:‎‏‎‎‏‎"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎‏‏‎‎‎‏‎‎‎Data Connection Real-Time Info:‎‏‎‎‏‎"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‏‎‏‏‎‎‎‎‎‎‏‏‏‎‎‏‎‎‎‏‏‏‎‎‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎Data Service:‎‏‎‎‏‎"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‎‎‏‏‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‏‎‏‎‏‏‏‎Roaming:‎‏‎‎‏‎"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‎‎‎‎‎‎‏‎‏‏‎‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‏‎‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‏‎‏‎‎‎‎‎‎‎IMEI:‎‏‎‎‏‎"</string>
@@ -1145,8 +1153,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‎‏‎‏‏‏‎‏‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‎‎‏‎‎‏‎‏‎Automatic brightness‎‏‎‎‏‎"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‎‏‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‏‏‎‎‏‏‏‏‎‏‎‎‎‎‎‏‏‎Lift to wake‎‏‎‎‏‎"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎‏‎‎‏‎‏‎‎‏‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‎‏‏‎‎Ambient display‎‏‎‎‏‎"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‎‏‏‎‏‎‏‏‎‎‎‏‏‏‎‎‎‎‏‏‎‎‏‎‏‎‎‎Always on / Increased battery usage‎‏‎‎‏‎"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‎‎‎‏‏‎‎‎‏‎‎‎‏‏‎‎‏‎‏‏‏‎‎New notifications‎‏‎‎‏‎"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‏‎‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‏‏‏‏‎‎‎‏‏‏‎‏‎When to show‎‏‎‎‏‎"</string>
     <string name="doze_title" msgid="2375510714460456687">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‏‎‎‎‎‎‏‎‎‏‏‎‏‎‎‎‏‎‏‎‎‏‏‏‏‎‎‎‏‏‎‎‏‏‎‎‎‏‏‎‏‏‏‎‏‏‏‏‎New notifications‎‏‎‎‏‎"</string>
     <string name="doze_summary" msgid="3846219936142814032">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‎‏‎‎‏‏‏‎‏‎‏‏‏‎‏‏‏‎‏‎‎‎‏‎‏‏‎‏‎‏‏‎‏‎‏‎‎‎‎‎Wake screen when you receive notifications‎‏‎‎‏‎"</string>
@@ -1191,8 +1197,6 @@
       <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‎‏‎‎‏‏‎‎‎‏‎‎‎‏‎‎‏‎‎‏‎‎‎‏‎‏‎‎‏‎‎‎‎‏‎Incorrect SIM PIN code, you have ‎‏‎‎‏‏‎<xliff:g id="NUMBER_0">%d</xliff:g>‎‏‎‎‏‏‏‎ remaining attempt before you must contact your carrier to unlock your device.‎‏‎‎‏‎</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‏‏‎‏‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‏‎‏‎‏‎‏‏‏‎‎‎‏‏‎‎‎‎‎‎‎‎‎‎‎‏‏‏‏‏‎‏‎SIM PIN operation failed!‎‏‎‎‏‎"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‎‎‏‎‏‎‎‎‏‎‏‏‎‎‎‎‎‏‎‏‎‏‎‏‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‎‎‏‎‏‎‏‎‎Tablet status‎‏‎‎‏‎"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‎‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‎Phone status‎‏‎‎‏‎"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‎‏‎‎‎‏‎‏‎‎‏‎‎‏‎‎‏‏‎‎‎‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‎‏‎‎‏‎System updates‎‏‎‎‏‎"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‏‎‎‎‎‏‎‎‎‎‏‏‏‏‏‎‎‎‏‏‏‏‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‏‏‏‏‎‎‎‏‏‎‎‎‏‎‎‎Android version‎‏‎‎‏‎"</string>
@@ -2433,6 +2437,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‎‏‏‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‏‏‎‏‎‎‎‏‏‎‏‏‎‏‎‏‏‏‎Emergency dialing signal‎‏‎‎‏‎"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‏‎‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‎‎‏‏‏‏‏‏‎‎‏‎Set behavior when an emergency call is placed‎‏‎‎‏‎"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‏‎‏‏‏‎‎‎‏‏‎‏‎‎‏‏‏‏‎‏‏‎‎‎‎‎‏‎‎‎‏‏‏‏‏‎‎‏‏‎‎‏‎‏‎‎‏‏‏‎‏‏‎‎Backup‎‏‎‎‏‎"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‏‎‏‎‏‎‎‎‏‎‎‏‏‎‎‎‎‏‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‎‎‎‏‏‎‎‎‏‎‎‏‎‎‎‏‎‎On‎‏‎‎‏‎"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‏‎‎‎‏‎‎‏‎‏‏‏‎‏‎‎‏‎‎‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‏‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎Off‎‏‎‎‏‎"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‎‎Backup &amp; restore‎‏‎‎‏‎"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‏‎‏‎‎‏‏‎‎‏‏‎‎‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‏‎‎‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‎Personal data‎‏‎‎‏‎"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‏‎‎‎‏‏‎‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‎‎‏‎‎‎‏‏‏‎‎‎‎‎Back up my data‎‏‎‎‏‎"</string>
@@ -2759,6 +2765,12 @@
       <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎‏‎‎‏‎‎‏‏‏‎‏‎‎‎‎‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‎‎‎Check certificate‎‏‎‎‏‎</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‎‎‎‎‎‏‏‎‏‎‏‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‏‎‏‏‎Multiple users‎‏‎‎‏‎"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‏‎‎‏‏‏‎‎‏‏‏‎‎‎‎‏‎‏‏‎‏‎‎‏‎‏‏‏‎‏‏‎‏‏‏‎‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎Users &amp; profiles‎‏‎‎‏‎"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‎‏‏‎‎‏‏‎‏‎‏‎‏‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‏‎‎Add user or profile‎‏‎‎‏‎"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‎‏‎‎‎‏‏‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‏‎‎‏‏‎‎‏‎‏‎‏‏‏‏‎‎‎‏‎‏‏‏‎‎Add user‎‏‎‎‏‎"</string>
@@ -2941,14 +2953,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‏‎‏‏‎‎‎‎‎‎‎‎‏‏‏‎‏‏‎‎‏‎‏‎‎‎‏‏‎‎‎‏‏‏‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‎‎‎data usage‎‏‎‎‏‎"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‎‎‏‎‎‎‎‎‏‎‎‏‏‎‏‎‏‎‏‎‏‏‎‏‎‏‏‏‎‎hotspot‎‏‎‎‏‎"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‎‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‏‎‏‎‏‎‏‎Connected devices‎‏‎‎‏‎"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‎‏‏‎‎‎‏‏‎‏‏‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‏‏‎‎‎‏‎‏‎‎Bluetooth, driving mode, NFC‎‏‎‎‏‎"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‎‏‎‏‏‎‏‎‏‎‎‎‎‏‏‎‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‏‎‎‏‏‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎Bluetooth, driving mode‎‏‎‎‏‎"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‏‎‎‎‎‎‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‏‏‎‏‎‎‏‏‎Bluetooth, NFC‎‏‎‎‏‎"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‏‏‎‎‎‎‎‎‎‏‏‎‎‏‏‏‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‏‏‎Bluetooth‎‏‎‎‏‎"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‏‏‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‏‎‎‏‎‎‎‏‏‎Apps &amp; notifications‎‏‎‎‏‎"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‏‏‏‎‎‏‎‏‏‎‏‎‎‎‎‎‏‎‏‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎Permissions, default apps‎‏‎‎‏‎"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‎‏‎‏‎‎‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎‏‎‏‏‎‏‏‏‏‎‎‏‎‎‏‏‏‏‏‏‎Accounts‎‏‎‎‏‎"</string>
@@ -2965,7 +2973,6 @@
     <string name="keywords_home" msgid="294182527446892659">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‎‎‏‎‏‎‏‎‎‏‎‎‏‎‏‎‏‏‏‎‎‏‏‎‎‏‏‎‏‏‏‏‎‎‏‏‎‎‏‎‏‎‎‎‎‎‎‎‏‏‏‎‎‏‏‎launcher, default, apps‎‏‎‎‏‎"</string>
     <string name="keywords_display" msgid="8910345814565493016">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‏‏‏‎‎‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‏‎‎‎‏‏‎‎‎‎screen, touchscreen‎‏‎‎‏‎"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‎‏‏‎‏‎‏‎‎‏‎‏‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‎‏‎‎‏‏‎‎‏‏‏‎‎‏‏‎‎‏‎‎‎dim screen, touchscreen, battery, bright‎‏‎‎‏‎"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‎‎‏‎‏‎‏‎‎‏‏‏‏‎‎‎‎‏‏‏‎‏‎‏‏‎‏‏‏‎‏‏‎‎‏‎‎‏‏‎‏‎‎‏‎‎‏‏‎‎‏‎‏‎dim screen, touchscreen, battery‎‏‎‎‏‎"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‎‏‎‏‎‏‎‏‏‎‎‎‏‎‏‏‎‏‏‎‏‎‏‎‎‎‏‎‏‏‏‏‎‎‎‏‎‏‎‎‏‏‎‎‎‏‏‎‎‎‎‏‎‎dim screen, night, tint, night shift, brightness, screen color, colour, color‎‏‎‎‏‎"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‏‏‎‏‎‏‏‎‎‏‎‏‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‏‏‏‏‏‎‎‎‎‎‎‎background, personalize, customize display‎‏‎‎‏‎"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‎‏‎‏‏‎‎‎‎‏‏‏‏‎‏‎‏‎‎‎‏‏‎‎‎‏‎‎‎‏‏‎‏‏‎‎‎text size‎‏‎‎‏‎"</string>
@@ -3006,8 +3013,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎‏‏‎‎‎‏‏‎‎‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‏‎‎‏‎‎‎network, mobile network state, service state, signal strength, mobile network type, roaming, iccid‎‏‎‎‏‎"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‎‎‎‎‏‎‎‏‎‏‎‏‎‏‎‏‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎serial number, hardware version‎‏‎‎‏‎"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‏‏‎‎‏‎‏‎‏‏‎‎‎‎‎‎‎‏‎‎‎‏‏‎android security patch level, baseband version, kernel version‎‏‎‎‏‎"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‏‎‎‎‎‎‎‏‎‏‎‏‏‎‏‎‎‎‎‏‎‎‏‏‎‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‎‎‏‎‎‏‎‏‎‎‏‎‎Ambient display, Lock screen display‎‏‎‎‏‎"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‎‎‏‏‏‏‎‎‎‏‏‏‎‎‏‏‎‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‎‎‏‎‏‎‏‏‎‎‎‏‏‎‏‎‎‏‎‎fingerprint‎‏‎‎‏‎"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‏‎‎‎‏‏‏‎‏‏‎‎‎‏‎‎‏‎‏‎‏‏‏‏‎‎‎‏‎‎‏‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎‏‏‎‏‎‎‎dim screen, touchscreen, battery, smart brightness, dynamic brightness‎‏‎‎‏‎"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‎‎‎‎‎‏‎‏‏‎‎‎‎‎‎‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‏‎‎‎‎‎‎‏‎‎‏‏‏‎‏‎‎‏‎‎‏‏‎‎rotate, flip, rotation, portrait, landscape, orientation, vertical, horizontal‎‏‎‎‏‎"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‎‏‎‏‎‏‎‎‏‏‏‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‎‏‎‏‏‏‎‎‏‎‎‏‏‎‏‎upgrade, android‎‏‎‎‏‎"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‎‏‏‏‎‏‎‎‏‏‎‎‎‎‎‎‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎‎‎‎‏‏‎dnd, schedule, notifications, block, silence, vibrate, sleep, work, focus, sound, mute, day, weekday, weekend, weeknight, event‎‏‎‎‏‎"</string>
@@ -3090,18 +3100,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‏‏‏‏‎‎‎Allow visual signals‎‏‎‎‏‎"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‎‏‏‎‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‏‎‏‎‏‎‎‎‎‏‎When Do Not Disturb is turned on‎‏‎‎‏‎"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‎‎‏‏‏‎‏‎‎‏‏‏‏‎‎Notifications‎‏‎‎‏‎"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‎‏‎‏‎‏‎‏‎‏‎‎‎‎‎‏‎‏‏‎‏‏‏‎‏‎‎‎‎‏‎‎‎‏‏‎‎‏‎‏‏‎Show notifications silently‎‏‎‎‏‎"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎‏‎‎‎‎‏‎‎‏‏‏‎‎‏‎‎‏‎‏‎‏‏‎Notifications will be muted‎‏‎‎‏‎"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‎‎‏‎‏‏‎‎‏‎‎‎‎‏‎‏‎‎‏‎‏‏‎‏‏‎‏‎‏‎‎‏‎‏‎‏‏‎‎‏‎‎‎‎No sound from notifications‎‏‎‎‏‎"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‎‎‎‏‏‎‎‎‏‎‎‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‏‎‏‏‏‎‎‎‎‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎You will see notifications on your screen‎‏‎‎‏‎"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‏‎‎‎‎‏‎‎‏‎‎‏‏‎‏‎‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‎‏‎‎‎‏‏‏‎‎‏‏‎‎‏‎‏‏‏‏‎When notifications arrive, your phone won’t make a sound or vibrate.‎‏‎‎‏‎"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‎‎‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‎‏‏‎‎‏‏‎‏‎‎‏‎‏‎‏‏‏‎‎‎‏‎‎‎‏‏‎‎‎Hide notifications‎‏‎‎‏‎"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‏‎‎‎‎‏‏‎‏‏‏‏‎‏‎‎‏‎‏‏‎‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‎‎‏‎‎‎‏‎‏‏‏‏‎‏‎You won’t see new or existing notifications‎‏‎‎‏‎"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‎‎‏‏‏‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎‏‏‎‎‏‎‏‏‎‏‏‎‏‎‏‏‎No visuals or sound from notifications‎‏‎‎‏‎"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‎‏‎‎‏‎‏‏‎‎‎‎‏‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‎‏‎‏‏‎‏‎‎‏‏‏‎‎‏‏‏‎‎‏‎‎‎‎You won’t see or hear notifications‎‏‎‎‏‎"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‎‎‎‏‎‏‎‏‏‏‎‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‎‎‎‎‏‎Your phone won’t show new or existing notifications, and won’t make a sound or vibrate. Notifications won’t appear when you swipe down from the top of your screen.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Keep in mind, critical notifications for phone activity and status will still appear.‎‏‎‎‏‎"</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‏‎‎‏‎‎‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎Custom‎‏‎‎‏‎"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‏‎‏‏‎‎‏‏‏‏‏‎‎‎‏‏‏‏‎‎‎‏‏‎Enable custom setting‎‏‎‎‏‎"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‏‎‎‏‎‏‏‏‎‏‎‏‏‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‎‏‎‏‏‏‎‎‎‎‏‏‎‎‏‎‏‏‏‎‏‎Remove custom setting‎‏‎‎‏‎"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‎‏‏‎‎‎‎‎‎‏‎‎‎‏‎‎‏‏‎‎‏‏‎‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‎‎‏‎Will appear‎‏‎‎‏‎"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‎‎‎‏‎‏‏‎‏‏‎‎‏‏‏‏‏‎‎‏‎‏‏‎‎‏‎‎‏‎‏‎‎‎‏‏‎‏‎‏‏‎‎‏‏‏‏‏‎‎‏‎‏‎No sound from notifications‎‏‎‎‏‎"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‎‏‎‏‏‎‏‎‏‏‎‏‏‎‎‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‎‎‎‏‎‎‏‏‎‎‏‏‎‎‏‎‎‎‏‎‎‏‎‎Partially hidden‎‏‎‎‏‎"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‎‎‏‎‎‎‏‎‏‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‏‏‎‏‎‎Hidden‎‏‎‎‏‎"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‏‏‎‏‏‎‏‎‏‏‏‎‏‏‎‎‏‏‎‏‏‎‎‏‎‏‏‏‎‏‎‏‎‎‏‏‎‏‎‎‎‏‎‎‏‎‏‏‎‏‏‎‎‎‎No visuals or sound from notifications‎‏‎‎‏‎"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‏‎‎‎‎‎‎‎‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‎Custom restrictions‎‏‎‎‏‎"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‎‏‎‎‏‏‏‎‏‎‎‎‎‎‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‏‎‏‏‎‎‎‏‏‏‏‎‏‎‎‏‏‎‎‏‏‎‏‏‎When the screen is on‎‏‎‎‏‎"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‏‎‎‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‏‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‎‎‎‎‎‎‎‏‎‏‎‎‏‏‎‎‎‏‎When the screen is off‎‏‎‎‏‎"</string>
@@ -3160,19 +3170,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‎‎‎‎‏‎‏‏‎‎‎‏‎‎‎‏‎‎‎‎‎‏‎‎‎‏‎Muted, but allow ‎‏‎‎‏‏‎<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>‎‏‎‎‏‏‏‎, ‎‏‎‎‏‏‎<xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>‎‏‎‎‏‏‏‎, and ‎‏‎‎‏‏‎<xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‎‏‏‎‏‎‏‏‏‎‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎‏‏‎‎‏‎‎‏‏‏‏‏‎‎‎‏‎‎‎‏‎‎‏‎‏‎‎‎Messages, events &amp; reminders‎‏‎‎‏‎"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‏‏‎‏‎‎‎‎‎‏‏‎‏‏‏‎‎‏‎‏‏‏‎‏‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‎‎‏‎‎‎‏‏‎When Do Not Disturb is on, messages, reminders, and events will muted, except for the items you allow above. You can adjust messages settings to allow your friends, family, or other contacts to reach you.‎‏‎‎‏‎"</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‎‏‏‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‏‎‎‎‏‏‎‏‏‏‎‎‎‏‎‎‏‎‏‏‏‎‏‎‏‎Done‎‏‎‎‏‎"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‎‏‎‏‏‎‎‎‏‎‏‎‎‏‏‏‎‎‏‏‏‎‏‎‎‎Settings‎‏‎‎‏‎"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‎‎‎‎‎‎‎‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‎‏‎‎‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‏‎No visuals or sound from notifications‎‏‎‎‏‎"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‎‎‎‏‏‎‎‏‏‎‏‎‏‏‎‏‏‎‎‏‎‎‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‎‎‎‎‎No sound from notifications‎‏‎‎‏‎"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‏‎‏‎‏‎‏‎‎‎‏‏‏‎‏‏‏‎‏‎‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‎‎‎‎‎‎‎‎‎‏‎‎You won’t see or hear notifications. Calls from starred contacts and repeat callers are allowed.‎‏‎‎‏‎"</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‎‏‎‏‏‎‏‎‏‎‎‎‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎‏‎‏‏‎‏‏‏‎‏‏‎‎‎‎‎‏‎(Current setting)‎‏‎‎‏‎"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎‏‏‎‎‎‏‎‎‏‎‎‎‏‎‎‏‏‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎‎‎‏‎‏‎‎‎Change Do Not Disturb notification settings?‎‏‎‎‏‎"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‎‎‏‏‎‎‏‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‎‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎Work profile sounds‎‏‎‎‏‎"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‎‏‎‎‏‎‏‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‏‏‎‏‎‎Use personal profile sounds‎‏‎‎‏‎"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‎‎‎‏‏‎‏‏‎‎‎‏‎‏‎‏‏‎‎‎‏‎Sounds are the same for work and personal profiles‎‏‎‎‏‎"</string>
@@ -3344,10 +3348,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‎‎‏‏‎‏‎‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‏‎‎‏‏‎‏‎Allow calls‎‏‎‎‏‎"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‎‏‎‎‎‎‏‎‎‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎When Do Not Disturb is on, incoming calls are blocked. You can adjust settings to allow your friends, family, or other contacts to reach you.‎‏‎‎‏‎"</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‏‏‎‎‎‎‎‎‎‏‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‎‏‎‏‎‎‏‏‏‏‏‎‎Starred contacts‎‏‎‎‏‎"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‎‎‎‏‎‏‎‏‎‏‏‎‎‎‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‎‎‏‏‏‎‎‎‏‏‎‎‏‎‎‎‎‎‏‎‎‏‎and ‎‏‎‎‏‏‎<xliff:g id="NUM_PEOPLE">%d</xliff:g>‎‏‎‎‏‏‏‎ others‎‏‎‎‏‎</item>
-      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‎‎‎‏‎‏‎‏‎‏‏‎‎‎‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‎‎‏‏‏‎‎‎‏‏‎‎‏‎‎‎‎‎‏‎‎‏‎and 1 other‎‏‎‎‏‎</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‎‎‎‎‏‏‎‏‎‏‏‎‎‎‏‏‏‏‎‏‏‎‏‏‎‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‏‏‎‏‏‏‏‎‏‏‏‎‎Messages‎‏‎‎‏‎"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‏‎‎‎‏‎‎‎‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‏‏‎‏‏‎‏‎‏‏‏‎‏‏‏‎‎‏‎‎‏‏‏‏‏‎‎‏‎Allow messages‎‏‎‎‏‎"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‏‏‎‏‏‎‏‎‏‎‏‎‏‏‎‎‎‏‎‎‎‏‏‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‎‎‏‎‎‎‎Messages‎‏‎‎‏‎"</string>
@@ -3777,10 +3778,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‏‎‏‏‎‎‎‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‎‏‎‏‎Cool color temperature‎‏‎‎‏‎"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎‎‏‎‏‏‎‏‎‏‎‎‎Use cooler display colors‎‏‎‎‏‎"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‏‎‎‏‏‎‎‏‏‏‎‎‏‏‎‏‎‏‏‎To apply color change, turn off screen‎‏‎‎‏‎"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‎‏‏‏‎‏‏‎‎‏‎‎‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‎‏‎Connectivity Monitor‎‏‎‎‏‎"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎‎‏‎‏‏‎‏‎‏‎‎‎‎‎‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‏‏‏‎‎‎‎‏‎ConnectivityMonitor will collect logs when it detects a connectivity problem and prompt notification to user to file a bug‎‏‎‎‏‎"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎‏‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‏‎‎‏‎‎‎To apply connectivity monitor change, reboot device‎‏‎‎‏‎"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‏‎‎‎‏‏‏‏‎‎‎‏‎‎‎‎Camera Laser Sensor‎‏‎‎‏‎"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‏‎‎‎‎‎‎‏‏‎‎‏‏‎‎‎‏‎‎‎‎‏‏‏‎‏‏‎‏‎Logical Camera As Default‎‏‎‎‏‎"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‎‎‏‎‎‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‏‎‏‎‏‎‎Automatic system updates‎‏‎‎‏‎"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‏‎‏‏‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‏‏‏‏‎Apply updates when device restarts‎‏‎‎‏‎"</string>
     <string name="usage" msgid="2977875522080448986">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‏‎‎‏‏‏‎‎‎‏‎‏‎‎‎‎‎‎‎‏‎‏‎‎‎‎‏‏‎‏‏‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‏‎‏‎‎Usage‎‏‎‎‏‎"</string>
@@ -4090,8 +4089,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‏‏‎‎‎‎‎‏‎‏‎‎‎‎‎‎‎‏‎‏‏‏‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‎‎‏‏‎‎Autofill service‎‏‎‎‏‎"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‏‎‏‎‎‎‎‏‏‎‏‎‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎‏‎‎‏‎‏‎‎‏‏‎‎auto, fill, autofill‎‏‎‎‏‎"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‏‎‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‎‏‏‏‎‏‎‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎&lt;b&gt;Make sure you trust this app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; uses what\'s on your screen to determine what can be autofilled.‎‏‎‎‏‎"</string>
-    <string name="device_theme" msgid="4571803018917608588">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‎‎‏‏‏‎‏‎‎‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‎‎‏‎‎‎‏‏‎‎‎Device theme‎‏‎‎‏‎"</string>
+    <string name="color_theme" msgid="1535685696756738324">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎‎‏‏‏‎‎‏‏‏‎‏‎‏‎‏‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎‎‎Color theme‎‏‎‎‏‎"</string>
     <string name="default_theme" msgid="7085644992078579076">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‎‏‎‏‎‏‎‎‎‏‎‎‏‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‎‏‎‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‎‎‎‏‎‎‎Default‎‏‎‎‏‎"</string>
+    <string name="device_theme" msgid="4571803018917608588">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‎‎‏‏‏‎‏‎‎‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‎‎‏‎‎‎‏‏‎‎‎Device theme‎‏‎‎‏‎"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‎‎‏‏‏‎‎‎‏‏‎‏‏‎‏‏‎‏‏‎‎‏‎‏‏‏‏‏‎‎‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‎‏‎‏‎‏‎‎‎Automatic (based on wallpaper)‎‏‎‎‏‎"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‏‎‏‎‎‏‏‎‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‏‎‏‏‎‎‏‎‎‏‏‏‎‎‎‎‏‏‏‏‎‎‎‏‎‎Light‎‏‎‎‏‎"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‏‏‏‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‎‎‏‎‎‎‎‎‏‎‏‎‏‎‎‎‎‏‏‏‎‏‎‎‎‎Dark‎‏‎‎‏‎"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‎‏‎‏‏‎‎‎‏‏‎‏‎‏‎‎‎‎‏‎‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‎‏‏‎‎‏‏‎‎‎‏‏‏‎Network name‎‏‎‎‏‎"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‎‎‎‏‏‏‎‏‏‎‏‏‎‏‏‏‏‎‎‎‏‎‎‏‏‎‎‎‎‏‏‎‏‏‏‎‎Display network name in status bar‎‏‎‎‏‎"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‏‏‎‎‏‏‎‎‏‎‏‏‎‏‎‏‎‏‏‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‏‏‎‏‎‎‎‏‏‎‎‎Storage Manager: ‎‏‎‎‏‏‎<xliff:g id="STATUS">^1</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
@@ -4103,7 +4106,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‏‏‎‎‎‏‎Carrier Provisioning Info‎‏‎‎‏‎"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‏‏‎‎‎‎‏‎‏‏‎‏‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‎‏‎‏‎‏‏‎Trigger Carrier Provisioning‎‏‎‎‏‎"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‎‎‏‎‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‎‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎‏‎Update Do Not Disturb‎‏‎‎‏‎"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‏‎‏‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎Hide notifications to stay focused‎‏‎‎‏‎"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‎‏‏‎‏‏‏‎‏‏‎‏‎‎‏‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‎‎‎‏‏‎‎‎‏‏‎‏‏‎‎‏‏‏‎‏‏‎‎Pause notifications to stay focused‎‏‎‎‏‎"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‎‎‏‎‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‎‏‏‎‎‏‎‎‏‏‎‎What\'s new and exciting?‎‏‎‎‏‎"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‎‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‎‎‎‏‏‏‏‎Take a tour of your new phone‎‏‎‎‏‎"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‏‏‏‎‏‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‏‏‎‎‎Take a tour of your new tablet‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 28e96df..a23cbd3 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Siempre activado"</item>
     <item msgid="6385301106124765323">"Siempre desactivado"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 96159f2..3f56255 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Permite que la tablet se comunique con dispositivos Bluetooth cercanos"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Permite que el dispositivo se comunique con dispositivos Bluetooth cercanos"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Permite que el teléfono se comunique con dispositivos Bluetooth cercanos"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"No aligeramiento hardware Bluetooth A2DP"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"¿Reiniciar?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Debes reiniciar el dispositivo para cambiar esta opción."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Reiniciar"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Cancelar"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Dispositivos de medios disponibles"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Dispositivos de llamada disponibles"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Conectados actualmente"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Preferencias de conexión"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Dispositivos conectados previamente"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Conectados anteriormente"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Fecha y hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Elige la zona horaria"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"El puerto que has escrito no es válido."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"El navegador usa el proxy HTTP, pero tal vez las demás aplicaciones no lo usen."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"URL config. autom. proxy: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Ancho de banda de DL (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Ancho de banda de UL (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Información sobre la ubicación del teléfono (no disponible):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Información sobre un teléfono cercano (no disponible):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Configuración del canal físico de LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Frecuencia de actualización de la información del teléfono:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Información sobre las dimensiones de los teléfonos:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Información en tiempo real sobre la conexión de datos:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Servicio de datos:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar el dispositivo para activarlo"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Pantalla Ambiente"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Siempre activada/Aumenta el uso de la batería"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nuevas notificaciones"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Cuándo mostrar"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nuevas notificaciones"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Activar la pantalla cuando haya notificaciones"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">El código PIN de la tarjeta SIM es incorrecto. Tienes <xliff:g id="NUMBER_0">%d</xliff:g> intento más antes de que debas comunicarte con el proveedor para desbloquear el dispositivo.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Error al desbloquear la tarjeta SIM con el PIN"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Estado del tablet"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Estado del dispositivo"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Actualiz. del sistema"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versión de Android"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"No se puede restringir el uso en segundo plano"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"¿Limitar actividad en segundo plano?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Si limitas la actividad en segundo plano de una app, es posible que no funcione correctamente"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Como no se configuró la app para optimizar la batería, no puedes restringirla.\n\nPrimero, activa optimización de batería."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Uso de la pantalla desde carga completa"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo de la pantalla"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Escaneo de redes móviles"</string>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Indicador de marcado de emergencia"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Establecer el comportamiento cuando se establece una llamada de emergencia"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Copia de seguridad"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Activada"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Desactivada"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Crear copia de seguridad y Restablecer"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Datos personales"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Hacer una copia de seguridad de mis datos"</string>
@@ -2761,6 +2766,12 @@
       <item quantity="one">Revisar certificado</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Varios usuarios"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Usuarios y perfiles"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Agregar usuario o perfil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Agregar usuario"</string>
@@ -2943,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"uso de datos"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivos conectados"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, En automóvil, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, En automóvil"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps y notificaciones"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permisos, apps predeterminadas"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Cuentas"</string>
@@ -2967,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"selector, predeterminado, apps"</string>
     <string name="keywords_display" msgid="8910345814565493016">"pantalla, pantalla táctil"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"atenuar pantalla, pantalla táctil, batería, brillo"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"atenuar pantalla, pantalla táctil, batería"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"atenuar pantalla, luz nocturna, tono, modo nocturno, brillo, color de pantalla, color, colores"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"fondo, personalizar, personalizar pantalla"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tamaño del texto"</string>
@@ -3008,8 +3014,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"red, estado de la red móvil, estado del servicio, potencia de la señal, tipo de red móvil, roaming, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"número de serie, versión de hardware"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"nivel de parche de seguridad de android, versión de banda base, versión de kernel"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Pantalla Ambiente, pantalla bloqueada"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"huella digital"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"atenuar pantalla, pantalla táctil, batería, brillo inteligente, brillo dinámico"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"rotar, girar, rotación, retrato, paisaje, orientación, vertical, horizontal"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"actualizar, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"no interrumpir, programar, notificaciones, bloquear, silenciar, vibrar, suspender, trabajar, enfocar, sonido, silencio, día, día de la semana, fin de semana, noche de la semana, evento"</string>
@@ -3092,18 +3101,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permitir señales visuales"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Qué sucede si activas el modo No interrumpir"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notificaciones"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Mostrar notificaciones silenciosamente"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Se silenciarán las notificaciones"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Notificaciones sin sonido"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Verás las notificaciones en la pantalla"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"El teléfono no sonará ni vibrará cuando recibas notificaciones."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Ocultar notificaciones"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"No verás notificaciones nuevas ni existentes"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Notificaciones sin sonido ni elementos visuales"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"No verás ni oirás notificaciones"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Tu teléfono no mostrará notificaciones nuevas o existentes. Tampoco vibrará ni sonará. Las notificaciones no aparecerán cuando deslices el dedo hacia abajo desde la parte superior de la pantalla.\n\nTen en cuenta que seguirán apareciendo las notificaciones clave de la actividad y el estado del teléfono."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Personalizada"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Habilitar configuración personalizada"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Quitar configuración personalizada"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Se mostrarán"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Notificaciones sin sonido"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Parcialmente ocultas"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Ocultas"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Notificaciones sin sonido ni elementos visuales"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Restricciones personalizadas"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Cuando se enciende la pantalla"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Cuando se apaga la pantalla"</string>
@@ -3162,19 +3171,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Silenciar, pero permitir <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> y <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mensajes, eventos y recordatorios"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Si activas el modo No interrumpir, se silenciarán los mensajes, recordatorios y eventos, excepto los elementos que habilites arriba. Puedes ajustar la configuración de los mensajes para permitir que tus amigos, tu familia y otros contactos se comuniquen contigo."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Listo"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Configuración"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Notificaciones sin sonido ni elementos visuales"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Notificaciones sin sonido"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"No verás ni oirás notificaciones. Sí se permiten las llamadas de contactos destacados y emisores repetidos."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Configuración actual)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"¿Quieres cambiar la configuración de notificaciones de No interrumpir?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Sonidos del perfil de trabajo"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Usa los sonidos del perfil personal"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Los sonidos de los perfiles de trabajo y personal son iguales"</string>
@@ -3344,10 +3347,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Permitir llamadas"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Si activas el modo No interrumpir, se bloquearán las llamadas entrantes. Puedes ajustar la configuración para permitir que tus amigos, tu familia y otros contactos puedan comunicarse contigo."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Contactos destacados"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">y <xliff:g id="NUM_PEOPLE">%d</xliff:g> más</item>
-      <item quantity="one">y 1 más</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mensajes"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Permitir mensajes"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Mensajes"</string>
@@ -3777,10 +3777,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de colores fríos"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Usar colores de pantalla más fríos"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar el cambio de color, apaga la pantalla"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitor de conectividad"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"El monitor de conectividad recopilará los registros si detecta un problema de conexión y mostrará una notificación al usuario para registrar un error"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Para aplicar el cambio del monitor de conectividad, reinicia el dispositivo"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor láser de la cámara"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Cámara lógica como predeterminada"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Actualizaciones automáticas del sistema"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Aplicar actualizaciones al reiniciar el dispositivo"</string>
     <string name="usage" msgid="2977875522080448986">"Uso"</string>
@@ -4090,8 +4088,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Servicio autocompletar"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"auto, completar, autocompletar"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Asegúrate de que esta app sea confiable.&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; usa el contenido de tu pantalla para determinar qué se puede autocompletar."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Tema del dispositivo"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Tema de color"</string>
     <string name="default_theme" msgid="7085644992078579076">"Predeterminado"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Tema del dispositivo"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automático (según el fondo de pantalla)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Claro"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Oscuro"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Nombre de la red"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Mostrar el nombre de la red en la barra de estado"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Administrador de almacenamiento: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4103,7 +4105,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Información del aprovisionamiento del proveedor"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Activar aprovisionamiento del proveedor"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Actualizar el modo No interrumpir"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Oculta las notificaciones para concentrarte"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pausa las notificaciones para concentrarte"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"¿Cuáles son las novedades y qué es lo más emocionante?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Descubre tu nuevo teléfono"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Descubre tu nueva tablet"</string>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index b4efb54..0aa2fb8 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Siempre activado"</item>
     <item msgid="6385301106124765323">"Siempre desactivado"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 85abaef..d4af162 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Permite que tu tablet se comunique con dispositivos Bluetooth cercanos"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Permite que tu dispositivo se comunique con dispositivos Bluetooth cercanos"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Permite que tu teléfono se comunique con dispositivos Bluetooth cercanos"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Inhabilitar descarga hardware A2DP BT"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"¿Reiniciar dispos.?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Debes reiniciar el dispositivo para cambiar este ajuste."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Reiniciar"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Cancelar"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Dispositivos multimedia disponibles"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Dispositivos de llamada disponibles"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Conectados actualmente"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Preferencias de conexión"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Dispositivos conectados previamente"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Conectados previamente"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Fecha y hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Elige una zona horaria"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"El puerto que has introducido no es válido."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"El navegador utiliza el proxy HTTP, pero otras aplicaciones no pueden usarlo."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"URL PAC "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Ancho de banda de bajada (Kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Ancho de banda de subida (Kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Información sobre la ubicación del teléfono (obsoleto):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Información sobre un teléfono cercano (obsoleto):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Configuración del canal físico de LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Frecuencia de actualización de la información del teléfono:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Información sobre las dimensiones de los teléfonos:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Información en tiempo real sobre la conexión de datos:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Servicio de datos:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Itinerancia:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar el dispositivo para activarlo"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Pantalla ambiente"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Siempre activada (Aumenta el uso de la batería)"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nuevas notificaciones"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Cuándo debe mostrarse"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nuevas notificaciones"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Activar pantalla al recibir notificaciones"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">Código PIN de la tarjeta SIM incorrecto. Te queda <xliff:g id="NUMBER_0">%d</xliff:g> intento para tener que ponerte en contacto con tu operador para desbloquear el dispositivo.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Error al intentar desbloquear la tarjeta SIM con el código PIN"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Estado del tablet"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Estado del teléfono"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Actualizaciones del sistema"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versión de Android"</string>
@@ -2434,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Señal de llamada de emergencia"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Establecer comportamiento al realizar una llamada de emergencia"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Copia de seguridad"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Activada"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Desactivada"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Copia de seguridad"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Datos personales"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Copia de seguridad de mis datos"</string>
@@ -2760,6 +2766,12 @@
       <item quantity="one">Comprobar certificado</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Varios usuarios"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Usuarios y perfiles"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Añadir usuario o perfil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Añadir usuario"</string>
@@ -2942,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"uso de datos"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"punto de acceso"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivos conectados"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, modo de conducción, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, modo de conducción"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicaciones y notific."</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permisos, aplicaciones predeterminadas"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Cuentas"</string>
@@ -2966,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"menú de aplicaciones, predeterminado, aplicaciones"</string>
     <string name="keywords_display" msgid="8910345814565493016">"pantalla, pantalla táctil"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"atenuar pantalla, pantalla táctil, batería, nitidez"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"atenuar patalla, pantalla táctil, batería"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"atenuar pantalla, noche, tono, modo nocturno, brillo, color de la pantalla, color"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"segundo plano, personalizar, personalizar pantalla"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tamaño del texto"</string>
@@ -3007,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"red, estado de la red móvil, estado del servicio, intensidad de la señal, tipo de red móvil, itinerancia, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"número de serie, versión de hardware"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"nivel del parche de seguridad de android, versión de banda base, versión de kernel"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Pantalla ambiente, pantalla de bloqueo"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"huella digital"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"rotar, girar, rotación, retrato, paisaje, orientación, vertical, horizontal"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"actualizar, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"no molestar, programar, notificaciones, bloquear, silencio, vibrar, sueño, trabajo, concentración, sonido, silenciar, día, días laborables, fin de semana, noches de la semana, evento"</string>
@@ -3091,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permitir señales visuales"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Cuando el modo No molestar esté activado"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notificaciones"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Mostrar notificaciones en silencio"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Las notificaciones se silenciarán"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Notificaciones sin sonido"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Las notificaciones aparecerán en la pantalla"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Cuando recibas notificaciones, tu teléfono no sonará ni vibrará."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Ocultar notificaciones"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"No verás notificaciones nuevas ni anteriores"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Notificaciones sin sonido ni elementos visuales"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"No verás ni escucharás notificaciones"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Tu teléfono no mostrará notificaciones nuevas ni anteriores y no sonará ni vibrará. Las notificaciones no aparecerán cuando deslices el dedo hacia abajo desde la parte superior de la pantalla.\n\nTen en cuenta que se seguirán mostrando las notificaciones importantes sobre el estado y la actividad del teléfono."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Personalizado"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Habilitar configuración personalizada"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Quitar configuración personalizada"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"No ocultas"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Notificaciones sin sonido"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Parcialmente ocultas"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Ocultas"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Notificaciones sin sonido ni elementos visuales"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Restricciones personalizadas"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Cuando la pantalla esté encendida"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Cuando la pantalla esté apagada"</string>
@@ -3148,7 +3159,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> reglas se pueden activar automáticamente</item>
       <item quantity="one">1 regla se puede activar automáticamente</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="2989256030084350296">"Comportamiento"</string>
+    <string name="zen_category_behavior" msgid="2989256030084350296">"Qué hacer"</string>
     <string name="zen_category_exceptions" msgid="7601136604273265629">"Excepciones"</string>
     <string name="zen_category_schedule" msgid="9000447592251450453">"Programación"</string>
     <string name="zen_sound_title" msgid="424490228488531372">"Sonido y vibración"</string>
@@ -3161,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Silenciados, permitir <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> y <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mensajes, eventos y recordatorios"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Cuando el modo No molestar esté activado, los mensajes, recordatorios y eventos se silenciarán, excepto los que permitas más arriba. Ajusta la configuración de los mensajes para que tus amigos, familiares u otros puedan contactarte."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Listo"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Ajustes"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Notificaciones sin sonido ni elementos visuales"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Notificaciones sin sonido"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"No verás ni escucharás notificaciones. Las llamadas de contactos destacados y de personas que insisten están permitidas."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Configuración actual)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"¿Quieres cambiar los ajustes de las notificaciones del modo No molestar?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Sonidos del perfil de trabajo"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Utilizar sonidos del perfil personal"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Los sonidos de los perfiles personal y de trabajo son los mismos"</string>
@@ -3210,11 +3215,11 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificaciones de aplicaciones"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoría de notificaciones"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"Grupo de categoría de notificaciones"</string>
-    <string name="notification_importance_title" msgid="4368578960344731828">"Comportamiento"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"Qué hacer"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"Permitir sonido"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"No mostrar notificaciones nunca"</string>
     <string name="notification_importance_min" msgid="9054819132085066824">"Mostrar en silencio y minimizar"</string>
-    <string name="notification_importance_low" msgid="2445139943005315690">"Mostrar de forma silenciosa"</string>
+    <string name="notification_importance_low" msgid="2445139943005315690">"Mostrar en silencio"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Emitir sonido"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Emitir sonido y mostrar en pantalla"</string>
     <string name="notification_importance_high_silent" msgid="2667033773703765252">"Mostrar en pantalla"</string>
@@ -3345,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Permitir llamadas"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"El modo No Molestar bloquea las llamadas entrantes. Ajusta la configuración para que tus amigos, familiares u otros puedan contactarte."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Contactos destacados"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">y <xliff:g id="NUM_PEOPLE">%d</xliff:g> más</item>
-      <item quantity="one">y 1 más</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mensajes"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Permitir mensajes"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Mensajes"</string>
@@ -3643,7 +3645,7 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Se quitarán todas las reglas de No molestar que esta aplicación haya creado."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"No optimizar"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimizar"</string>
-    <string name="ignore_optimizations_on_desc" msgid="3549930955839111652">"Tu batería se puede consumir más rápido. La aplicación no tendrá restricción para usar batería en segundo plano."</string>
+    <string name="ignore_optimizations_on_desc" msgid="3549930955839111652">"Es posible que la batería se consuma más rápido. La aplicación no tendrá restricción para usar batería en segundo plano."</string>
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Recomendado para mejorar la duración de la batería"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"¿Permitir que <xliff:g id="APP">%s</xliff:g> ignore las optimizaciones de la batería?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Ninguna"</string>
@@ -3778,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de colores fríos"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilizar colores de pantalla más fríos"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar el cambio de color, apaga la pantalla"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitor de conectividad"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor recopilará los registros al detectar un problema de conexión y mostrará una notificación al usuario para registrar un error"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Para aplicar el cambio al monitor de conectividad, reinicia el dispositivo"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor láser de la cámara"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Usar cámara lógica como predeterminada"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Actualizaciones del sistema automáticas"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Aplicar actualizaciones cuando se reinicie el dispositivo"</string>
     <string name="usage" msgid="2977875522080448986">"Uso"</string>
@@ -4091,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Servicio Autocompletar"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automático, completar, autocompletar"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Asegúrate de que confías en esta aplicación&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Autocompletar de Google&gt;%1$s&lt;/xliff:g&gt; utiliza el contenido que se muestra en la pantalla para determinar el texto que se puede autocompletar."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Tema del dispositivo"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Tema de color"</string>
     <string name="default_theme" msgid="7085644992078579076">"Predeterminado"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Tema del dispositivo"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automático (según el fondo de pantalla)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Claro"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Oscuro"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Nombre de la red"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Mostrar el nombre de la red en la barra de estado"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Administrador de Almacenamiento: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4104,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Información de servicios del operador"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Activar servicios del operador"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Actualizar el modo No molestar"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Oculta las notificaciones para concentrarte"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pausa las notificaciones para concentrarte"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"¿Cuáles son las fascinantes novedades?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Descubre tu nuevo teléfono"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Descubre tu nuevo tablet"</string>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index 2946553..b89cf52 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Alati sees"</item>
     <item msgid="6385301106124765323">"Alati väljas"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 8e9390f..83232a8 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Lubage oma tahvelarvutil lähedalasuvate Bluetoothi seadmetega suhelda"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Lubage oma seadmel lähedalasuvate Bluetoothi seadmetega suhelda"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Lubage telefonil suhelda lähedalasuvate Bluetoothi seadmetega"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Keela Bluetoothi A2DP riistvara mahalaadimine"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Kas taaskäivitada seade?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Selle seade muutmiseks peate seadme taaskäivitama."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Taaskäivita"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Loobu"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Saadaolevad meediaseadmed"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Saadaolevad helistamisseadmed"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Praegu ühendatud"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Ühenduse eelistused"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Varem ühendatud seadmed"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Eelnevalt ühendatud"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Kuupäev ja kellaaeg"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Ajavööndi valimine"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Sisestatud port on kehtetu."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Brauser kasutab HTTP-puhverserverit, kuid muud rakendused ei tohi seda kasutada."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL ribalaius (kbit/s):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL ribalaius (kbit/s):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Kärje asukohateave (tugi on katkestatud):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Naaberkärje teave (tugi on katkestatud):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE füüsilise kanali konfiguratsioon:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Kärje teabe värskendamissagedus:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Kõik kärje mõõteandmed:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Andmesideühenduse reaalajas teave:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Andmesideteenus:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Rändlus:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automaatne eredus"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Tõstke äratamiseks"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Säästlik ekraan"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Alati sees / suurem akukasutus"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Uued märguanded"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Millal kuvada?"</string>
     <string name="doze_title" msgid="2375510714460456687">"Uued märguanded"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Ekraan aktiveerub, kui saate märguandeid"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">Vale SIM-kaardi PIN-kood, jäänud on <xliff:g id="NUMBER_0">%d</xliff:g> katse enne, kui peate seadme avam. operaatoriga ühendust võtma.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM-i PIN-koodi toiming ebaõnnestus."</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tahvelarvuti olek"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefoni olek"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Süsteemivärskendused"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Androidi versioon"</string>
@@ -2434,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Hädaabikõne signaal"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Määra käitumine hädaabikõne korral"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Varundamine"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Sees"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Väljas"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Varundamine ja taastamine"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Isikuandmed"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Minu andmete varundamine"</string>
@@ -2760,6 +2766,12 @@
       <item quantity="one">Kontrollige sertifikaati</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Mitu kasutajat"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Kasutajad ja profiilid"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Lisa kasutaja või profiil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Kasutaja lisamine"</string>
@@ -2942,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"andmekasutus"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"kuumkoht"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Ühendatud seadmed"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, sõidurežiim, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, sõidurežiim"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Rakendused ja märguanded"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Load, vaikerakendused"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Kontod"</string>
@@ -2966,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"käivitaja, vaikeseade, rakendused"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ekraan, puuteekraan"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"ekraani hämardamine, puuteekraan, aku, ere"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"ekraani hämardamine, puuteekraan, aku"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"ekraani hämardamine, öö, toon, öörežiim, eredus, ekraanikuva värv, värv"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"taust, isikupärastamine, ekraani kohandamine"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"teksti suurus"</string>
@@ -3007,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"võrk, mobiilsidevõrgu olek, teenuse olek, signaali tugevus, mobiilsidevõrgu tüüp, rändlus, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"seerianumber, riistvaraversioon"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"androidi turvapaiga tase, põhiribaversioon, tuuma versioon"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Säästlik ekraan, lukustuskuva ekraan"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"sõrmejälg"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"pöörama, vahetamine, pööramine, vertikaalpaigutus, horisontaalpaigutus, suund, vertikaalne, horisontaalne"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"versiooniuuendus, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, ajakava, märguanded, blokeerimine, vaikus, vibreerimine, unerežiim, töö, keskendumine, heli, vaigistamine, päev, tööpäev, nädalalõpp, öö nädala sees, sündmus"</string>
@@ -3091,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Luba visuaalsed signaalid"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Kui režiim Mitte segada on sisse lülitatud"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Märguanded"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Kuva märguanded vaikselt"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Märguanded vaigistatakse"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Hääletud märguanded"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Näete ekraanil märguandeid"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Teie telefon ei helise ega vibreeri märguannete saabumisel."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Peida märguanded"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Te ei näe uusi ega olemasolevaid märguandeid"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Hääletud ja ekraanilt peidetud märguanded"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Te ei kuule ega näe märguandeid"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Teie telefon ei kuva uusi ega olemasolevaid märguandeid ega helise või vibreeri. Kui pühite ekraanikuva ülaosast alla, siis märguandeid ei kuvata.\n\nPidage meeles, et kriitilised märguanded telefoni tegevuste ja oleku kohta kuvatakse siiski."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Kohandatud"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Kohandatud seade lubamine"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Kohandatud seade eemaldamine"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Kuvatakse"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Hääletud märguanded"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Osaliselt peidetud"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Peidetud"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Hääletud ja ekraanilt peidetud märguanded"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Kohandatud piirangud"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Kui ekraan on sees"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Kui ekraan on väljas"</string>
@@ -3161,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Vaigistatud, kuid lubatakse <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> ja <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Sõnumid, sündmused ja meeldetuletused"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Kui funktsioon Mitte segada on sisse lülitatud, vaigistatakse sõnumid, meeldetuletused ja sündmused. Teil on võimalik sõnumite seadeid kohandada, et võimaldada sõpradel, pereliikmetel või muudel kontaktidel teiega ühendust võtta."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Valmis"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Seaded"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Hääletud ja ekraanilt peidetud märguanded"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Hääletud märguanded"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Te ei kuule ega näe märguandeid. Tärniga tähistatud kontaktidelt ja korduvatelt helistajatelt pärit kõned on lubatud."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(praegune seade)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Kas soovite režiimi Mitte segada märguandeseadeid muuta?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Tööprofiili helid"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Kasuta isikl. profiili helisid"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Isikliku ja tööprofiili helid on samad"</string>
@@ -3345,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Luba kõned"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Kui funktsioon Mitte segada on sisse lülitatud, blokeeritakse sissetulevad kõned. Teil on võimalik seadeid kohandada, et võimaldada sõpradel, pereliikmetel või muudel kontaktidel teiega ühendust võtta."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Tärniga tähistatud kontaktid"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">ja veel <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="one">ja veel 1</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Sõnumid"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Luba sõnumid"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Sõnumid"</string>
@@ -3778,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Külm värvitemperatuur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Kasutatakse külmemaid ekraanivärve"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Värvi muutmise rakendamiseks lülitage ekraan välja"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Ühenduvusmonitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Ühenduvusmonitor kogub ühenduvusprobleemide korral logisid ja esitab kasutajale märguande veaaruande esitamiseks"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Ühenduvusmonitori muudatuse rakendamiseks taaskäivitage seade"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kaamera laserandur"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Vaikekaamera on Logical Camera"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automaatsed süsteemivärskendused"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Rakenda värskendused seadme taaskäivitamisel"</string>
     <string name="usage" msgid="2977875522080448986">"Kasutus"</string>
@@ -4091,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Automaattäite teenus"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automaatne, täide, automaattäide"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Veenduge, et rakendus oleks usaldusväärne&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google\'i automaatne täitmine&gt;%1$s&lt;/xliff:g&gt; kasutab automaatse täitmise sisestuse määramiseks ekraanil kuvatut."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Seadme teema"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Värviteema"</string>
     <string name="default_theme" msgid="7085644992078579076">"Vaikeseade"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Seadme teema"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automaatne (taustapildi põhjal)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Hele"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Tume"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Võrgu nimi"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Võrgu nimi kuvatakse olekuribal"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Salvestusruumi haldur: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4104,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operaatori ettevalmistamise teave"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Operaatori ettevalmistamise päästik"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Värskendage režiimi Mitte segada"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Keskendumiseks peitke märguanded"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Keskendumiseks peatage märguanded"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Mis on uut ja põnevat?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Tutvuge oma uue telefoniga"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Tutvuge oma uue tahvelarvutiga"</string>
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml
index c720e37..c8ce807 100644
--- a/res/values-eu/arrays.xml
+++ b/res/values-eu/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Beti aktibatuta"</item>
     <item msgid="6385301106124765323">"Beti desaktibatuta"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 05b0764..c56772c 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Baimendu tabletari inguruko Bluetooth gailuekin komunikatzea"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Baimendu gailuari inguruko Bluetooth gailuekin komunikatzea"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Baimendu telefonoari inguruko Bluetooth gailuekin komunikatzea"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Desgaitu Bluetooth A2DP hardwarea deskargatzeko aukera"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Gailua berrabiarazi?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Ezarpen hau aldatzeko, gailua berrabiarazi egin behar duzu."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Berrabiarazi"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Utzi"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Multimedia-gailu erabilgarriak"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Deitzeko balio duten gailu erabilgarriak"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Konektatuta daudenak"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Konexio-hobespenak"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Aurrez konektatutako gailuak"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Aurretik konektatutakoak"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Data eta ordua"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Aukeratu ordu-zona"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Idatzi duzun ataka ez da baliozkoa."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Arakatzaileak HTTP proxya erabiltzen du baina ezin dute beste aplikazioek erabili."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"Proxya auto. konf. URLa: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Deskargatzeko banda-zabalera (Kb/s):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Kargen banda-zabalera (Kb/s):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Sare mugikorraren kokapenaren informazioa (zaharkitua):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Ondoko sare mugikorraren informazioa (zaharkitua):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE kanal fisikoaren konfigurazioa:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Sare mugikorraren informazioa eguneratzeko maiztasuna:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Sare mugikorraren neurketa guztien informazioa:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Datu-konexioaren denbora errealeko informazioa:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Datu-zerbitzua:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Ibiltaritza:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI zk.:"</string>
@@ -376,7 +384,7 @@
     <string name="decryption_settings_summary" product="default" msgid="5671817824042639849">"Telefonoa ez dago enkriptatuta"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Enkriptatuta dago gailua"</string>
     <string name="decryption_settings_summary" product="tablet" msgid="5794135636155570977">"Gailua ez dago enkriptatuta"</string>
-    <string name="lockscreen_settings_title" msgid="1099738951060387656">"Pantaila blokeatuan erakutsi beharrekoa"</string>
+    <string name="lockscreen_settings_title" msgid="1099738951060387656">"Pantaila blokeatuko edukia"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="278055252361575926">"Erakutsi beharrekoa"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Ezarri Nire kokapena, pantailaren desblokeoa, SIM txartelaren blokeoa, kredentzialen biltegiaren blokeoa"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ezarri Nire kokapena, pantailaren desblokeoa, kredentzialen biltegiaren blokeoa."</string>
@@ -443,7 +451,7 @@
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" Desgaituta dago pantailaren blokeoa. Informazio gehiago lortzeko, jarri erakundearen administratzailearekin harremanetan. "<annotation id="admin_details">"Lortu xehetasun gehiago"</annotation>\n\n"Hala ere, hatz-marka erabil dezakezu erosketak eta aplikazioetarako sarbidea baimentzeko. "<annotation id="url">"Lortu informazio gehiago"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"Jaso hatza eta ukitu berriro sentsorea"</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"<xliff:g id="COUNT">%d</xliff:g> hartz-marka gehi ditzakezu gehienez"</string>
-    <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Iritsi zara onartzen den gehienezko hatz-marka kopurura"</string>
+    <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Iritsi zara onartzen den gehieneko hatz-marka kopurura"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Ezin duzu gehitu beste hatz-markarik"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Hatz-marka digitalak kendu nahi dituzu?"</string>
     <string name="fingerprint_delete_title" msgid="1368196182612202898">"Kendu \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\""</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Distira automatikoa"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Aktibatu eskuetan hartzen denean"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Pantaila ilundua"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Beti aktibatuta. Bateria gehiago kontsumitzen du."</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Jakinarazpen berriak"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Noiz erabili"</string>
     <string name="doze_title" msgid="2375510714460456687">"Jakinarazpen berriak"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Argitu pantaila jakinarazpenak jasotzen dituzunean"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">SIM txartelaren PIN kodea okerra da. <xliff:g id="NUMBER_0">%d</xliff:g> saiakera geratzen zaizu gailua desblokeatzeko.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIMaren PIN kodearen eragiketak huts egin du!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tabletaren egoera"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefonoaren egoera"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Sistemaren eguneratzeak"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android bertsioa"</string>
@@ -1466,8 +1470,8 @@
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Ezin dira berrezarri eSIM txartelak errore bat gertatu delako."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Ezabatu datu guztiak (berrezarri fabrikako ezarpenak)"</string>
     <string name="master_clear_short_title" msgid="8652450915870274285">"Ezabatu datuak (berrezarri jatorrizkoak)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Tabletaren "<b>"barneko memoriako"</b>" datu guztiak ezabatuko dira, besteak beste:\n\n"<li>"Google kontua"</li>\n<li>"Sistema- eta aplikazioen datuak eta ezarpenak"</li>\n<li>"Deskargatutako aplikazioak"</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Telefonoaren "<b>"barneko memoriako"</b>" datu guztiak ezabatuko dira, besteak beste:\n\n"<li>"Google kontua"</li>\n<li>"Sistema- eta aplikazioen datuak nahiz ezarpenak"</li>\n<li>"Deskargatutako aplikazioak"</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Tabletaren "<b>"barneko memoriako"</b>" datu guztiak ezabatuko dira, besteak beste:\n\n"<li>"Google kontua"</li>\n<li>"Sistemaren eta aplikazioen datuak eta ezarpenak"</li>\n<li>"Deskargatutako aplikazioak"</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Telefonoaren "<b>"barneko memoriako"</b>" datu guztiak ezabatuko dira, besteak beste:\n\n"<li>"Google kontua"</li>\n<li>"Sistemaren eta aplikazioen datuak eta ezarpenak"</li>\n<li>"Deskargatutako aplikazioak"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kontu hauetan hasi duzu saioa:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Badaude erabiltzaile gehiago gailu honetan.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musika"</li>\n<li>"Argazkiak"</li>\n<li>"Bestelako erabiltzaile-datuak"</li></string>
@@ -2009,7 +2013,7 @@
       <item quantity="other">Oso atzerapen luzea (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Oso atzerapen luzea (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
-    <string name="accessibility_vibration_summary" msgid="1372393829668784669">"Tonua: <xliff:g id="SUMMARY_RING">%1$s</xliff:g>. Sakatzea: <xliff:g id="SUMMARY_TOUCH">%2$s</xliff:g>"</string>
+    <string name="accessibility_vibration_summary" msgid="1372393829668784669">"Tonua: <xliff:g id="SUMMARY_RING">%1$s</xliff:g>. Sakatzea: <xliff:g id="SUMMARY_TOUCH">%2$s</xliff:g>."</string>
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"Dardara desaktibatuta tonua jotzean eta jakinarazpenak daudenean"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"Dardara txikia tonua jotzean eta jakinarazpenak daudenean"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"Dardara ertaina tonua jotzean eta jakinarazpenak daudenean"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Ezin da mugatu atzeko planoko erabilera"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Atzeko planoko jarduerak mugatu nahi dituzu?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Aplikazio baten atzeko planoko jarduerak mugatzen badituzu, baliteke aplikazioak behar bezala ez funtzionatzea"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Aplikazio hau bateria optimizatzeko konfiguratuta ez dagoenez, ezin duzu mugatu.\n\nMugatzeko, aktibatu bateriaren optimizazioa."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Pantailaren erabilera gailua guztiz kargatu zenetik"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Pantailaren kontsumoa"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Sare mugikorra bilatzen"</string>
@@ -2151,9 +2154,9 @@
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Gailua sarriegi ari da eskatzen kokapena"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplikazio ez dira ari behar bezala funtzionatzen"</string>
     <string name="battery_tip_summary_title" msgid="368729969313047399">"Aplikazioak ohiko moduan dabiltza"</string>
-    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefonoak ohiko bateria kopurua erabiltzen du atzeko planoan"</string>
-    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tabletak ohiko bateria kopurua erabiltzen du atzeko planoan"</string>
-    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"Gailuak ohiko bateria kopurua erabiltzen du atzeko planoan"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefonoak ohiko bateria kantitatea erabiltzen du atzeko planoan"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tabletak ohiko bateria kantitatea erabiltzen du atzeko planoan"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="363718204492523920">"Gailuak ohiko bateria kantitatea erabiltzen du atzeko planoan"</string>
     <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Bateriaren edukiera txikiegia da"</string>
     <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Bateriak ezin du eskaini iraupen onargarria"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="2542822112725248683">"Hobetu telefonoaren bateriaren iraupena"</string>
@@ -2199,9 +2202,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Atzeko planoan exekutatu arren, baliteke aplikazio honek bateria erabiltzea. Horregatik, baliteke espero baino lehenago agortzea."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Kendu"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Utzi"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Aplikazioak ohiko bateria kopurua erabiltzen ari dira. Aplikazioek bateria gehiegi erabiltzen badute, gauzatu ahal dituzun ekintzak iradokitzen ditu telefonoak.\n\nBateria gutxi baduzu, bateria-aurrezlea aktibatzeko aukera duzu."</string>
-    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Aplikazioak ohiko bateria kopurua erabiltzen ari dira. Aplikazioek bateria gehiegi erabiltzen badute, gauzatu ahal dituzun ekintzak iradokitzen ditu tabletak.\n\nBateria gutxi baduzu, bateria-aurrezlea aktibatzeko aukera duzu."</string>
-    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Aplikazioak ohiko bateria kopurua erabiltzen ari dira. Aplikazioek bateria gehiegi erabiltzen badute, gauzatu ahal dituzun ekintzak iradokitzen ditu gailuak.\n\nBateria gutxi baduzu, bateria-aurrezlea aktibatzeko aukera duzu."</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Aplikazioak ohiko bateria kantitatea erabiltzen ari dira. Aplikazioek bateria gehiegi erabiltzen badute, gauzatu ahal dituzun ekintzak iradokitzen ditu telefonoak.\n\nBateria gutxi baduzu, bateria-aurrezlea aktibatzeko aukera duzu."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Aplikazioak ohiko bateria kantitatea erabiltzen ari dira. Aplikazioek bateria gehiegi erabiltzen badute, gauzatu ahal dituzun ekintzak iradokitzen ditu tabletak.\n\nBateria gutxi baduzu, bateria-aurrezlea aktibatzeko aukera duzu."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Aplikazioak ohiko bateria kantitatea erabiltzen ari dira. Aplikazioek bateria gehiegi erabiltzen badute, gauzatu ahal dituzun ekintzak iradokitzen ditu gailuak.\n\nBateria gutxi baduzu, bateria-aurrezlea aktibatzeko aukera duzu."</string>
     <string name="smart_battery_manager_title" msgid="870632749556793417">"Bateria-kudeatzailea"</string>
     <string name="smart_battery_title" msgid="6218785691872466076">"Kudeatu aplikazioak automatikoki"</string>
     <string name="smart_battery_summary" msgid="1339184602000004058">"Mugatu gutxi erabiltzen dituzun aplikazioen bateria-erabilera"</string>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Larrialdi-deien seinalea"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Ezarri larrialdi-deiak egitean izan beharreko portaera."</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Babeskopiak"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Aktibatuta"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Desaktibatuta"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Babeskopiak eta leheneratzea"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Datu pertsonalak"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Egin nire datuen babeskopia"</string>
@@ -2761,6 +2766,12 @@
       <item quantity="one">Ikusi ziurtagiria</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Erabiltzaile bat baino gehiago"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Erabiltzaileak eta profilak"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Gehitu erabiltzailea edo profila"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Gehitu erabiltzailea"</string>
@@ -2943,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"datuen erabilera"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"sare publikoa"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Konektatutako gailuak"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, gidatze modua, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, gidatze modua"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikazioak eta jakinarazpenak"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Baimenak, aplikazio lehenetsiak"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Kontuak"</string>
@@ -2967,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"abiarazlea, lehenetsia, aplikazioak"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ukipen-pantaila, pantaila"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"ilundu pantaila, ukipen-pantaila, bateria, distira"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"ilundu pantaila, ukipen-pantaila, bateria"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"ilundu pantaila, gaua, tindatua, gaueko txanda, distira, pantailaren kolorea, kolorea"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"atzeko planoa, pertsonalizatu, doitu pantaila"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"testuaren tamaina"</string>
@@ -3008,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"sarea, sare mugikorraren egoera, zerbitzuaren egoera, seinalearen indarra, sare mugikor mota, ibiltaritza, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"serie-zenbakia, hardwarearen bertsioa"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android segurtasunaren adabaki-maila, oinarri-bandaren bertsioa, kernelaren bertsioa"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Pantaila ilundua, pantaila blokeatuaren bistaratzea"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"hatz-marka"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"biratu, irauli, errotazioa, bertikala, horizontala, orientazioa"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"bertsio-berritu, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"ez molestatu, ordutegia, jakinarazpenak, blokeatu, isilik, dardara, inaktibo ezarri, lantokia, arreta, soinua, desaktibatu audioa, eguna, asteguna, asteburua, asteguneko gaua, gertaera"</string>
@@ -3092,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Baimendu seinale bisualak"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"\"Ez molestatu\" aktibatuta dagoenean"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Jakinarazpenak"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Erakutsi jakinarazpenak soinurik egin gabe"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Jakinarazpenen audioa eta dardara desaktibatuko dira"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Ez egin soinurik jakinarazpenak jasotzean"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Jakinarazpenak ikusiko dituzu pantailan"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Jakinarazpenak iristen direnean, telefonoak ez du egingo soinurik edo dardararik."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Ezkutatu jakinarazpenak"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Ez duzu ikusiko lehendik dagoen edo berria den jakinarazpenik"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Ez egin soinurik eta ez erakutsi ezer jakinarazpenak jasotzean"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Ez duzu ikusi edo entzungo jakinarazpenik"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Telefonoak ez ditu erakutsiko lehendik dauden edo berriak diren jakinarazpenak, eta ez du egingo soinurik edo dardararik. Ez da jakinarazpenik agertuko hatza goitik behera pasatzen duzunean.\n\nHala ere, telefonoaren jarduerekin eta egoerarekin erlazionatutako funtsezko jakinarazpenak agertuko dira."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Pertsonalizatua"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Gaitu ezarpen pertsonalizatua"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Kendu ezarpen pertsonalizatua"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Erakutsi"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Ez egin soinurik jakinarazpenak jasotzean"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Ezkutatu batzuk"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Ezkutatu guztiak"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Ez egin soinurik eta ez erakutsi ezer jakinarazpenak jasotzean"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Murrizketa pertsonalizatuak"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Pantaila piztuta dagoenean"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Pantaila itzalita dagoenean"</string>
@@ -3162,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Audioa eta dardara desaktibatuta, baina baimendu <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> eta <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mezuak, gertaerak eta abisuak"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"\"Ez molestatu\" modua aktibatuta dagoenean, mezu, abisu eta gertaeren audioa eta dardara desaktibatuta egongo dira, goian baimendutako elementuetan izan ezik. Ezarpenak alda ditzakezu lagunak, familia edo beste kontaktuak zurekin harremanetan jarri ahal daitezen."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Eginda"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Ezarpenak"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Ez egin soinurik eta ez erakutsi ezer jakinarazpenak jasotzean"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Ez egin soinurik jakinarazpenak jasotzean"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Ez duzu ikusi edo entzungo jakinarazpenik. Kontaktu izardunek eta berriro deitu dutenen deiak onartu egingo dira."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Uneko ezarpena)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"\"Ez molestatu\" moduaren jakinarazpen-ezarpenak aldatu nahi dituzu?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Laneko profilaren soinuak"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Erabili profil pertsonalaren soinuak"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Soinu berberak erabiltzen dira laneko profilean nahiz profil pertsonalean"</string>
@@ -3346,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Onartu deiak"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"\"Ez molestatu\" modua aktibatuta dagoenean, jasotako deiak blokeatzen dira. Ezarpenak alda ditzakezu lagunak, familia edo beste kontaktuak zurekin harremanetan jarri ahal daitezen."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Kontaktu izardunak"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">eta beste <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="one">eta beste bat</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mezuak"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Onartu mezuak"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Mezuak"</string>
@@ -3538,9 +3539,9 @@
     <string name="always_running" msgid="6042448320077429656">"Beti ari da exekutatzen (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
     <string name="sometimes_running" msgid="6611250683037700864">"Noizbehinka exekutatzen da (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
     <string name="rarely_running" msgid="348413460168817458">"Ez da ia inoiz exekutatzen (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
-    <string name="memory_max_use" msgid="6874803757715963097">"Gehienezkoa"</string>
+    <string name="memory_max_use" msgid="6874803757715963097">"Gehienekoa"</string>
     <string name="memory_avg_use" msgid="7382015389130622870">"Batez besteko erabilera"</string>
-    <string name="memory_max_desc" msgid="2861832149718335864">"Gehienezkoa: <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
+    <string name="memory_max_desc" msgid="2861832149718335864">"Gehienekoa: <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="memory_avg_desc" msgid="1551240906596518412">"Batez besteko erabilera: <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="memory_use_running_format" msgid="4172488041800743760">"<xliff:g id="MEMORY">%1$s</xliff:g> / <xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
@@ -3617,14 +3618,14 @@
     <string name="assist_flash_summary" msgid="9160668468824099262">"Egin distira pantailaren ertzetan laguntza-aplikazioak pantailako edo pantaila-argazkiko testua erabiltzen duenean"</string>
     <string name="assist_footer" msgid="1982791172085896864">"Laguntza-aplikazioek ikusten ari zaren pantailako informazioaren araberako laguntza eskain diezazukete. Zenbait aplikaziok abiarazlea eta ahots bidezko zerbitzuak onartzen dituzte laguntza integratua eskaintzeko."</string>
     <string name="average_memory_use" msgid="829566450150198512">"Batez best. memoria-erabilera"</string>
-    <string name="maximum_memory_use" msgid="7493720799710132496">"Gehienezko memoria-erabilera"</string>
+    <string name="maximum_memory_use" msgid="7493720799710132496">"Gehieneko memoria-erabilera"</string>
     <string name="memory_usage" msgid="1781358557214390033">"Memoriaren erabilera"</string>
     <string name="app_list_memory_use" msgid="6987417883876419338">"Aplikazioen erabilera"</string>
     <string name="memory_details" msgid="5943436005716991782">"Xehetasunak"</string>
     <string name="memory_use_summary" msgid="5608257211903075754">"Azken hiru orduetan <xliff:g id="SIZE">%1$s</xliff:g> erabili dira batez beste"</string>
     <string name="no_memory_use_summary" msgid="2016900536806235588">"Ez da memoriarik erabili azken hiru orduetan"</string>
     <string name="sort_avg_use" msgid="3998036180505143129">"Ordenatu batez besteko erabileraren arabera"</string>
-    <string name="sort_max_use" msgid="4629247978290075124">"Ordenatu gehienezko erabileraren arabera"</string>
+    <string name="sort_max_use" msgid="4629247978290075124">"Ordenatu gehieneko erabileraren arabera"</string>
     <string name="memory_performance" msgid="5661005192284103281">"Errendimendua"</string>
     <string name="total_memory" msgid="2017287600738630165">"Memoria, guztira"</string>
     <string name="average_used" msgid="5338339266517245782">"Batez best. erabilera (%)"</string>
@@ -3635,7 +3636,7 @@
       <item quantity="one">Aplikazio batek erabili du memoria (azken <xliff:g id="DURATION_0">%2$s</xliff:g>ak)</item>
     </plurals>
     <string name="running_frequency" msgid="6622624669948277693">"Maiztasuna"</string>
-    <string name="memory_maximum_usage" msgid="6513785462055278341">"Gehienezko erabilera"</string>
+    <string name="memory_maximum_usage" msgid="6513785462055278341">"Gehieneko erabilera"</string>
     <string name="no_data_usage" msgid="9131454024293628063">"Ez da erabili daturik"</string>
     <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"<xliff:g id="APP">%1$s</xliff:g> aplikazioari \"Ez molestatu\" egoerarako sarbidea baimendu nahi diozu?"</string>
     <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Aplikazioak \"Ez molestatu\" egoera aktibatu eta desaktibatu ahal izango du, eta horrekin erlazionatutako ezarpenetan aldaketak egin ahal izango ditu."</string>
@@ -3779,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Kolore hotzak"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Erabili kolore hotzagoak pantailan"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Kolorea aldatzeko, itzal ezazu pantaila"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Konexio-kontrolatzailea"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Konexio-kontrolatzaileak hautematen dituen konexio-arazoak erregistratuko ditu eta jakinarazpenak erakutsio dizkio erabiltzaileari akatsen berri eman dezan"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Konexio-kontrolatzailean egindako aldaketa aplikatzeko, berrabiarazi gailua"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameraren laser-sentsorea"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Erabili kamera logikoa modu lehenetsian"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Sistemaren eguneratze automatikoak"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Aplikatu eguneratzeak gailua berrabiaraztean"</string>
     <string name="usage" msgid="2977875522080448986">"Erabilera"</string>
@@ -3825,7 +3824,7 @@
     <string name="data_usage_title" msgid="3659356290392241789">"Datu nagusiak"</string>
     <string name="data_usage_wifi_title" msgid="7063659423081820720">"Wi‑Fi datuak"</string>
     <string name="data_used" msgid="5116389957228457203">"<xliff:g id="ID_1">^1</xliff:g> erabili dira"</string>
-    <string name="data_used_formatted" msgid="2989129931961311051">"<xliff:g id="ID_1">^1</xliff:g>/<xliff:g id="ID_2">^2</xliff:g> erabilita"</string>
+    <string name="data_used_formatted" msgid="2989129931961311051">"<xliff:g id="ID_1">^1</xliff:g> <xliff:g id="ID_2">^2</xliff:g> erabilita"</string>
     <string name="data_overusage" msgid="1134445012475270295">"Muga baino <xliff:g id="ID_1">^1</xliff:g> gehiago"</string>
     <string name="data_remaining" msgid="8998091725895502181">"<xliff:g id="ID_1">^1</xliff:g> gelditzen dira"</string>
     <plurals name="billing_cycle_days_left" formatted="false" msgid="456503215317213651">
@@ -4092,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Betetze automatikoaren zerbitzua"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"bete, automatikoki, betetze automatiko"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Ziurtatu aplikazioa fidagarria dela&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; eginbideak pantailan dagoena erabiltzen du automatikoki bete daitekeena zehazteko."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Gailuaren gaia"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Kolore-gaia"</string>
     <string name="default_theme" msgid="7085644992078579076">"Lehenetsia"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Gailuaren gaia"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automatikoa (horma-paperaren araberakoa)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Argia"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Iluna"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Sarearen izena"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Erakutsi sarearen izena egoera-barran"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Memoria-kudeatzailea: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4105,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operadorearen hornikuntza-informazioa"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Abiarazi operadorearen hornikuntza"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Eguneratu \"Ez molestatu\" modua"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Ezkutatu jakinarazpenak arreta ez galtzeko"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pausatu jakinarazpenak arreta ez galtzeko"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Zer berri dago?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Eman txango bat telefono berrian barrena"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Eman txango bat tableta berrian barrena"</string>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 1fa3f9a..d2f5bd9 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"همیشه روشن"</item>
     <item msgid="6385301106124765323">"همیشه خاموش"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index a8fff1d..410ae88 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"به رایانه لوحی‌تان اجازه دهید با دستگاه‌های بلوتوث اطراف مرتبط شود"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"به دستگاهتان اجازه دهید با دستگاه‌های بلوتوث اطراف مرتبط شود"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"به تلفنتان اجازه دهید با دستگاه‌های بلوتوث اطراف مرتبط شود"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"‏غیرفعال کردن انتقال داده ازطریق سخت‌افزار بلوتوث A2DP"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"دستگاه بازراه‌اندازی شود؟"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"برای تغییر این تنظیم، باید دستگاه را بازراه‌اندازی کنید"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"بازراه‌اندازی"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"لغو"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"دستگاه‌های رسانه موجود"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"دستگاه‌های برقراری تماس موجود"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"درحال‌حاضر متصل"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"اولویت‌های اتصال"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"دستگاه‌هایی که قبلاً متصل شده‌اند"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"قبلاً متصل‌شده"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"تاریخ و زمان"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"انتخاب منطقهٔ زمانی"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"درگاهی که وارد کردید معتبر نیست."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"‏این مرورگر از پروکسی HTTP استفاده می‌کند اما ممکن است برنامه‌های دیگر از آن استفاده نکنند."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"‏نشانی وب PAC: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"‏پهنای باند DL (کیلوبیت بر ثانیه):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"‏پهنای باند UL (کیلوبیت بر ثانیه):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"اطلاعات مکان شبکه همراه (منسوخ شده):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"اطلاعات شبکه همراه مجاور (منسوخ شده):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"‏پیکربندی کانال فیزیکی LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"نرخ بازخوانی اطلاعات شبکه همراه:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"همه اطلاعات اندازه‌گیری شبکه همراه:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"اطلاعات هم‌زمان اتصال داده:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"سرویس داده:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"رومینگ:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"روشنایی خودکار"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"بیدار شدن با بالا بردن"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"نمایشگر محیط"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"همیشه روشن / مصرف باتری افزایش‌یافته"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"اعلان‌های جدید"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"زمان نمایش دادن"</string>
     <string name="doze_title" msgid="2375510714460456687">"اعلان‌های جدید"</string>
     <string name="doze_summary" msgid="3846219936142814032">"روشن شدن صفحه‌نمایش هنگامی که اعلانی دریافت می‌کنید"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="other">کد پین سیم‌کارت اشتباه است، <xliff:g id="NUMBER_1">%d</xliff:g> بار دیگر می‌توانید تلاش کنید.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"عملیات پین سیم کارت ناموفق بود!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"وضعیت رایانهٔ لوحی"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"وضعیت تلفن"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"به‌روزرسانی‌های سیستم"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"‏نسخهٔ Android"</string>
@@ -2434,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"سیگنال شماره‌گیری اضطراری"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"واکنش موجود در هنگام برقراری تماس اضطراری را تنظیم کنید"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"پشتیبان‌گیری"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"روشن"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"خاموش"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"تهیهٔ نسخهٔ پشتیبان و بازیابی"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"اطلاعات شخصی"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"پشتیبان‌گیری از داده‌های من"</string>
@@ -2760,6 +2766,12 @@
       <item quantity="other">بررسی گواهی‌ها</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"چندین کاربر"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"کاربران و نمایه‌ها"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"افزودن کاربر یا نمایه"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"افزودن کاربر"</string>
@@ -2942,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"مصرف داده"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"نقطه اتصال"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"دستگاه‌های متصل"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"‏بلوتوث، حالت رانندگی، NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"بلوتوث، حالت رانندگی"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"‏بلوتوث، NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"بلوتوث"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"برنامه‌ها و اعلان‌ها"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"مجوزها، برنامه‌های پیش‌فرض"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"حساب‌ها"</string>
@@ -2966,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"راه‌انداز، پیش‌فرض، برنامه‌ها"</string>
     <string name="keywords_display" msgid="8910345814565493016">"صفحه، صفحه لمسی"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"صفحه کم‌نور، صفحه لمسی، باتری، روشن"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"صفحه کم نور، صفحه لمسی، باتری"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"صفحه کم‌نور، شب، رنگ‌مایه، شیفت شب، روشنایی، رنگ صفحه، رنگ، رنگ"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"پس‌زمینه، شخصی کردن، سفارشی کردن نمایشگر"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"اندازه نوشتار"</string>
@@ -3007,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"‏شبکه، وضعیت شبکه همراه، وضعیت سرویس، شدت سیگنال، نوع شبکه همراه، رومینگ، iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"شماره سریال، نسخه سخت‌افزار"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"‏سطح وصله امنیتی android، نسخه باند پایه، نسخه اصلی"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"نمایشگر محیطی. نمایشگر صفحه در حالت قفل"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"اثر انگشت"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"چرخاندن، چرخش، چرخش، پرتره، منظره، جهت، عمودی، افقی"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"‏ارتقا دادن، Android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"«مزاحم نشوید»، زمان‌بندی، اعلان‌ها، مسدود کردن، سکوت، لرزش، خواب، کار، کانونی کردن، صدا، صامت کردن، روز، روز هفته، آخر هفته، شب‌های طول هفته، رویداد"</string>
@@ -3091,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"مجاز کردن همه سیگنال‌های تصویری"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"وقتی «مزاحم نشوید» روشن باشد"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"اعلان‌ها"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"نمایش اعلان‌ به‌صورت بی‌صدا"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"اعلان‌ها صامت خواهند شد"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"بدون صدای اعلان‌ها"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"اعلان‌ها را روی صفحه‌تان خواهید دید"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"هنگام دریافت اعلان‌، تلفنتان صدا نمی‌دهد یا نمی‌لرزد."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"پنهان کردن اعلان‌ها"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"اعلان‌های جدید یا موجود را نخواهید دید"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"بدون تصویر یا صدای اعلان‌ها"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"اعلان‌ها را نخواهید دید یا صدایشان را نخواهید شنید."</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"تلفنتان اعلان‌های جدید یا موجود را نشان نخواهد داد و صدا یا لرزشی ایجاد نخواهد کرد. وقتی صفحه را از بالا به پایین تند می‌کشید، اعلان‌ها نشان داده نخواهند شد.\n\nبه خاطر داشته باشید که اعلان‌های مهم مربوط به فعالیت و وضعیت تلفن همچنان نشان داده می‌شوند."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"سفارشی"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"فعال کردن تنظیم سفارشی"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"حذف تنظیم سفارشی"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"نشان داده خواهد شد"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"بدون صدای اعلان‌ها"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"تا‌حدی پنهان"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"پنهان"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"بدون تصویر یا صدای اعلان‌ها"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"محدودیت‌های سفارشی"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"وقتی صفحه‌نمایش روشن است"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"وقتی صفحه‌نمایش خاموش است"</string>
@@ -3161,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"صامت شده است، اما <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>، <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> و <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> را مجاز کنید"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"پیام‌ها، رویدادها و یادآوری‌ها"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"وقتی «مزاحم نشوید» روشن است، به‌جز مواردی که در بالا مجاز می‌کنید، پیام‌ها، یادآوری‌ها و رویدادها صامت می‌شوند. می‌توانید تنظیمات پیام را به‌گونه‌ای انجام دهید که دوستانتان، خانواده یا سایر مخاطبین بتوانند به شما دسترسی پیدا کنند."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"تمام"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"تنظیمات"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"بدون تصویر یا صدای اعلان‌ها"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"بدون صدای اعلان‌ها"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"دیگر اعلان‌ها را نخواهید دید یا شنید. تماس‌های مخاطبین ستاره‌دار و تماس‌گیرنده‌های تکراری مجاز هستند."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(تنظیم فعلی)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"تنظیمات اعلان «مزاحم نشوید» تغییر کند؟"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"صداهای نمایه کاری"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"استفاده از صداهای نمایه شخصی"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"صداهای نمایه کاری‌ و شخصی‌تان یکسان هستند"</string>
@@ -3345,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"اجازه دادن به تماس‌های تلفنی"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"وقتی «مزاحم نشوید» روشن است، تماس‌های ورودی مسدود می‌شوند. می‌توانید تنظیماتتان را به‌گونه‌ای انجام دهید که دوستانتان، خانواده یا سایر مخاطبین بتوانند به شما دسترسی پیدا کنند."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"مخاطبین ستاره‌دار"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">و <xliff:g id="NUM_PEOPLE">%d</xliff:g> نفر دیگر</item>
-      <item quantity="other">و <xliff:g id="NUM_PEOPLE">%d</xliff:g> نفر دیگر</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"پیام‌ها"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"اجازه دادن به پیام‌ها"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"پیام‌ها"</string>
@@ -3778,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"دمای رنگ سرد"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"استفاده از رنگ‌های سردتر نمایشگر"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"برای اعمال تغییر رنگ، صفحه را خاموش کنید"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"پایشگر اتصال"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"‏وقتی ConnectivityMonitor مشکل اتصالی را تشخیص می‌دهد گزارش‌هایی جمع‌آوری می‌کند و ازطریق اعلان از کاربر می‌خواهد گزارش اشکال تهیه کند"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"برای اعمال تغییر پایشگر اتصال، دستگاه را راه‌اندازی مجدد کنید"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"حسگر لیزری دوربین"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"تنظیم دوربین مجازی به‌عنوان پیش‌فرض"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"به‌روزرسانی‌های خودکار سیستم"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"وقتی دستگاه راه‌اندازی مجدد می‌شود، به‌روزرسانی‌ها اعمال شود"</string>
     <string name="usage" msgid="2977875522080448986">"میزان مصرف"</string>
@@ -4091,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"سرویس تکمیل خودکار"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"خودکار، پر کردن، تکمیل خودکار"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"‏&lt;b&gt;مطمئن شوید به این برنامه اطمینان دارید&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=تکمیل خودکار Google&gt;%1$s&lt;/xliff:g&gt; برای تعیین مواردی که می‌توانند به‌طور خودکار تکمیل شوند، از آنچه روی صفحه‌نمایش شما است استفاده می‌کند."</string>
-    <string name="device_theme" msgid="4571803018917608588">"طرح زمینه دستگاه"</string>
+    <string name="color_theme" msgid="1535685696756738324">"طرح‌ زمینه‌ رنگی"</string>
     <string name="default_theme" msgid="7085644992078579076">"پیش‌فرض"</string>
+    <string name="device_theme" msgid="4571803018917608588">"طرح زمینه دستگاه"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"خودکار (براساس کاغذدیواری)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"روشن"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"تیره"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"نام شبکه"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"نمایش نام شبکه در نوار وضعیت"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"مدیریت حافظه: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4104,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"اطلاعات ارائه شرکت مخابراتی"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"شروع ارائه شرکت مخابراتی"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"به‌روزرسانی «مزاحم نشوید»"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"پنهان کردن اعلان‌ها برای متمرکز ماندن"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"توقف موقت اعلان‌ها برای متمرکز ماندن"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"چه مواردی جدید و هیجان‌انگیز هستند؟"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"در تلفن جدیدتان گشتی بزنید"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"در رایانه لوحی جدیدتان گشتی بزنید"</string>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index b36d173..71ba8b8 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Aina käytössä"</item>
     <item msgid="6385301106124765323">"Aina pois"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index b545a38..7d364c6 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Anna tabletin viestiä lähellä olevien Bluetooth-laitteiden kanssa"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Anna laitteen viestiä lähellä olevien Bluetooth-laitteiden kanssa"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Anna puhelimen viestiä lähellä olevien Bluetooth-laitteiden kanssa"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Poista käytöstä Bluetooth A2DP ‑laitteiston lähetys"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Käynnistä uudelleen?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Laite on käynnistettävä uudelleen asetuksen muuttamiseksi."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Käyn. uud."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Peruuta"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Käytettävissä olevat medialaitteet"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Käytettävissä olevat soittolaitteet"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Yhdistetty tällä hetkellä"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Yhteysasetukset"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Aiemmin liitetyt laitteet"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Aiemmin liitetyt"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Päivämäärä ja aika"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Valitse aikavyöhyke"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Antamasi portti on virheellinen."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Selain saa käyttää HTTP-välityspalvelinta mutta muut sovellukset eivät."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"Välitysp. aut. määr. URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL-kaistanleveys (kt/s):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL-kaistanleveys (kt/s):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Matkapuhelimen sijaintitiedot (poistettu käytöstä):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Lähellä olevan matkapuhelimen tiedot (poistettu käytöstä):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Fyysisen LTE-kanavan kokoonpano:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Matkapuhelintietojen päivitysaikaväli:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Matkapuhelimen kaikki mittaustiedot:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Tiedonsiirtoyhteyden reaaliaikaiset tiedot:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Datapalvelu:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI-koodi:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automaattinen kirkkaus"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Herätä nostamalla"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Himmennetty näyttö"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Aina käytössä / lisää akun käyttöä"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Uudet ilmoitukset"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Näyttämisaika"</string>
     <string name="doze_title" msgid="2375510714460456687">"Uudet ilmoitukset"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Aktivoi näyttö, kun saat ilmoituksia."</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">Virheellinen SIM-kortin PIN-koodi. Sinulla on <xliff:g id="NUMBER_0">%d</xliff:g> yritys jäljellä, ennen kuin sinun on otettava yhteyttä operaattoriin laitteen lukituksen avaamiseksi.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM-kortin PIN-toiminto epäonnistui!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tablet-laitteen tila"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Puhelimen tila"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Järjestelmäpäivitykset"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android-versio"</string>
@@ -2434,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Hätäpuhelun äänimerkki"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Aseta toiminta hätäpuhelun tapauksessa"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Varmuuskopioi"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Käytössä"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Ei käytössä"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Varmuuskopiointi &amp; palautus"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Henkilötiedot"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Tietojen varmuuskopiointi"</string>
@@ -2760,6 +2766,12 @@
       <item quantity="one">Tarkista varmenne</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Useita käyttäjiä"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Käyttäjät ja profiilit"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Lisää käyttäjä tai profiili"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Lisää käyttäjä"</string>
@@ -2942,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"datan käyttö"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Yhdistetyt laitteet"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, ajotila, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, ajotila"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Sovellukset ja ilmoitukset"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Käyttöoikeudet, oletussovellukset"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Tilit"</string>
@@ -2966,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"käynnistysohjelma, oletus, sovellukset"</string>
     <string name="keywords_display" msgid="8910345814565493016">"näyttö, kosketusnäyttö"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"himmeä näyttö, kosketusnäyttö, akku, kirkas"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"näytön himmennys, kosketusnäyttö, akku"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"himmeä näyttö, yö, sävytys, yötila, kirkkaus, näytön väri, väri, värit"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"tausta, räätälöidä, näytön muokkaaminen"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tekstin koko"</string>
@@ -3007,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"verkko, mobiiliverkon tila, yhteyden tila, signaalinvoimakkuus, mobiiliverkon tyyppi, verkkovierailu, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"sarjanumero, laitteistoversio"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android-tietoturvakorjauksen taso, baseband-versio, kernel-versio"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Lepotilanäyttö, lukitusnäyttö"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"sormenjälki"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"kiertää, kääntää, kääntäminen, pystysuunta, vaakasuunta, suunta, pystysuorassa, vaakasuorassa"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"päivitä, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"älä häiritse, aikataulu, ilmoitukset, estä, hiljennä, värinä, nukkuminen, työnteko, keskittyminen, äänet, mykistä, päivä, arkipäivä, viikonloppu, arki-ilta, tapahtuma"</string>
@@ -3091,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Salli visuaaliset signaalit"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Kun älä häiritse ‑tila on käytössä"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Ilmoitukset"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Näytä ilmoitukset hiljennettyinä"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Ilmoitukset mykistetään"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Ei ilmoitusääniä"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Näet ilmoituksia näytöllä"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Puhelin ei anna äänimerkkiä eikä värise ilmoituksen saapuessa."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Piilota ilmoitukset"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Uusia tai nykyisiä ilmoituksia ei näytetä"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Ei ilmoitusgrafiikoita tai ‑ääntä"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Et näe tai kuule ilmoituksia"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Kun älä häiritse ‑tila on käytössä, et näe puhelimen uusia tai nykyisiä ilmoituksia tai saa niistä äänimerkkiä tai värinää. Niitä ei näytetä, kun pyyhkäiset näytön ylälaidasta alaspäin.\n\nTärkeät puhelimen perustoimintojen ja ‑tilan ilmoitukset näytetään silti."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Oma"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Ota oma asetus käyttöön"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Poista oma asetus"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Näytetään"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Ei ilmoitusääniä"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Osittain piilotettu"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Piilotettu"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Ei ilmoitusgrafiikoita tai ‑ääntä"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Omat rajoitukset"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Kun näyttö on päällä"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Kun näyttö on pois päältä"</string>
@@ -3161,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Mykistä, salli <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> ja <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Viestit, tapahtumat ja muistutukset"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Älä häiritse ‑tilassa viestit, muistutukset ja tapahtumat mykistetään yllä määritettyjä poikkeuksia lukuun ottamatta. Voit määrittää viestiasetukset niin, että ystävät, perheenjäsenet tai muut yhteyshenkilöt saavat sinuun yhteyden."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Valmis"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Asetukset"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Ei ilmoitusgrafiikoita tai ‑ääntä"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Ei ilmoitusääniä"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Et näe tai kuule ilmoituksia. Tähdellä merkityiltä yhteyshenkilöiltä ja toistuvilta soittajilta tulevat puhelut sallitaan."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(nykyinen asetus)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Muutetaanko Älä häiritse ‑ilmoitusasetuksia?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Työprofiilin äänet"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Käytä henk. koht. prof. ääniä"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Työ- ja henkilökohtaisessa profiilissa käytetään samoja ääniä."</string>
@@ -3345,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Salli puhelut"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Saapuvat puhelut estetään Älä häiritse ‑tilassa. Voit määrittää asetukset niin, että ystävät, perheenjäsenet tai muut yhteyshenkilöt saavat sinuun yhteyden."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Tähdelliset yhteystiedot"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">ja <xliff:g id="NUM_PEOPLE">%d</xliff:g> muuta</item>
-      <item quantity="one">ja 1 muu</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Viestit"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Salli viestit"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Viestit"</string>
@@ -3778,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Viileä värilämpötila"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Käytä viileämpiä värilämpötiloja"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Ota värin muutos käyttöön sammuttamalla näyttö."</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Yhteysseuranta"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Yhteysseuranta kerää lokitietoja yhteysvirheistä ja kehottaa käyttäjää tekemään virheilmoituksen."</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Käynnistä laite uudelleen, jotta yhteysseurannan muutokset astuvat voimaan."</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameran laseranturi"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Looginen kamera oletuksena"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automaattiset järjestelmäpäivitykset"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Päivitä, kun laite käynnistyy uudelleen."</string>
     <string name="usage" msgid="2977875522080448986">"Käyttö"</string>
@@ -4091,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Automaattinen täyttö ‑palvelu"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automaattinen, täyttää, automaattinen täyttö"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Varmista, että luotat tähän sovellukseen&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; päättelee näytöllä olevien kohteiden perusteella, mitä voidaan täyttää automaattisesti."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Laitteen teema"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Väriteema"</string>
     <string name="default_theme" msgid="7085644992078579076">"Oletus"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Laitteen teema"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automaattinen (perustuu taustakuvaan)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Vaalea"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Tumma"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Verkon nimi"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Näytä verkon nimi tilapalkissa"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Tallennustilan hallinta: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4104,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operaattorin hallintatiedot"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Ota operaattorin hallinta käyttöön"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Päivitä Älä häiritse ‑tila"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Piilota ilmoitukset, jotta voit keskittyä."</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Keskeytä ilmoitukset, jotta voit keskittyä"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Uutta"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Tutustu uuteen puhelimeesi"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Tutustu uuteen tablettiisi"</string>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index ea2b458..81f846c 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Toujours activé"</item>
     <item msgid="6385301106124765323">"Toujours désactivé"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index bc0d8eb..4e46b6d 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Permettre à votre tablette de communiquer avec les appareils Bluetooth à proximité"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Permettre à votre appareil de communiquer avec les appareils Bluetooth à proximité"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Permettre à votre téléphone de communiquer avec les appareils Bluetooth à proximité"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Désactiver déchargement Bluetooth A2DP"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Redémarrer l\'appareil?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Vous devez redémarrer votre appareil pour modifier ce param."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Redémarrer"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Annuler"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Appareils multimédias disponibles"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Appareils d\'appels accessibles"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Actuellement connecté"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Préférences de connexion"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Appareils précédemment connectés"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Connecté précedemment"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Date et heure"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Sélectionner le fuseau horaire"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Le port indiqué n\'est pas valide."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Le serveur mandataire HTTP est utilisé par le navigateur, mais ne peut pas l\'être par les autres applications."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"URL config. auto mand. : "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Bande passante de téléchargement (kb/s) :"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Bande passante de téléversement (kb/s) :"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Données de la position de la cellule (discontinuées) :"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Données de la cellule voisine (discontinuées) :"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Configuration du canal physique LTE :"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Taux d\'actualisation des données de la cellule :"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Données des mesures de toutes les cellules :"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Données en temps réel de la connexion de données :"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Service de données :"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Itinérance :"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"Code IIEM :"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Ajuster automatiquement la luminosité"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Soulever pour activer"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Affichage en mode Veille"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Toujours activé / Utilisation accrue de la pile"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nouvelles notifications"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Activation du mode Veille"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nouvelles notifications"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Activer l\'écran lorsque vous recevez des notifications"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="other">Le NIP de la carte SIM incorrect. Il vous reste <xliff:g id="NUMBER_1">%d</xliff:g> tentatives.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Le déverrouillage par NIP de carte SIM a échoué."</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"État de la tablette"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"État du téléphone"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Mises à jour du système"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Version d\'Android"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Impossible de restreindre l\'utilisation en arrière-plan"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Limiter l\'activité en arrière-plan?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Si vous limitez l\'activité en arrière-plan d\'une application, cela peut provoquer un fonctionnement instable"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Comme cette appli n\'est pas config. pour optim. la pile, vous ne pouvez pas la restr.\n\nPour la restr., activez l\'optim. de pile."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Utilisation de l\'écran depuis la charge complète"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consommation d\'énergie de l\'écran"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Recherche de réseaux cellulaires"</string>
@@ -2168,8 +2171,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"La tablette a été sollicitée plus que d\'habitude"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"L\'appareil a été sollicité plus que d\'habitude"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"La pile sera bientôt épuisée"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7001932078713215338">"Votre téléphone a été sollicité plus que d\'habitude. Sa pile pourrait s\'épuiser plus rapidement que prévu.\n\nVoici les <xliff:g id="NUMBER">%1$d</xliff:g> applications qui ont utilisé le plus d\'énergie depuis la dernière recharge :"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="8482296786233647690">"Votre tablette a été sollicitée plus que d\'habitude. Sa pile pourrait s\'épuiser plus rapidement que prévu.\n\nVoici les <xliff:g id="NUMBER">%1$d</xliff:g> applications qui ont utilisé le plus d\'énergie depuis la dernière recharge :"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="7001932078713215338">"Votre téléphone a été sollicité plus que d\'habitude. Sa pile pourrait s\'épuiser plus rapidement que prévu.\n\nVoici les <xliff:g id="NUMBER">%1$d</xliff:g> applications qui ont utilisé le plus d\'énergie depuis la dernière recharge :"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="8482296786233647690">"Votre tablette a été sollicitée plus que d\'habitude. Sa pile pourrait s\'épuiser plus rapidement que prévu.\n\nVoici les <xliff:g id="NUMBER">%1$d</xliff:g> applications qui ont utilisé le plus d\'énergie depuis la dernière recharge :"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2806861679225286129">"Votre appareil a été sollicité plus que d\'habitude. Sa pile pourrait s\'épuiser plus rapidement que prévu.\n\nVoici les <xliff:g id="NUMBER">%1$d</xliff:g> applications qui ont utilisé le plus d\'énergie depuis la dernière recharge :"</string>
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="one">Restreindre %1$d application</item>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Signal de composition d\'urgence"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Définir le comportement en cas d\'appel d\'urgence"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Sauvegarde"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Activé"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Désactivé"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Sauvegarde et restauration"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Données personnelles"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Sauvegarder mes données"</string>
@@ -2761,6 +2766,12 @@
       <item quantity="other">Vérifier les certificats</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Plusieurs utilisateurs"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Utilisateurs et profils"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Ajouter un utilisateur ou un profil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Ajouter un utilisateur"</string>
@@ -2943,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"utilisation de données"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"point d\'accès sans fil"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Appareils connectés"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, mode Voiture, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, mode Voiture"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Applis et notifications"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Autorisations, applications par défaut"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Comptes"</string>
@@ -2967,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"lanceur, par défaut, applications"</string>
     <string name="keywords_display" msgid="8910345814565493016">"écran, tactile"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"assombrir l\'écran, écran tactile, pile, lumineux"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"assombrir l\'écran, écran tactile, pile"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"assombrir l\'écran, nuit, teinte, heures de nuit, luminosité, couleur de l\'écran, couleur, couleurs"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"fond d\'écran, personnaliser, personnaliser affichage"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"taille du texte"</string>
@@ -3008,8 +3014,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"réseau, état du réseau cellulaire, état du service, puissance du signal, type de réseau cellulaire, itinérance, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"numéro de série, version matérielle"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"niveau du correctif de sécurité android, version de la bande de base, version du noyau"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Affichage en mode Veille, écran de verrouillage"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"empreintes digitales"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"réduire la luminosité de l\'écran, écran tactile, pile, réglage intelligent de la luminosité, luminosité dynamique"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"faire pivoter, tourner, retourner, rotation, portrait, paysage, orientation, vertical, horizontal"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"mise à niveau, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"ne pas déranger, horaire, notifications, bloquer, silence, vibrer, dormir, travailler, se concentrer, son, muet, jour, jour de semaine, fin de semaine, soir de semaine, événement"</string>
@@ -3092,18 +3101,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Autoriser les signaux visuels"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Lorsque le mode Ne pas déranger est activé"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notifications"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Afficher les notifications en mode silencieux"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Les notifications seront interrompues"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Aucun son des notifications"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Vous verrez des notifications sur l\'écran"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Lorsque de nouvelles notifications arrivent, votre téléphone n\'émettra aucun son et ne vibrera pas."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Masquer les notifications"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Aucune notification (nouvelle ou existante) n\'est visible"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Aucun élément visuel ni son provenant des notifications"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Vous ne verrez et n\'entendrez pas de notifications"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Aucune notification (nouvelle ou existante) n\'est visible. Le téléphone n\'émet aucun son et ne vibre pas. Aucune notification ne s\'affiche lorsque vous balayez l\'écran vers le bas.\n\nÀ titre de rappel, les notifications nécessaires pour l\'activité du téléphone et son état s\'afficheront toujours."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Personnalisés"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Activer les paramètres personnalisés"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Supprimer les paramètres personnalisés"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Afficher"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Aucun son des notifications"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Partiellement masquées"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Masquées"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Aucun élément visuel ni son provenant des notifications"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Restrictions personnalisées"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Lorsque l\'écran est allumé"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Lorsque l\'écran est éteint"</string>
@@ -3162,19 +3171,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Désactivés, mais autoriser : <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> et <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Messages, événements et rappels"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Lorsque le mode Ne pas déranger est activé, le son des messages, des rappels et des événements est coupé, sauf pour les éléments autorisés ci-dessus. Vous pouvez régler les paramètres des messages pour que vos proches ou d\'autres contacts puissent quand même vous joindre."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"OK"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Paramètres"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Aucun élément visuel ni son provenant des notifications"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Aucun son des notifications"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Vous ne verrez et n\'entendrez pas de notifications. Les appels des contacts marqués d\'une étoile et les appels répétés sont autorisés."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Paramètre actuel)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Modifier les paramètres de notification du mode Ne pas déranger?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Sons du profil professionnel"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Utiliser sons du profil perso"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Les sons du profil professionnel sont les mêmes que ceux du profil personnel"</string>
@@ -3214,10 +3217,10 @@
     <string name="notification_importance_title" msgid="4368578960344731828">"Comportement"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"Autoriser le son"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Ne jamais afficher les notifications"</string>
-    <string name="notification_importance_min" msgid="9054819132085066824">"Afficher silencieusement et réduire"</string>
+    <string name="notification_importance_min" msgid="9054819132085066824">"Affichage silencieux et réduction"</string>
     <string name="notification_importance_low" msgid="2445139943005315690">"Affichage silencieux"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Émettre un son"</string>
-    <string name="notification_importance_high" msgid="2082429479238228527">"Émettre un son et s\'afficher à l\'écran"</string>
+    <string name="notification_importance_high" msgid="2082429479238228527">"Alerte sonore et affichage à l\'écran"</string>
     <string name="notification_importance_high_silent" msgid="2667033773703765252">"Afficher sur l\'écran"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Faible"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Moyenne"</string>
@@ -3346,10 +3349,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Autoriser les appels"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Lorsque le mode Ne pas déranger est activé, les appels entrants sont bloqués. Vous pouvez régler les paramètres pour permettre à vos amis, à votre famille ou à d\'autres contacts de vous joindre."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Contacts marqués d\'une étoile"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">et <xliff:g id="NUM_PEOPLE">%d</xliff:g> autre personne</item>
-      <item quantity="other">et <xliff:g id="NUM_PEOPLE">%d</xliff:g> autres personnes</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messages"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Autoriser les messages"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Messages"</string>
@@ -3779,10 +3779,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Température des couleurs froides"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utiliser des couleurs plus froides à l\'écran"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Pour appliquer la modification des couleurs, éteignez l\'écran"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"ConnectivityMonitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor recueille des journaux lorsqu\'il détecte un problème lié à la connectivité, puis invite l\'utilisateur à soumettre un bogue."</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Pour appliquer les changements de ConnectivityMonitor, redémarrez l\'appareil"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Capteur laser de l\'appareil photo"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Utiliser l\'appareil photo logique par défaut"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Mises à jour automatiques du système"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Appliquer les mises à jour au redémarrage de l\'appareil"</string>
     <string name="usage" msgid="2977875522080448986">"Utilisation"</string>
@@ -4092,8 +4090,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Service de remplissage auto"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatique, remplir, remplissage automatique"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Assurez-vous de faire confiance à cette application&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Remplissage automatique&gt;%1$s&lt;/xliff:g&gt; utilise les éléments affichés à l\'écran pour déterminer les champs qui peuvent bénéficier de l\'entrée automatique."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Thème de l\'appareil"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Thème de couleurs"</string>
     <string name="default_theme" msgid="7085644992078579076">"Par défaut"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Thème de l\'appareil"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automatique (selon l\'image de fond d\'écran)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Clair"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Sombre"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Nom du réseau"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Afficher le nom du réseau dans la barre d\'état"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gestionnaire de stockage : <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4105,7 +4107,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Données d\'approvisionnement du fournisseur de services"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Déclencher l\'approvisionnement du fournisseur de services"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Mettre à jour les paramètres du mode Ne pas déranger"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Masquer les notifications pour rester concentré"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Suspendre les notifications pour rester concentré"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Quelles sont les nouveautés toutes chaudes?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Découvrez votre nouveau téléphone"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Découvrez votre nouvelle tablette"</string>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 608f3d4..dbe6690 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Toujours activé"</item>
     <item msgid="6385301106124765323">"Toujours désactivé"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 2957932..1562a77 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Autoriser la tablette à communiquer avec les appareils Bluetooth à proximité"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Autoriser l\'appareil à communiquer avec les appareils Bluetooth à proximité"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Autoriser le téléphone à communiquer avec les appareils Bluetooth à proximité"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Désactiver déchargement Bluetooth A2DP"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Redémarrer ?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Vous devez redémarrer l\'appareil pour modifier ce paramètre."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Redémarrer"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Annuler"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Périphériques multimédias disponibles"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Périphériques d\'appel disponibles"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Actuellement connecté"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Préférences de connexion"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Appareils connectés précédemment"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Connecté précedemment"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Date et heure"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Sélectionner le fuseau horaire"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Le port indiqué n\'est pas valide."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Le proxy HTTP est utilisé par le navigateur, mais ne peut pas l\'être par les autres applications."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"URL config. auto proxy : "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Bande passante de téléchargement (kbit/s) :"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Bande passante d\'importation (kbit/s) :"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Informations de géolocalisation mobiles (obsolètes) :"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Informations mobiles voisines (obsolètes) :"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Configuration de la chaîne physique LTE :"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Fréquence d\'actualisation des informations mobiles :"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Toutes les informations mobiles liées aux mesures :"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Informations en temps réel sur la connexion de données :"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Service de données :"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Itinérance :"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"Code IMEI :"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Ajuster automatiquement la luminosité"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Soulever pour activer"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Affichage en mode Veille"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Toujours activé/Batterie davantage sollicitée"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nouvelles notifications"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Activation du mode Veille"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nouvelles notifications"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Activer l\'écran lors de la réception de notifications"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="other">Code PIN de la carte SIM erroné. Il vous reste <xliff:g id="NUMBER_1">%d</xliff:g> tentatives.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Échec du déverrouillage à l\'aide du code PIN de la carte SIM."</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"État de la tablette"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"État du téléphone"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Mises à jour du système"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Version d\'Android"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"L\'utilisation en arrière-plan ne peut pas être restreinte"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Limiter l\'activité en arrière-plan ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Si vous limitez l\'activité en arrière-plan d\'une application, cela peut provoquer son dysfonctionnement"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Cette appli n\'étant pas configurée pour optimiser batterie, vous ne pouvez pas la limiter.\n\nActivez optimisation batterie."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Utilisation de l\'écran depuis la dernière charge complète"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consommation d\'énergie de l\'écran"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Recherche de réseaux mobiles"</string>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Signal de numérotation d\'urgence"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Définir le comportement en cas d\'appel d\'urgence"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Sauvegarde"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Activée"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Désactivée"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Sauvegarde et restauration"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Données personnelles"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Sauvegarder mes données"</string>
@@ -2761,6 +2766,12 @@
       <item quantity="other">Vérifier les certificats</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Utilisateurs multiples"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Utilisateurs et profils"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Ajouter un utilisateur ou un profil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Ajouter un utilisateur"</string>
@@ -2943,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"conso. des données"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"point d\'accès"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Appareils connectés"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, mode Voiture, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, mode Voiture"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Applis et notifications"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Autorisations, applications par défaut"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Comptes"</string>
@@ -2967,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"lanceur d\'applications, par défaut, applications"</string>
     <string name="keywords_display" msgid="8910345814565493016">"écran, écran tactile"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"assombrir l\'écran, écran tactile, batterie, luminosité"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"assombrir l\'écran, écran tactile, batterie"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"assombrir l\'écran, nuit, coloration, mode nocturne, luminosité, couleur d\'écran, couleur, couleurs"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"arrière-plan, personnalisé, personnaliser écran"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"taille du texte"</string>
@@ -3008,8 +3014,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"réseau, état du réseau mobile, état du service, force du signal, type de réseau mobile, roaming, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"numéro de série, version logicielle"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"mise à jour du correctif de sécurité Android, version de bande de base, version de noyau"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"affichage en mode veille, affichage de l\'écran de verrouillage"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"empreinte digitale"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"réduire la luminosité de l\'écran, écran tactile, batterie, réglage intelligent de la luminosité, luminosité dynamique"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"faire pivoter, inverser, rotation, portrait, paysage, orientation, vertical, horizontal"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"mettre à jour, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"ne pas déranger, calendrier, notifications, bloquer, silence, vibreur, veille, travail, sélectionner, son, couper le son, jour, jour de semaine, week-end, soir de semaine, événement"</string>
@@ -3092,18 +3101,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Autoriser les signaux visuels"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Lorsque le mode Ne pas déranger est activé"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notifications"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Afficher les notifications en mode silencieux"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Son coupé pour les notifications"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Aucune notification sonore"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Des notifications s\'afficheront à l\'écran"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"À la réception de notifications, votre téléphone n\'émet aucun son et ne vibre pas."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Masquer les notifications"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Aucune notification (nouvelle ou existante) n\'est visible"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Aucune notification visuelle ni sonore"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Vous ne recevrez aucune notification visuelle ni sonore"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Aucune notification (nouvelle ou existante) n\'est visible. Le téléphone n\'émet aucun son et ne vibre pas. Aucune notification ne s\'affiche lorsque vous balayez l\'écran vers le bas.\n\nLes notifications nécessaires pour l\'activité du téléphone et son état sont toujours affichées."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Personnalisés"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Activer le paramètre personnalisé"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Supprimer le paramètre personnalisé"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Affichées"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Aucune notification sonore"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Partiellement masquées"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Masquées"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Aucune notification visuelle ni sonore"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Restrictions personnalisées"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Lorsque l\'écran est allumé"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Lorsque l\'écran est éteint"</string>
@@ -3162,19 +3171,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Son coupé, sauf pour les <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> et <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Messages, événements et rappels"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Lorsque le mode Ne pas déranger est activé, le son des messages, des rappels et des événements est coupé, sauf pour les éléments autorisés ci-dessus. Vous pouvez ajuster les paramètres des messages pour que vos proches ou d\'autres contacts puissent quand même vous joindre."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"OK"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Paramètres"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Aucune notification visuelle ni sonore"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Aucune notification sonore"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Vous ne recevrez aucune notification visuelle ni sonore. Les appels de vos contacts favoris et des appelants fréquents seront autorisés."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Paramètre actuel)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Modifier les paramètres de notification du mode Ne pas déranger ?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Sons du profil professionnel"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Utiliser sons du profil perso"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Les sons des profils professionnel et personnel sont identiques"</string>
@@ -3346,10 +3349,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Autoriser les appels"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Lorsque le mode Ne pas déranger est activé, les appels entrants sont bloqués. Vous pouvez ajuster les paramètres pour que vos proches ou d\'autres contacts puissent quand même vous joindre."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Contacts favoris"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">et <xliff:g id="NUM_PEOPLE">%d</xliff:g> autre</item>
-      <item quantity="other">et <xliff:g id="NUM_PEOPLE">%d</xliff:g> autres</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messages"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Autoriser les messages"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Messages"</string>
@@ -3779,10 +3779,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Température des couleurs froides"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utiliser des couleurs plus froides à l\'écran"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Pour appliquer la modification des couleurs, éteignez l\'écran."</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"ConnectivityMonitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor recueille des journaux lorsqu\'il détecte un problème de connectivité, puis invite l\'utilisateur à créer un bug"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Pour appliquer la modification effectuée par ConnectivityMonitor, redémarrez l\'appareil"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Capteur du laser de l\'appareil photo"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Caméra logique par défaut"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Mises à jour automatiques du système"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Appliquer les mises à jour au démarrage de l\'appareil"</string>
     <string name="usage" msgid="2977875522080448986">"Consommation"</string>
@@ -4092,8 +4090,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Service de saisie automatique"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatique, saisie, saisie automatique"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Assurez-vous de faire confiance à cette application&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; utilise les éléments affichés à l\'écran pour déterminer les champs qui peuvent bénéficier de la saisie automatique."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Thème de l\'appareil"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Palette de couleurs"</string>
     <string name="default_theme" msgid="7085644992078579076">"Par défaut"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Thème de l\'appareil"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automatique (en fonction du fond d\'écran)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Clair"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Foncé"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Nom du réseau"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Afficher le nom du réseau dans la barre d\'état"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gestionnaire d\'espace de stockage : <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4105,7 +4107,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informations de gestion des comptes opérateur"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Déclencher la gestion des comptes opérateur"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Mettre à jour le mode Ne pas déranger"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Masquer les notifications pour rester concentré"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Suspendre les notifications pour rester concentré"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Nouveautés à découvrir"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Découvrez votre nouveau téléphone"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Découvrez votre nouvelle tablette"</string>
diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml
index bc34d84..6837afb 100644
--- a/res/values-gl/arrays.xml
+++ b/res/values-gl/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Sempre activado"</item>
     <item msgid="6385301106124765323">"Sempre desactivado"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 3c0e888..f917850 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Permite que a tableta se comunique cos dispositivos Bluetooth próximos"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Permite que o dispositivo se comunique cos dispositivos Bluetooth próximos"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Permite que o teléfono se comunique cos dispositivos Bluetooth próximos"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Desactivar descarga A2DP por Bluetooth"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Reiniciar dispositivo?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Debes reiniciar o dispositivo para cambiar esta opción"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Reiniciar"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Cancelar"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Dispositivos multimedia dispoñibles"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Dispositivos de chamada dispoñibles"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Conectado actualmente"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Preferencias de conexión"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Dispositivos previamente conectados"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Dispositivos conectados previamente"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Data e hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Seleccionar zona horaria"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"O porto que inseriches non é válido."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"O navegador utiliza o proxy HTTP, pero non o poden utilizar as demais aplicacións."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"URL de PAC: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Largura de banda de descarga (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Largura de banda de carga (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Información da localización para móbiles (obsoleto):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Información para móbiles próximos (obsoleto):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Configuración de canle física de LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Taxa de actualización da información para móbiles:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Toda a información de medición para móbiles:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Información en tempo real da conexión de datos:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Servizo de datos:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Itinerancia:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar para acender"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Pantalla en suspensión"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Activada continuamente (consómese máis batería)"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Novas notificacións"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Cando mostrar a pantalla"</string>
     <string name="doze_title" msgid="2375510714460456687">"Novas notificacións"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Activa a pantalla cando recibes notificacións"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">O código PIN da SIM é incorrecto. Quédache <xliff:g id="NUMBER_0">%d</xliff:g> intento antes de que teñas que contactar co operador para desbloquear o dispositivo.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Fallo no funcionamento do PIN da SIM"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Estado da tableta"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Estado do teléfono"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Actualizacións do sistema"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versión de Android"</string>
@@ -1407,7 +1411,7 @@
     <string name="storage_wizard_ready_v2_internal_body" msgid="4658433206901211269">"Para transferir contido ao dispositivo (<xliff:g id="NAME">^1</xliff:g>), accede a "<b>"Configuración &gt; Almacenamento"</b></string>
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="6239886818487538806">"O contido transferiuse ao dispositivo (<xliff:g id="NAME_0">^1</xliff:g>). \n\nPara xestionar o dispositivo mencionado (<xliff:g id="NAME_1">^2</xliff:g>), accede a "<b>"Configuración &gt; Almacenamento"</b>"."</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Estado da batería"</string>
-    <string name="battery_level_title" msgid="2965679202786873272">"Nivel da batería"</string>
+    <string name="battery_level_title" msgid="2965679202786873272">"Nivel de batería"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
     <string name="apn_edit" msgid="1354715499708424718">"Editar punto de acceso"</string>
     <string name="apn_not_set" msgid="4974192007399968164">"Sen configurar"</string>
@@ -2009,7 +2013,7 @@
       <item quantity="other">Retardo moi longo (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">Retardo moi longo (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
-    <string name="accessibility_vibration_summary" msgid="1372393829668784669">"Intensidade (<xliff:g id="SUMMARY_RING">%1$s</xliff:g>), táctil (<xliff:g id="SUMMARY_TOUCH">%2$s</xliff:g>)"</string>
+    <string name="accessibility_vibration_summary" msgid="1372393829668784669">"Intensidade (<xliff:g id="SUMMARY_RING">%1$s</xliff:g>), toque (<xliff:g id="SUMMARY_TOUCH">%2$s</xliff:g>)"</string>
     <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"O son e as notificacións están desactivados"</string>
     <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"O son e as notificacións teñen un volume baixo"</string>
     <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"O son e as notificacións teñen un volume medio"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Non se pode restrinxir o uso en segundo plano"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Queres limitar a actividade en segundo plano?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Si limitas a actividade en segundo plano para unha aplicación, é posible que non funcione correctamente"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Non podes limitar a aplicación porque non se configurou para optimizar a batería.\n\nPrimeiro activa a optimización da batería."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Uso da pantalla desde a carga completa"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo da pantalla"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Exploración de redes móbiles"</string>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Sinal de marcación de urxencia"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Define o comportamento cando se realiza unha chamada de urxencia"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Copia de seguranza"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Activado"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Desactivado"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Copia de seguranza e restauración"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Datos persoais"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Realizar copia de seguranza dos meus datos"</string>
@@ -2762,6 +2767,12 @@
       <item quantity="one">Comprobar certificado</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Múltiples usuarios"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Usuarios e perfís"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Engadir usuario ou perfil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Engadir usuario"</string>
@@ -2944,14 +2955,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"uso de datos"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"zona wifi"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivos conectados"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, modo de condución, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, modo de condución"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicacións e notificacións"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permisos, aplicacións predeterminadas"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Contas"</string>
@@ -2968,7 +2975,6 @@
     <string name="keywords_home" msgid="294182527446892659">"launcher, predeterminado, aplicacións"</string>
     <string name="keywords_display" msgid="8910345814565493016">"pantalla, pantalla táctil"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"atenuar pantalla, pantalla táctil, batería, brillante"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"atenuar pantalla, pantalla táctil, batería"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"atenuar pantalla, noite, ton, cambio nocturno, brillo, cor da pantalla, cor, color"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"segundo plano, personalizar pantalla"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tamaño do texto"</string>
@@ -3009,8 +3015,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"rede, estado da rede de telefonía móbil, estado do servizo, intensidade do sinal, tipo de rede de telefonía móbil, itinerancia, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"número de serie, versión do hardware"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"nivel de parche de seguranza de android, versión de banda base, versión de kernel"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Visualización da pantalla de bloqueo, pantalla ambiente"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"impresión dixital"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"atenuar pantalla, pantalla táctil, batería, brillo intelixente, brillo dinámico"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"xirar, voltear, xiro, retrato, orientación, horizontal, vertical"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"actualizar, actualización, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"non molestar, programar, programación, notificacións, bloquear, bloqueo, silenciar, silencio, vibrar, suspender, suspensión, traballar, traballo, centrarse, son, día, día da semana, fin de semana, noite da semana, evento"</string>
@@ -3093,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permitir sinais visuais"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Cando estea activado o modo Non molestar"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notificacións"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Mostrar notificacións de forma silenciosa"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Silenciaranse as notificacións"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Notificacións sen son"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Verás notificacións na pantalla"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"O teléfono non vibrará nin emitirá sons cando cheguen notificacións."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Ocultar notificacións"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Non verás notificacións novas ou existentes"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Notificacións sen son nin elementos visuais"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Non verás nin escoitarás notificacións"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"O teléfono non mostrará notificacións novas ou existentes e non vibrará nin emitirá sons. As notificacións non aparecerán cando pases o dedo cara abaixo desde a parte superior da pantalla.\n\nTen e conta que seguirán aparecendo notificacións esenciais para a actividade e o estado do teléfono."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Configuración personalizada"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Activar configuración personalizada"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Quitar configuración personalizada"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Visibles"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Notificacións sen son"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Parcialmente ocultas"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Ocultas"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Notificacións sen son nin elementos visuais"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Restricións personalizadas"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Cando a pantalla está acendida"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Cando a pantalla está apagada"</string>
@@ -3163,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Silenciados, pero permítense: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> e <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mensaxes, eventos e recordatorios"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Cando estea activado o modo Non molestar, silenciaranse as mensaxes, os recordatorios e os eventos, agás nos casos autorizados anteriormente. Podes axustar a configuración para permitir que os amigos, os familiares ou outros contactos se comuniquen contigo."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Feito"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Configuración"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Notificacións sen son nin elementos visuais"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Notificacións sen son"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Non verás nin escoitarás notificacións. Permítense chamadas de contactos marcados con estrela e persoas que xa te chamaron."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Configuración actual)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Queres cambiar a configuración de notificacións do modo Non molestar?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Sons do perfil de traballo"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Usar sons do perfil persoal"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Os sons son iguais para o perfil persoal e o de traballo"</string>
@@ -3347,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Permitir chamadas"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Cando estea activado o modo Non molestar, bloquearanse as chamadas entrantes. Podes axustar a configuración para permitir que os amigos, os familiares ou outros contactos se comuniquen contigo."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Contactos marcados con estrela"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">e <xliff:g id="NUM_PEOPLE">%d</xliff:g> máis</item>
-      <item quantity="one">e 1 máis</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mensaxes"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Permitir mensaxes"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Mensaxes"</string>
@@ -3780,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de cor fría"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utiliza cores de visualización máis frías"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar o cambio de cor, apaga a pantalla"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitor de conectividade"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"O monitor de conectividade recompilará rexistros cando detecte un problema e enviará unha notificación ao usuario para solicitarlle que informe dun erro"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Para aplicar o cambio do monitor de conectividade, reinicia o dispositivo"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor láser da cámara"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Cámara lóxica como opción predeterminada"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Actualizacións automáticas do sistema"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Aplica as actualizacións cando se reinicia o dispositivo"</string>
     <string name="usage" msgid="2977875522080448986">"Uso"</string>
@@ -4093,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Servizo de autocompletar"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automático, completar, autocompletar"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Asegúrate de que confías nesta aplicación&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Autocompletar de Google&gt;%1$s&lt;/xliff:g&gt; utiliza o contido da pantalla para determinar o que se pode completar."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Tema do dispositivo"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Tema de cor"</string>
     <string name="default_theme" msgid="7085644992078579076">"Predeterminado"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Tema do dispositivo"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automático (segundo o fondo de pantalla)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Claro"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Escuro"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Nome da rede"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Mostrar o nome da rede na barra de estado"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Xestor de almacenamento: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4106,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Información de aprovisionamento do operador"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aprovisionamento do operador do activador"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Actualizar a modo Non molestar"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Oculta as notificacións para concentrarte"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pon en pausa as notificacións para concentrarte"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Cales son as novidades fascinantes?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Realiza unha visita guiada polo teu novo teléfono"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Realiza unha visita guiada pola túa nova tableta"</string>
diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml
index d762cb4..3a400d4 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"હંમેશા ચાલુ"</item>
     <item msgid="6385301106124765323">"હંમેશા બંધ"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 4455639..0dbf01b 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"તમારા ટૅબ્લેટને નજીકના બ્લૂટૂથ ઉપકરણો સાથે સંચાર કરવાની મંજૂરી આપો"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"તમારા ઉપકરણને નજીકના બ્લૂટૂથ ઉપકરણો સાથે સંચાર કરવાની મંજૂરી આપો"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"તમારા ફોનને નજીકના બ્લૂટૂથ ઉપકરણો સાથે સંચાર કરવાની મંજૂરી આપો"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"બ્લૂટૂથ A2DP હાર્ડવેર ઑફલોડને બંધ કરો"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"ઉપકરણ ફરી શરૂ કરીએ?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"આ સેટિંગમાં ફેરફાર કરવા માટે તમારા ઉપકરણને ફરીથી શરૂ કરો."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"ફરી શરૂ કરો"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"રદ કરો"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"ઉપલબ્ધ મીડિયા ઉપકરણો"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"ઉપલબ્ધ કૉલ ઉપકરણો"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"હાલમાં કનેક્ટ કરેલ છે"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"કનેક્શનની પસંદગીઓ"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"પહેલાં કનેક્ટ થયેલા ઉપકરણો"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"પહેલાં કનેક્ટ કરેલા"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"તારીખ અને સમય"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"સમય ઝોન પસંદ કરો"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"તમે ટાઇપ કરેલ પોર્ટ માન્ય નથી."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP પ્રોક્સીનો ઉપયોગ બ્રાઉઝર દ્વારા કરવામાં આવે છે પરંતુ અન્ય ઍપ્લિકેશનો દ્વારા કરી શકાતો નથી."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL બૅન્ડવિડ્થ (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL બૅન્ડવિડ્થ (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"સેલ સ્થાન માહિતી (ટાળેલ):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"પડોશીની સેલ માહિતી (ટાળેલ):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE ભૌતિક ચૅનલની ગોઠવણી:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"સેલ માહિતી તાજું કરવાનો દર:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"તમામ સેલ માપ માહિતી:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"ડેટા કનેક્શન રીઅલ-ટાઇમ માહિતી:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"ડેટા સેવા:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"રોમિંગ:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1007,16 +1015,11 @@
     <string name="emergency_address_title" msgid="932729250447887545">"કટોકટીનું સરનામું"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"જ્યારે તમે વાઇ-ફાઇનો ઉપયોગ કરીને કોઈ કટોકટીનો કૉલ કરો તો તેનો તમારા સ્થાન તરીકે ઉપયોગ કરવામાં આવશે"</string>
     <string name="private_dns_help_message" msgid="3299567069152568958">"ખાનગી DNS સુવિધા વિશે "<annotation id="url">"વધુ જાણો"</annotation></string>
-    <!-- no translation found for wifi_calling_pref_managed_by_carrier (6845711858866828986) -->
-    <skip />
-    <!-- no translation found for wifi_calling_settings_activation_instructions (7492509632478260955) -->
-    <skip />
-    <!-- no translation found for wifi_calling_turn_on (1171403510313983983) -->
-    <skip />
-    <!-- no translation found for wifi_calling_not_supported (7878640438907807754) -->
-    <skip />
-    <!-- no translation found for carrier (5264014738689761132) -->
-    <skip />
+    <string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"કૅરિઅર દ્વારા મેનેજ કરવામાં આવતી સેટિંગ"</string>
+    <string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"વાઇ-ફાઇ કૉલિંગ સક્રિય કરો"</string>
+    <string name="wifi_calling_turn_on" msgid="1171403510313983983">"વાઇ-ફાઇ કૉલિંગ ચાલુ કરો"</string>
+    <string name="wifi_calling_not_supported" msgid="7878640438907807754">"%1$s માટે વાઇ-ફાઇ કૉલિંગ સમર્થિત નથી"</string>
+    <string name="carrier" msgid="5264014738689761132">"કૅરિઅર"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ડિસ્પ્લે"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ધ્વનિ"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"વૉલ્યૂમ્સ"</string>
@@ -1151,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"સ્વચલિત તેજ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"જાગૃત કરવા માટે લિફ્ટ કરો"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"ઍમ્બિઅન્ટ ડિસ્પ્લે"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"હંમેશા ચાલુ / વધારેલ બૅટરી વપરાશ"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"નવા નોટિફિકેશનો"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ક્યારે બતાવવું"</string>
     <string name="doze_title" msgid="2375510714460456687">"નવા નોટિફિકેશનો"</string>
     <string name="doze_summary" msgid="3846219936142814032">"જ્યારે તમને નોટિફિકેશનો પ્રાપ્ત થાય ત્યારે સ્ક્રીન સક્રિય કરો"</string>
@@ -1197,8 +1198,6 @@
       <item quantity="other">ખોટો સિમ પિન કોડ, તમારી પાસે <xliff:g id="NUMBER_1">%d</xliff:g> પ્રયાસ બાકી છે.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"સિમ પિન ઑપરેશન નિષ્ફળ થયું!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"ટેબ્લેટ સ્થિતિ"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"ફોન સ્થિતિ"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"સિસ્ટમ અપડેટ્સ"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android સંસ્કરણ"</string>
@@ -2119,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"બૅકગ્રાઉન્ડ વપરાશને પ્રતિબંધિત કરી શકાય નહીં"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"બૅકગ્રાઉન્ડ પ્રવૃત્તિને મર્યાદિત કરીએ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"જો તમે બૅકગ્રાઉન્ડ પ્રવૃત્તિને એક ઍપ માટે મર્યાદિત કરો છો, તો તે અયોગ્ય વર્તન કરી શકે છે"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"આ ઍપ બૅટરી ઑપ્ટિમાઇઝ કરવા સેટ નથી તેથી તમે તેને પ્રતિબંધિત કરી શકશો નહીં.\n\nએને પ્રતિબંધિત કરવા, પહેલાં બૅટરી ઑપ્ટિમાઇઝ કરવાનું ચાલુ કરો."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"સંપૂર્ણ ચાર્જ કર્યાં પછી સ્ક્રીન વપરાશ"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"સ્ક્રીન દ્વારા વપરાશ"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"મોબાઇલ નેટવર્ક સ્કૅન કરવામાં"</string>
@@ -2440,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"કટોકટી સમયે ડાયલનું સિગ્નલ"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"જ્યારે કટોકટીનો કૉલ કરવામાં આવે ત્યારે વર્તન સેટ કરો"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"બૅકઅપ"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"ચાલુ છે"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"બંધ છે"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"બેકઅપ અને પુનર્સ્થાપન"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"વ્યક્તિગત ડેટા"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"મારા ડેટાનો બેક અપ લો"</string>
@@ -2766,6 +2766,12 @@
       <item quantity="other">પ્રમાણપત્રો તપાસો</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"એકથી વધુ વપરાશકર્તાઓ"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"વપરાશકર્તાઓ અને પ્રોફાઇલ્સ"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"વપરાશકર્તા અથવા પ્રોફાઇલ ઉમેરો"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"વપરાશકર્તા ઉમેરો"</string>
@@ -2948,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ડેટા વપરાશ"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"હૉટસ્પૉટ"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"કનેક્ટ થયેલ ઉપકરણો"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"બ્લૂટૂથ, ડ્રાઇવિંગ મોડ, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"બ્લૂટૂથ, ડ્રાઇવિંગ મોડ"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"બ્લૂટૂથ, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"બ્લૂટૂથ"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ઍપ્લિકેશનો અને સૂચનાઓ"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"પરવાનગીઓ, ડિફૉલ્ટ ઍપ્લિકેશનો"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"એકાઉન્ટ"</string>
@@ -2972,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"લૉન્ચર, ડિફૉલ્ટ, ઍપ"</string>
     <string name="keywords_display" msgid="8910345814565493016">"સ્ક્રીન, ટચસ્ક્રીન"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"ધૂંધળી સ્ક્રીન, ટચસ્ક્રીન, બૅટરી, તેજસ્વી"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"મંદ સ્ક્રીન, ટચસ્ક્રીન, બૅટરી"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"ધૂંધળી સ્ક્રીન, રાત, રંગછટા, રાત્રિની શિફ્ટ, બ્રાઇટનેસ, ​​સ્ક્રીનનો રંગ, રંગ, રંગ"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"બૅકગ્રાઉન્ડ, વ્યક્તિગત, પ્રદર્શન કસ્ટમાઇઝ કરો"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ટેક્સ્ટ કદ"</string>
@@ -3013,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"નેટવર્ક, મોબાઇલ નેટવર્કની સ્થિતિ, સેવાની સ્થિતિ, સિગ્નલ પ્રબળતા, મોબાઇલ નેટવર્કનો પ્રકાર, રોમિંગ, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"અનુક્રમ નંબર, હાર્ડવેર વર્ઝન"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"Android સુરક્ષા પૅચ સ્તર, બેઝબૅન્ડ વર્ઝન, કર્નેલ વર્ઝન"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"વ્યાપક ડિસ્પ્લે, લૉક સ્ક્રીન ડિસ્પ્લે"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"ફિંગરપ્રિન્ટની સેટિંગ"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"ફેરવો, ફ્લિપ કરો, રોટેશન, પોર્ટ્રેટ, લૅન્ડસ્કેપ, ઓરિએન્ટેશન, ઊભું, આડું કરો"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"અપગ્રેડ કરો, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, શેડ્યૂલ, સૂચનાઓ, બ્લૉક, સાઇલન્સ, વાઇબ્રેટ, ઊંઘ, કાર્ય, ધ્યાન, સાઉન્ડ, મ્યૂટ, દિવસ, અઠવાડિયાના દિવસ, વીકએન્ડ, સપ્તાહની રાત્રિ, ઇવેન્ટ"</string>
@@ -3095,27 +3100,20 @@
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"દૃશ્ય વિક્ષેપોને બ્લૉક કરો"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"વિઝ્યુઅલ સંકેતોને મંજૂરી આપો"</string>
-    <!-- no translation found for zen_mode_settings_category (3982039687186952865) -->
-    <skip />
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"ખલેલ પાડશો નહીં ચાલુ કરેલ હોય ત્યારે"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"નોટિફિકેશન"</string>
-    <!-- no translation found for zen_mode_restrict_notifications_mute (8649062661635246283) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_summary (8450964969807231275) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_footer (3465600930732602159) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide (9070829387109283980) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_summary (3832808022882158781) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_footer (6559283246372102465) -->
-    <skip />
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"નોટિફિકેશનમાં કોઈ સાઉન્ડ નથી"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"તમે તમારી સ્ક્રીન પર નોટિફિકેશન જોઈ શકશો"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"નોટિફિકેશનો આવશે, ત્યારે તમારો ફોન વાઇબ્રેટ કે અવાજ નહીં કરે."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"નોટિફિકેશનમાં કોઈ વિઝ્યુઅલ અથવા સાઉન્ડ નથી"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"તમે કોઈ નોટિફિકેશન જોઈ અથવા સાંભળી શકશો નહીં"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"તમારો ફોન નવું અથવા હાલનું કોઈપણ નોટિફિકેશન બતાવશે નહીં અને તે કોઈ અવાજ નહીં કરે કે વાઇબ્રેટ નહીં થાય. તમે તમારા મોબાઇલની ટોચ પરથી નીચેની તરફ સ્વાઇપ કરશો, ત્યારે નોટિફિકેશનો દેખાશે નહીં.\n\nયાદ રાખો કે, ફોન પ્રવૃત્તિ અને સ્ટેટસ માટેના મહત્ત્વપૂર્ણ નોટિફિકેશનો હજુ પણ દેખાશે."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"કસ્ટમ"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"કસ્ટમ સેટિંગ ચાલુ કરો"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"કસ્ટમ સેટિંગ કાઢી નાખો"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"દેખાશે"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"નોટિફિકેશનમાં કોઈ સાઉન્ડ નથી"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"આંશિક રૂપે છુપાવેલ"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"છુપાવેલ"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"નોટિફિકેશનમાં કોઈ વિઝ્યુઅલ અથવા સાઉન્ડ નથી"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"કસ્ટમ પ્રતિબંધો"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"જ્યારે સ્ક્રીન ચાલુ હોઈ ત્યારે"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"જ્યારે સ્ક્રીન બંધ હોઈ ત્યારે"</string>
@@ -3161,45 +3159,26 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> નિયમો આપમેળે ચાલુ થઈ શકે છે</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> નિયમો આપમેળે ચાલુ થઈ શકે છે</item>
     </plurals>
-    <!-- no translation found for zen_category_behavior (2989256030084350296) -->
-    <skip />
-    <!-- no translation found for zen_category_exceptions (7601136604273265629) -->
-    <skip />
-    <!-- no translation found for zen_category_schedule (9000447592251450453) -->
-    <skip />
-    <!-- no translation found for zen_sound_title (424490228488531372) -->
-    <skip />
-    <!-- no translation found for zen_sound_footer (7621745273287208979) -->
-    <skip />
-    <!-- no translation found for zen_sound_category_title (4336596939661729188) -->
-    <skip />
-    <!-- no translation found for zen_sound_all_muted (4850363350480968114) -->
-    <skip />
-    <!-- no translation found for zen_sound_none_muted (3938508512103612527) -->
-    <skip />
-    <!-- no translation found for zen_sound_one_allowed (8447313454438932276) -->
-    <skip />
-    <!-- no translation found for zen_sound_two_allowed (980491120444358550) -->
-    <skip />
-    <!-- no translation found for zen_sound_three_allowed (3455767205934547985) -->
-    <skip />
-    <!-- no translation found for zen_msg_event_reminder_title (5137894077488924820) -->
-    <skip />
-    <!-- no translation found for zen_msg_event_reminder_footer (3242847055412790819) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_category_behavior" msgid="2989256030084350296">"વર્તણૂક"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"અપવાદો"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"શેડ્યૂલ"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"અવાજ અને વાઇબ્રેશન"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"ખલેલ પાડશો નહીં મોડ ચાલુ હોય, ત્યારે અવાજ અને વાઇબ્રેશન મ્યૂટ કરવામાં આવશે, જેમાં તમે ઉપરની જે આઇટમોને મંજૂરી આપો તે અપવાદ છે."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"બધા મ્યૂટ કરો, સિવાય કે"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"મ્યૂટ કરેલ છે"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"મ્યૂટ કરેલ નથી"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"મ્યૂટ કરેલ છે, પરંતુ <xliff:g id="SOUND_TYPE">%1$s</xliff:g>ને મંજૂરી આપો"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"મ્યૂટ કરેલ છે, પરંતુ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> અને <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>ને મંજૂરી આપો"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"મ્યૂટ કરેલ છે, પરંતુ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> અને <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>ને મંજૂરી આપો"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"સંદેશા, ઇવેન્ટ અને રિમાઇન્ડર"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"ખલેલ પાડશો નહીં મોડ ચાલુ હોય, ત્યારે સંદેશા, રિમાઇન્ડર અને ઇવેન્ટ મ્યૂટ કરવામાં આવશે, જેમાં તમે ઉપરની જે આઇટમોને મંજૂરી આપો તે અપવાદ છે. તમારા મિત્રો, પરિવારજનો અથવા અન્ય સંપર્કો તમારો સંપર્ક કરી શકે તે માટે તમે સંદેશાની સેટિંગ અનુકૂળ કરી શકો છો."</string>
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"થઈ ગયું"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"સેટિંગ"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"નોટિફિકેશનમાં કોઈ વિઝ્યુઅલ અથવા સાઉન્ડ નથી"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"નોટિફિકેશનમાં કોઈ સાઉન્ડ નથી"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"તમે કોઈ નોટિફિકેશન જોઈ અથવા સાંભળી શકશો નહીં. સ્ટાર આપેલા સંપર્કો અને રિપીટ કૉલરના કૉલને પરવાનગી આપવામાં આવે છે."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(વર્તમાન સેટિંગ)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"ખલેલ પાડશો નહીં નોટિફિકેશનની સેટિંગમાં ફેરફાર કરીએ?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"કાર્યાલયની પ્રોફાઇલની ધ્વનિઓ"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"વ્યક્તિગત પ્રોફાઇલ ધ્વનિઓ વાપરો"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"કાર્ય અને વ્યક્તિગત પ્રોફાઇલો માટે ધ્વનિ સમાન રહે છે"</string>
@@ -3368,54 +3347,35 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> થી <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"કૉલ્સ"</string>
-    <!-- no translation found for zen_mode_calls_title (623395033931747661) -->
-    <skip />
-    <!-- no translation found for zen_mode_calls_footer (3618700268458237781) -->
-    <skip />
+    <string name="zen_mode_calls_title" msgid="623395033931747661">"કૉલને મંજૂરી આપો"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"ખલેલ પાડશો નહીં મોડ ચાલુ હોય, ત્યારે ઇનકમિંગ કૉલ બ્લૉક કરવામાં આવે છે. તમારા મિત્રો, પરિવારજનો અથવા અન્ય સંપર્કો તમારો સંપર્ક કરી શકે તે માટે તમે સેટિંગને અનુકૂળ કરી શકો છો."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"સ્ટાર આપેલ સંપર્કો"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">અને અન્ય <xliff:g id="NUM_PEOPLE">%d</xliff:g> વ્યક્તિ</item>
-      <item quantity="other">અને અન્ય <xliff:g id="NUM_PEOPLE">%d</xliff:g> લોકો</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"સંદેશા"</string>
-    <!-- no translation found for zen_mode_messages_title (7729380010396411129) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_messages (8257021584561639816) -->
-    <skip />
-    <!-- no translation found for zen_mode_selected_messages (1047355526202106114) -->
-    <skip />
+    <string name="zen_mode_messages_title" msgid="7729380010396411129">"સંદેશાને મંજૂરી આપો"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"સંદેશા"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"કેટલાક સંદેશા"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"કોઈની પણ તરફથી"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"ફક્ત સંપર્કોના"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"ફક્ત તારાંકિત સંપર્કોના"</string>
-    <!-- no translation found for zen_calls_summary_starred_repeat (4046151920710059778) -->
-    <skip />
-    <!-- no translation found for zen_calls_summary_contacts_repeat (1528716671301999084) -->
-    <skip />
-    <!-- no translation found for zen_calls_summary_repeat_only (7105261473107715445) -->
-    <skip />
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"સ્ટાર આપેલ સંપર્કો અને પુનરાવર્તિત કૉલરોના"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"સંપર્કો અને પુનરાવર્તિત કૉલરોના"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"ફક્ત પુનરાવર્તિત કૉલરોના"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"કોઈ નહીં"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"એલાર્મ્સ"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"મીડિયા"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"ટચ સાઉન્ડ"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"રિમાઇન્ડર"</string>
-    <!-- no translation found for zen_mode_reminders_title (2345044406347406902) -->
-    <skip />
+    <string name="zen_mode_reminders_title" msgid="2345044406347406902">"રિમાઇન્ડરને મંજૂરી આપો"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ઇવેન્ટ્સ"</string>
-    <!-- no translation found for zen_mode_events_title (5597241655883329085) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_callers (2378065871253871057) -->
-    <skip />
-    <!-- no translation found for zen_mode_contacts_callers (5569804103920394175) -->
-    <skip />
-    <!-- no translation found for zen_mode_starred_callers (1023167821338514140) -->
-    <skip />
+    <string name="zen_mode_events_title" msgid="5597241655883329085">"ઇવેન્ટને મંજૂરી આપો"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"કોઈપણ વ્યક્તિ"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"સંપર્કો"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"સ્ટાર આપેલા સંપર્કો"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"પુનરાવર્તિત કૉલર્સ"</string>
-    <!-- no translation found for zen_mode_repeat_callers_title (8553876328249671783) -->
-    <skip />
-    <!-- no translation found for zen_mode_calls_summary_one (3972333792749874863) -->
-    <skip />
-    <!-- no translation found for zen_mode_calls_summary_two (6592821501321201329) -->
-    <skip />
+    <string name="zen_mode_repeat_callers_title" msgid="8553876328249671783">"રિપીટ કૉલરને મંજૂરી આપો"</string>
+    <string name="zen_mode_calls_summary_one" msgid="3972333792749874863">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> તરફથી"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> અને <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>ના"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"જો <xliff:g id="MINUTES">%d</xliff:g> મીનિટના સમયગાળા દરમ્યાન તે જ વ્યક્તિ પાછી કૉલ કરે તો"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"કસ્ટમ"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"આપમેળે ચાલુ"</string>
@@ -3820,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"કૂલ રંગ તાપમાન"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"વધુ કૂલ પ્રદર્શન રંગોનો ઉપયોગ કરો"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"રંગ ફેરફાર લાગુ કરવા માટે, સ્ક્રીન બંધ કરો"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"ConnectivityMonitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitorને કનેક્ટિવિટીમાં કોઈ સમસ્યા મળશે ત્યારે તે લૉગ એકત્રિત કરશે અને વપરાશકર્તાને ખામીની જાણ કરવાની નોટિફિકેશનનો સંકેત આપશે"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"કનેક્ટિવિટી મોનિટરના ફેરફારો લાગુ કરવા માટે, ઉપકરણને રીબૂટ કરો"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"કૅમેરાનું લેસર સેન્સર"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"ડિફૉલ્ટ તરીકે લોજીકલ કૅમેરા"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"સ્વચાલિત સિસ્ટમ અપડેટ્સ"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"ઉપકરણ ફરી શરૂ થાય, ત્યારે અપડેટ લાગુ કરો"</string>
     <string name="usage" msgid="2977875522080448986">"વપરાશ"</string>
@@ -3952,8 +3910,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"લૉક સ્ક્રીન પરની માહિતી નિયંત્રિત કરો"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"નોટિફિકેશન કન્ટેન્ટ બતાવો અથવા છુપાવો"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"તમામ"</string>
-    <!-- no translation found for page_tab_title_support (4407600495101788249) -->
-    <skip />
+    <string name="page_tab_title_support" msgid="4407600495101788249">"ટિપ અને સહાય"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"સૌથી નાની પહોળાઈ"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"કોઈ ઇન્સ્ટૉલ કરેલ ઍપ્લિકેશનોએ પ્રીમિયમ SMS ઍક્સેસની વિનંતી કરી નથી"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"તમને પ્રીમિયમ SMS નો શુલ્ક લાગી શકે છે અને તમારા કૅરિઅર બિલ્સમાં ઉમેરવામાં આવશે. જો તમે કોઇ ઍપ્લિકેશન માટે પરવાનગી સક્ષમ કરો, તો તમે તે ઍપ્લિકેશનનો ઉપયોગ કરીને પ્રીમિયમ SMS મોકલવા માટે સમર્થ હશો."</string>
@@ -4134,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"સ્વતઃભરણ સેવા"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"સ્વતઃ, ભરો, સ્વતઃભરણ"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;ખાતરી કરો કે તમે આ ઍપ્લિકેશનનો વિશ્વાસ કરો છો&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google આપમેળે&gt;%1$s&lt;/xliff:g&gt; તમારી સ્ક્રીન પર શું છે તેનો ઉપયોગ એ નક્કી કરવા કરે છે કે આપમેળે શું દાખલ થશે."</string>
-    <string name="device_theme" msgid="4571803018917608588">"ઉપકરણની થીમ"</string>
+    <string name="color_theme" msgid="1535685696756738324">"રંગ થીમ"</string>
     <string name="default_theme" msgid="7085644992078579076">"ડિફૉલ્ટ"</string>
+    <string name="device_theme" msgid="4571803018917608588">"ઉપકરણની થીમ"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"આપમેળે (વૉલપેપરના આધારે)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"આછું"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"ઘેરી"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"નેટવર્કનું નામ"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"સ્ટેટસ બારમાં નેટવર્કનું નામ પ્રદર્શિત કરો"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"સ્ટોરેજ સંચાલક: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4147,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"કૅરિઅર જોગવાઈ માહિતી"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"કૅરિઅર જોગવાઈ ટ્રિગર કરો"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"ખલેલ પાડશો નહીંને અપડેટ કરો"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"ફોકસમાં રહેવા માટે નોટિફિકેશન છુપાવો"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"ધ્યાન કેન્દ્રિત કરવા માટે નોટિફિકેશન થોભાવો"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"નવું અને રોમાંચક શું છે?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"તમારા નવા ફોનની ઓળખ મેળવો"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"તમારા નવા ટેબ્લેટની ઓળખ મેળવો"</string>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 8376a9b..27ccf6d 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"हमेशा चालू"</item>
     <item msgid="6385301106124765323">"हमेशा बंद"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 037bbb1..17f20ea 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"अपने टैबलेट को आस-पास के ब्लूटूथ डिवाइस से संपर्क करने की मंज़ूरी दें"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"अपने डिवाइस को आस-पास के ब्लूटूथ डिवाइस से संपर्क करने की मंज़ूरी दें"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"अपने फ़ोन को आस-पास के ब्लूटूथ डिवाइस से संपर्क करने की मंज़ूरी दें"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"ब्लूटूथ ए2डीपी हार्डवेयर ऑफ़लोड बंद करें"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"डिवाइस रीस्टार्ट करें?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"यह सेटिंग बदलने के लिए डिवाइस रीस्टार्ट करना ज़रूरी है."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"रीस्टार्ट करें"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"अभी नहीं"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"मौजूद मीडिया डिवाइस"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"कॉल की सुविधा वाले उपलब्ध डिवाइस"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"इंटरनेट से जुड़े हुए डिवाइस"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"कनेक्शन की पसंद"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"पहले कनेक्ट किए गए डिवाइस"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"पहले कनेक्ट किए गए डिवाइस"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"तारीख और समय"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"समय क्षेत्र चुनें"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"आपके द्वारा लिखा गया पोर्ट मान्‍य नहीं है."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP प्रॉक्सी का उपयोग ब्राउज़र द्वारा किया जाता है लेकिन अन्य ऐप्स द्वारा उपयोग नहीं किया जा सकता."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC यूआरएल: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"डीएल बैंडविड्थ (केबीपीएस):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"यूएल बैंडविड्थ (केबीपीएस):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"मोबाइल की जगह की जानकारी (रोकी गयी है):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"आस-पास के सेल की जानकारी (बहिष्कृत):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE फ़िज़िकल चैनल कॉन्फ़िगरेशन:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"सेल जानकारी रीफ्रेश दर:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"सेल माप की सभी जानकारी:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"डेटा कनेक्शन की मौजूदा जानकारी:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"डेटा सेवा:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"रोमिंग:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -954,7 +962,7 @@
     <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"हॉटस्पॉट का पासवर्ड"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"एपी बैंड"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"अपने दूसरे डिवाइस के लिए हॉटस्पॉट का इस्तेमाल करके वाई-फ़ाई नेटवर्क बनाएं. हॉटस्पॉट आपके मोबाइल डेटा कनेक्शन के ज़रिए इंटरनेट की सुविधा देता है. मोबाइल डेटा के लिए अतिरिक्त भुगतान करना पड़ सकता है."</string>
-    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ऐप्लिकेशन आस-पास के डिवाइस से सामग्री साझा करने के लिए कोई हॉटस्पॉट बना सकते हैं."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ऐप्लिकेशन आस-पास के डिवाइस से सामग्री शेयर करने के लिए कोई हॉटस्पॉट बना सकते हैं."</string>
     <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"हॉटस्पॉट अपने आप बंद करें"</string>
     <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"कोई डिवाइस कनेक्ट नहीं होने पर, वाई-फ़ाई हॉटस्पॉट बंद हो जाएगा"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"हॉटस्‍पॉट को चालू किया जा रहा है…"</string>
@@ -1007,18 +1015,13 @@
     <string name="emergency_address_title" msgid="932729250447887545">"आपातकालीन पता"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"जब आप वाई-फ़ाई पर आपातकालीन कॉल करते हैं, तब आपकी मौजूदा जगह को आपके पते के तौर पर इस्तेमाल किया जाता है"</string>
     <string name="private_dns_help_message" msgid="3299567069152568958">"निजी डीएनएस की सुविधाओं के बारे में "<annotation id="url">"ज़्यादा जानें"</annotation></string>
-    <!-- no translation found for wifi_calling_pref_managed_by_carrier (6845711858866828986) -->
-    <skip />
-    <!-- no translation found for wifi_calling_settings_activation_instructions (7492509632478260955) -->
-    <skip />
-    <!-- no translation found for wifi_calling_turn_on (1171403510313983983) -->
-    <skip />
-    <!-- no translation found for wifi_calling_not_supported (7878640438907807754) -->
-    <skip />
-    <!-- no translation found for carrier (5264014738689761132) -->
-    <skip />
+    <string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"यह सेटिंग मोबाइल और इंटरनेट सेवा देने वाली कंपनी प्रबंधित करती है"</string>
+    <string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"वाई-फ़ाई कॉलिंग की सुविधा शुरू करें"</string>
+    <string name="wifi_calling_turn_on" msgid="1171403510313983983">"वाई-फ़ाई कॉलिंग की सुविधा चालू करें"</string>
+    <string name="wifi_calling_not_supported" msgid="7878640438907807754">"%1$s पर वाई-फ़ाई कॉलिंग की सुविधा उपलब्ध नहीं है"</string>
+    <string name="carrier" msgid="5264014738689761132">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"स्क्रीन सेटिंग देखें"</string>
-    <string name="sound_settings" msgid="5534671337768745343">"आवाज़"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"साउंड"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"आवाज़"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"संगीत प्रभाव"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"रिंग की आवाज़"</string>
@@ -1151,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"अपनेआप स्क्रीन की रोशनी"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"सक्रिय करने के लिए उठाएं"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"हमेशा चालू स्क्रीन दिखाएं"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"हमेशा चालू / बढ़ा हुआ बैटरी उपयोग"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"नई सूचनाएं"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"कब दिखाना है"</string>
     <string name="doze_title" msgid="2375510714460456687">"नई सूचनाएं"</string>
     <string name="doze_summary" msgid="3846219936142814032">"आपको सूचना मिलने पर स्‍क्रीन चालू करें"</string>
@@ -1197,8 +1198,6 @@
       <item quantity="other">गलत सिम पिन कोड, आप <xliff:g id="NUMBER_1">%d</xliff:g> बार और कोशिश कर सकते हैं.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"सिम PIN की कार्यवाही विफल रही!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"टैबलेट स्‍थिति"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"फ़ोन स्‍थिति"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"सिस्‍टम के बारे में नई जानकारी"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android वर्शन"</string>
@@ -2119,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"बैकग्राउंड में हो रहे बैटरी खर्च पर रोक नहीं लगाई जा सकती"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"ऐप की बैकग्राउंड गतिविधि को सीमित करें?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"अगर आप ऐप की बैकग्राउंड गतिविधि को सीमित करते हैं, तो हो सकता है यह ठीक ढंग से काम न करे"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"ऐप्लिकेशन पर रोक नहीं लगेगी क्योंकि यह बैटरी ऑप्टिमाइज़ नहीं कर सकता.\n\nबैटरी ऑप्टिमाइज़ेशन चालू करके ही ऐसा हो सकता है."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"पूरा चार्ज होने के बाद से अब तक स्क्रीन का इस्तेमाल"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"स्क्रीन के लिए खपत"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"मोबाइल नेटवर्क स्कैनिंग"</string>
@@ -2440,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"आपातकालीन डायलिंग सिग्नल"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"आपातकालीन कॉल करने के दौरान व्‍यवहार सेट करें"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"बैकअप लें"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"चालू है"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"बंद है"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"सुरक्षित करें और पुनर्स्‍थापित करें"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"निजी डेटा"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"मेरे डेटा का बैकअप लें"</string>
@@ -2766,6 +2766,12 @@
       <item quantity="other">प्रमाणपत्रों की जाँच करें</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"एक से ज़्यादा उपयोगकर्ता"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"उपयोगकर्ता और प्रोफ़ाइल"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"उपयोगकर्ता या प्रोफ़ाइल जोड़ें"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"उपयोगकर्ता जोड़ें"</string>
@@ -2948,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"डेटा खर्च"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"हॉटस्पॉट"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"कनेक्ट किए गए डिवाइस"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"ब्लूटूथ, ड्राइविंग मोड, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"ब्लूटूथ, ड्राइविंग मोड"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"ब्लूटूथ, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"ब्लूटूथ"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ऐप्लिकेशन और सूचनाएं"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"अनुमतियां, डिफ़ॉल्ट ऐप"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"खाते"</string>
@@ -2972,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"लॉन्चर​, डिफ़ॉल्ट, ऐप्लिकेशन"</string>
     <string name="keywords_display" msgid="8910345814565493016">"स्क्रीन, टचस्क्रीन"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"हल्की रोशनी वाली स्क्रीन, टचस्क्रीन, बैटरी, चमक"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"हल्की रोशनी, टचस्‍क्रीन, बैटरी"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"हल्की रोशनी वाली स्क्रीन, नाइट, टिंट, नाइट शिफ़्ट, स्क्रीन की चमक, स्क्रीन का रंग, रंग, रंग"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"बैकग्राउंड, अपने हिसाब से ढालें, स्क्रीन को अपनी पसंद के मुताबिक बनाएं"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"लेख का आकार"</string>
@@ -3013,8 +3014,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"नेटवर्क, मोबाइल नेटवर्क किस राज्य का है, सेवा किस राज्य से ली जा रही है, सिग्नल की ताकत, मोबाइल नेटवर्क का प्रकार, रोमिंग, ICCID"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"सीरियल नंबर, हार्डवेयर वर्शन"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"Android सुरक्षा पैच लेवल, मोबाइल रेडियो (बेसबैंड वर्शन), kernel वर्शन"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"हमेशा चालू स्क्रीन, लॉक स्क्रीन डिसप्ले"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"फ़िंगरप्रिंट"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"हल्की रोशनी वाली स्क्रीन, टचस्क्रीन, बैटरी, स्मार्ट ब्राइटनेस, डाइनैमिक ब्राइटनेस"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"घुमाएं, फ़्लिप करें, घुमाव, पोर्ट्रेट, लैंडस्केप, स्क्रीन की दिशा, वर्टिकल, हॉरिज़ॉन्टल"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"अपग्रेड, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"परेशान न करें, शेड्यूल, सूचनाएं, रोक लगाएं, आवाज़ बंद करें, वाइब्रेट करें, कम बैटरी वाला मोड, काम, ध्यान दें, म्यूट, दिन, सोमवार से शुक्रवार के बीच कोई दिन, हफ़्ते के आखिरी दिन, सोमवार से शुक्रवार के बीच की कोई रात, इवेंट"</string>
@@ -3061,7 +3065,7 @@
     <string name="docking_sounds_title" msgid="155236288949940607">"डॉक करने की ध्वनियां"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"छूने पर आने वाली आवाज़ें"</string>
     <string name="vibrate_on_touch_title" msgid="1510405818894719079">"छूने पर कंपन (वाइब्रेशन) चालू करें"</string>
-    <string name="vibrate_on_touch_summary" msgid="8015901758501868229">"टैप करने, कीबोर्ड पर टाइप करने और दूसरी चीज़ों के लिए हैप्टिक फ़ीडबैक चालू करें"</string>
+    <string name="vibrate_on_touch_summary" msgid="8015901758501868229">"टैप करने, कीबोर्ड पर टाइप करने और दूसरी चीज़ों के लिए हैप्टिक सुझाव चालू करें"</string>
     <string name="dock_audio_media_title" msgid="1346838179626123900">"डॉक स्पीकर चलेगा"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"सभी ऑडियो"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"केवल मीडिया ऑडियो"</string>
@@ -3095,27 +3099,20 @@
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"मैसेज पर स्क्रीन चमकने से रोकें"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"संकेत दिखाए जाने की अनुमति दें"</string>
-    <!-- no translation found for zen_mode_settings_category (3982039687186952865) -->
-    <skip />
+    <string name="zen_mode_settings_category" msgid="3982039687186952865">"परेशान न करें सुविधा चालू होने पर"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"सूचनाएं"</string>
-    <!-- no translation found for zen_mode_restrict_notifications_mute (8649062661635246283) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_summary (8450964969807231275) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_mute_footer (3465600930732602159) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide (9070829387109283980) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_summary (3832808022882158781) -->
-    <skip />
-    <!-- no translation found for zen_mode_restrict_notifications_hide_footer (6559283246372102465) -->
-    <skip />
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"सूचनाएं आने पर कोई आवाज़ सुनाई न दे"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"अगर आप यह सेटिंग चुनते हैं तो, आपको डिवाइस की स्क्रीन पर सूचनाएं दिखाई देंगी"</string>
+    <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"सूचनाएं मिलने पर आपका फ़ोन आवाज़ या वाइब्रेट नहीं करेगा."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"सूचनाएं आने पर न तो स्क्रीन पर कुछ दिखे और न ही आवाज़ आए"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"अगर आप यह सेटिंग चुनते हैं तो, सूचनाएं आने पर न तो स्क्रीन पर कुछ दिखाई देगा और न ही आवाज़ सुनाई देगी"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"आपका फ़ोन नई या पहले से मौजूद कोई सूचना नहीं दिखाएगा और न ही आवाज़ या वाइब्रेट करेगा. अपने डिवाइस की स्क्रीन पर ऊपर से नीचे की ओर स्वाइप करने पर भी आपको सूचनाएं नहीं दिखाई देंगी. \n\nध्यान रहे कि फ़ोन की गतिविधि और स्थिति से जुड़ी ज़रूरी सूचनाएं आपको फिर भी दिखती रहेंगी."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"पसंद के मुताबिक बनाएं"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"पसंद के मुताबिक बनाई गई सेटिंग चालू करें"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"पसंद के मुताबिक बनाई गई सेटिंग हटाएं"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"सूचनाएं दिखाई देंगी"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"सूचनाएं आने पर कोई आवाज़ सुनाई न दे"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"कुछ सूचनाएं दिखाई नहीं देंगी"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"सूचनाएं दिखाई नहीं देंगी"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"सूचनाएं आने पर न तो स्क्रीन पर कुछ दिखे और न ही कोई आवाज़ सुनाई दे"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"अपनी पसंद के मुताबिक रोक लगाएं"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"स्क्रीन चालू होने पर"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"स्क्रीन बंद होने पर"</string>
@@ -3161,45 +3158,26 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> नियम अपने आप चालू हो सकते हैं</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> नियम अपने आप चालू हो सकते हैं</item>
     </plurals>
-    <!-- no translation found for zen_category_behavior (2989256030084350296) -->
-    <skip />
-    <!-- no translation found for zen_category_exceptions (7601136604273265629) -->
-    <skip />
-    <!-- no translation found for zen_category_schedule (9000447592251450453) -->
-    <skip />
-    <!-- no translation found for zen_sound_title (424490228488531372) -->
-    <skip />
-    <!-- no translation found for zen_sound_footer (7621745273287208979) -->
-    <skip />
-    <!-- no translation found for zen_sound_category_title (4336596939661729188) -->
-    <skip />
-    <!-- no translation found for zen_sound_all_muted (4850363350480968114) -->
-    <skip />
-    <!-- no translation found for zen_sound_none_muted (3938508512103612527) -->
-    <skip />
-    <!-- no translation found for zen_sound_one_allowed (8447313454438932276) -->
-    <skip />
-    <!-- no translation found for zen_sound_two_allowed (980491120444358550) -->
-    <skip />
-    <!-- no translation found for zen_sound_three_allowed (3455767205934547985) -->
-    <skip />
-    <!-- no translation found for zen_msg_event_reminder_title (5137894077488924820) -->
-    <skip />
-    <!-- no translation found for zen_msg_event_reminder_footer (3242847055412790819) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_category_behavior" msgid="2989256030084350296">"\'परेशान न करें\' सुविधा चालू होने पर विकल्पों में बदलाव"</string>
+    <string name="zen_category_exceptions" msgid="7601136604273265629">"सूचनाएं पाने के लिए इन ऐप्लिकेशन पर रोक न लगाएं"</string>
+    <string name="zen_category_schedule" msgid="9000447592251450453">"तय किया गया समय"</string>
+    <string name="zen_sound_title" msgid="424490228488531372">"आवाज़ और वाइब्रेशन"</string>
+    <string name="zen_sound_footer" msgid="7621745273287208979">"\'परेशान न करें\' सुविधा चालू होने पर आवाज़ और वाइब्रेशन बंद रहेंगे. हालांकि, जिन चीजों के लिए आपने मंज़ूरी दी है उनके लिए यह सुविधा काम नहीं करेगी."</string>
+    <string name="zen_sound_category_title" msgid="4336596939661729188">"इन्हें छोड़कर, बाकी सभी सूचनाओं को म्यूट करें"</string>
+    <string name="zen_sound_all_muted" msgid="4850363350480968114">"म्यूट किया गया"</string>
+    <string name="zen_sound_none_muted" msgid="3938508512103612527">"म्यूट नहीं है"</string>
+    <string name="zen_sound_one_allowed" msgid="8447313454438932276">"म्यूट किया गया है लेकिन <xliff:g id="SOUND_TYPE">%1$s</xliff:g> को मंज़ूरी दी गई है"</string>
+    <string name="zen_sound_two_allowed" msgid="980491120444358550">"म्यूट किया गया है लेकिन <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> और <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> को मंज़ूरी दें"</string>
+    <string name="zen_sound_three_allowed" msgid="3455767205934547985">"म्यूट किया गया है लेकिन <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> और <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> को मंज़ूरी दी गई है"</string>
+    <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"मैसेज, इवेंट और रिमाइंडर"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"\'परेशान न करें\' सुविधा चालू होने पर मैसेज, रिमाइंडर और इवेंट की सूचनाएं म्यूट कर दी जाएंगी. आपको सिर्फ़ उन ही सूचनाओं की आवाज़ सुनाई देगी या वाइब्रेशन महसूस होगा जिनके लिए आप मंज़ूरी देंगे. आप मैसेज सेटिंग में बदलाव कर अपने दोस्तों, परिवार के लोगों और अन्य संपर्कों के मैसेज की सूचना मिलने की मंज़ूरी दे सकते हैं."</string>
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"हो गया"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"सेटिंग"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"सूचनाएं आने पर न तो स्क्रीन पर कुछ दिखे और न ही कोई आवाज़ सुनाई दे"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"सूचना आने पर कोई आवाज़ न हो"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"अगर आप यह सेटिंग चुनते हैं तो, सूचना आने पर न तो स्क्रीन पर कुछ दिखाया जाएगा और न ही कोई आवाज़ आएगी. पसंदीदा संपर्कों और दोबारा (पहली बार कॉल रिसीव न करने के 15 मिनट के अंदर ही दोबारा) कॉल करने वालों के कॉल आने दिए जाएंगे."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(मौजूदा सेटिंग)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"क्या आप \'परेशान न करें\' की सूचना सेटिंग में बदलाव करना चाहते हैं?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"कार्य प्रोफ़ाइल की ध्वनियां"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"व्यक्तिगत प्रोफाइल ध्वनि काम में लें"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"कार्य और व्यक्तिगत प्रोफ़ाइल के लिए ध्वनियां एक समान होती हैं"</string>
@@ -3240,9 +3218,9 @@
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"आवाज़ की अनुमति दें"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"सूचनाएं कभी न दिखाएं"</string>
     <string name="notification_importance_min" msgid="9054819132085066824">"बिना आवाज़ के दिखाएं और छोटा करें"</string>
-    <string name="notification_importance_low" msgid="2445139943005315690">"मौन रूप से दिखाएं"</string>
-    <string name="notification_importance_default" msgid="5958338024601957516">"ध्वनि करें"</string>
-    <string name="notification_importance_high" msgid="2082429479238228527">"ध्वनि करें और स्क्रीन पर दिखाएं"</string>
+    <string name="notification_importance_low" msgid="2445139943005315690">"बिना आवाज़ के दिखाएं"</string>
+    <string name="notification_importance_default" msgid="5958338024601957516">"रिंगटोन सेट करें"</string>
+    <string name="notification_importance_high" msgid="2082429479238228527">"रिंगटोन सेट करें और स्क्रीन पर दिखाएं"</string>
     <string name="notification_importance_high_silent" msgid="2667033773703765252">"स्क्रीन पर दिखाएं"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"कम"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"मध्यम"</string>
@@ -3316,8 +3294,8 @@
     <string name="notification_content_block_summary" msgid="7746185794438882389">"सूचना कभी भी शेड में या पेरिफ़ेरल डिवाइस पर ना दिखाएं"</string>
     <string name="notification_badge_title" msgid="6370122441168519809">"नई सूचनाएं बताने वाले गोल निशान की अनुमति दें"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"सूचना बिंदु दिखाएं"</string>
-    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"परेशान न करें को बदलें"</string>
-    <string name="app_notification_override_dnd_summary" msgid="2612502099373472686">"परेशान न करें सुविधा चालू होने पर भी ये सूचनाएं दिखाना जारी रखें"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\'परेशान न करें\' मोड बंद करें"</string>
+    <string name="app_notification_override_dnd_summary" msgid="2612502099373472686">"\'परेशान न करें\' मोड चालू होने पर भी ये सूचनाएं दिखाना जारी रखें"</string>
     <string name="app_notification_visibility_override_title" msgid="7821124557634786985">"लॉक स्क्रीन पर दिखाई दे"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"अवरोधित"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"प्राथमिकता"</string>
@@ -3368,54 +3346,35 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> से <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"कॉल"</string>
-    <!-- no translation found for zen_mode_calls_title (623395033931747661) -->
-    <skip />
-    <!-- no translation found for zen_mode_calls_footer (3618700268458237781) -->
-    <skip />
+    <string name="zen_mode_calls_title" msgid="623395033931747661">"कॉल आने की मंज़ूरी दें"</string>
+    <string name="zen_mode_calls_footer" msgid="3618700268458237781">"\'परेशान न करें\' सुविधा चालू होने पर आने वाले (इनकमिंग) कॉल पर रोक लगा दी जाएगी. आप सेटिंग में अपने हिसाब से बदलाव कर अपने दोस्तों, परिवार के सदस्यों और दूसरे संपर्कों के कॉल आने की मंज़ूरी दे सकते हैं."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"तारे के निशान वाले संपर्क"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">और <xliff:g id="NUM_PEOPLE">%d</xliff:g> दूसरे संपर्क</item>
-      <item quantity="other">और <xliff:g id="NUM_PEOPLE">%d</xliff:g> दूसरे संपर्क</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"मैसेज"</string>
-    <!-- no translation found for zen_mode_messages_title (7729380010396411129) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_messages (8257021584561639816) -->
-    <skip />
-    <!-- no translation found for zen_mode_selected_messages (1047355526202106114) -->
-    <skip />
+    <string name="zen_mode_messages_title" msgid="7729380010396411129">"मैसेज दिखाने की मंज़ूरी दें"</string>
+    <string name="zen_mode_all_messages" msgid="8257021584561639816">"मैसेज"</string>
+    <string name="zen_mode_selected_messages" msgid="1047355526202106114">"कुछ मैसेज के लिए"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"किसी से भी"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"सिर्फ़ संपर्कों से"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"सिर्फ़ तारांकित संपर्कों से"</string>
-    <!-- no translation found for zen_calls_summary_starred_repeat (4046151920710059778) -->
-    <skip />
-    <!-- no translation found for zen_calls_summary_contacts_repeat (1528716671301999084) -->
-    <skip />
-    <!-- no translation found for zen_calls_summary_repeat_only (7105261473107715445) -->
-    <skip />
+    <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"तारे के निशान वाले संपर्कों और बार-बार कॉल करने वाले लोगों के कॉल"</string>
+    <string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"सिर्फ़ संपर्कों और बार-बार कॉल करने वाले लोगों के कॉल"</string>
+    <string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"सिर्फ़ बार-बार कॉल करने वाले लोगों के कॉल"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"कोई नहीं"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"अलार्म"</string>
     <string name="zen_mode_media" msgid="8808264142134422380">"मीडिया"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"छूने पर आने वाली आवाज़ें"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"रिमाइंडर"</string>
-    <!-- no translation found for zen_mode_reminders_title (2345044406347406902) -->
-    <skip />
+    <string name="zen_mode_reminders_title" msgid="2345044406347406902">"रिमाइंडर दिखाने की मंज़ूरी दें"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"इवेंट"</string>
-    <!-- no translation found for zen_mode_events_title (5597241655883329085) -->
-    <skip />
-    <!-- no translation found for zen_mode_all_callers (2378065871253871057) -->
-    <skip />
-    <!-- no translation found for zen_mode_contacts_callers (5569804103920394175) -->
-    <skip />
-    <!-- no translation found for zen_mode_starred_callers (1023167821338514140) -->
-    <skip />
+    <string name="zen_mode_events_title" msgid="5597241655883329085">"इवेंट दिखाने की मंज़ूरी दें"</string>
+    <string name="zen_mode_all_callers" msgid="2378065871253871057">"सभी के कॉल"</string>
+    <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"संपर्क"</string>
+    <string name="zen_mode_starred_callers" msgid="1023167821338514140">"तारे के निशान वाले संपर्क"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"बार-बार कॉल करने वाले (कॉलर)"</string>
-    <!-- no translation found for zen_mode_repeat_callers_title (8553876328249671783) -->
-    <skip />
-    <!-- no translation found for zen_mode_calls_summary_one (3972333792749874863) -->
-    <skip />
-    <!-- no translation found for zen_mode_calls_summary_two (6592821501321201329) -->
-    <skip />
+    <string name="zen_mode_repeat_callers_title" msgid="8553876328249671783">"15 मिनट में दूसरी बार काॅल करने वाले लोगों (कॉलर) के काॅल दिखाएं"</string>
+    <string name="zen_mode_calls_summary_one" msgid="3972333792749874863">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> के काॅल"</string>
+    <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"सिर्फ़ <xliff:g id="CALLER_TYPE">%1$s</xliff:g> और <xliff:g id="CALLERT_TPYE">%2$s</xliff:g> के कॉल आने पर"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"अगर कोई व्यक्ति <xliff:g id="MINUTES">%d</xliff:g> मिनट के अंदर दोबारा कॉल करे"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"पसंद के मुताबिक"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"स्वचालित रूप से चालू"</string>
@@ -3820,10 +3779,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"शीतल रंग तापमान"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"डिसप्ले में हलके रंगों का इस्तेमाल करें"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"रंग बदलाव लागू करने के लिए, स्‍क्रीन बंद करें"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"कनेक्टिविटी मॉनिटर"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"कनेक्टिविटी से जुड़ी किसी समस्या का पता चलने पर, कनेक्टिविटी मॉनिटर लॉग इकट्ठा करता है और उपयोगकर्ता को गड़बड़ी की जानकारी दर्ज करने के लिए सूचना देता है"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"कनेक्टिविटी मॉनीटर वाले बदलाव लागू करने के लिए, डिवाइस फिर से चालू करें"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"कैमरा लेज़र सेंसर"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"\'लॉजिकल कैमरा\' को डिफ़ॉल्ट कैमरे के तौर पर सेट करें"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"अपने आप होने वाले सिस्टम अपडेट"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"डिवाइस फिर से चालू होने पर अपडेट लागू करें"</string>
     <string name="usage" msgid="2977875522080448986">"उपयोग"</string>
@@ -3931,7 +3888,7 @@
     <string name="notification_log_details_icon" msgid="8939114059726188218">"आइकॉन"</string>
     <string name="notification_log_details_parcel" msgid="243148037601903212">"पार्सल का आकार"</string>
     <string name="notification_log_details_ashmem" msgid="7241814108477320636">"ashmem"</string>
-    <string name="notification_log_details_sound" msgid="5506232879598808099">"आवाज़"</string>
+    <string name="notification_log_details_sound" msgid="5506232879598808099">"साउंड"</string>
     <string name="notification_log_details_vibrate" msgid="6890065466625335940">"कंपन (वाइब्रेशन)"</string>
     <string name="notification_log_details_default" msgid="2345249399796730861">"डिफ़ॉल्ट"</string>
     <string name="notification_log_details_none" msgid="184131801230614059">"कोई नहीं"</string>
@@ -3952,8 +3909,7 @@
     <string name="notification_suggestion_title" msgid="387052719462473500">"लॉक स्क्रीन पर मौजूद जानकारी नियंत्रित करें"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"सूचना की सामग्री दिखाएं या छिपाएं"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"सभी"</string>
-    <!-- no translation found for page_tab_title_support (4407600495101788249) -->
-    <skip />
+    <string name="page_tab_title_support" msgid="4407600495101788249">"सलाह और सहायता"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"सबसे कम चौड़ाई की स्क्रीन सेट करें"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"इंस्टॉल किए गए किसी भी ऐप ने प्रीमियम मैसेज (एसएमएस) की पहुंच का अनुरोध नहीं किया है"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"प्रीमियम मैसेज (एसएमएस) के लिए आपको पैसे देने पड़ सकते हैं और इससे आपकी मोबाइल और इंटरनेट सेवा देने वाली कंपनी का बिल बढ़ जाएगा. अगर आप किसी ऐप के लिए अनुमति देते हैं, तो आप उस ऐप का इस्तेमाल करके प्रीमियम मैसेज (एसएमएस) भेज सकते हैं."</string>
@@ -3962,8 +3918,8 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> से कनेक्‍ट है"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"कई डिवाइस से कनेक्ट है"</string>
     <string name="demo_mode" msgid="2798762752209330277">"सिस्टम यूज़र इंटरफ़ेस (यूआई) डेमो मोड"</string>
-    <string name="dark_ui_mode" msgid="2112241426441807273">"नाइट मोड"</string>
-    <string name="dark_ui_mode_title" msgid="975299966259850992">"नाइट मोड सेट करें"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"रात वाला मोड"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"रात वाला मोड सेट करें"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"त्वरित सेटिंग डेवलपर टाइल"</string>
     <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope ट्रेस"</string>
     <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
@@ -4108,7 +4064,7 @@
       <item quantity="one">ईमेल क्लाइंट ऐप्लिकेशन</item>
       <item quantity="other">ईमेल क्लाइंट ऐप्लिकेशन</item>
     </plurals>
-    <string name="default_map_app_title" msgid="7560143381633608567">"मानचित्र ऐप्लिकेशन"</string>
+    <string name="default_map_app_title" msgid="7560143381633608567">"मैप ऐप्लिकेशन"</string>
     <plurals name="default_phone_app_title" formatted="false" msgid="6714041230953195024">
       <item quantity="one">फ़ोन ऐप्लिकेशन</item>
       <item quantity="other">फ़ोन ऐप्लिकेशन</item>
@@ -4134,8 +4090,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"ऑटोमैटिक भरने की सेवा"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"ऑटो, भरना, ऑटोमैटिक भरना"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;सुनिश्चित करें कि आप इस ऐप्लिकेशन पर भरोसा करते हैं&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google ऑटोमैटिक भरना&gt;%1$s&lt;/xliff:g&gt; ऑटोमैटिक भरी जा सकने वाली चीज़ें निर्धारित करने के लिए आपकी स्क्रीन पर मौजूद चीज़ों का उपयोग करता है."</string>
-    <string name="device_theme" msgid="4571803018917608588">"डिवाइस की थीम"</string>
+    <string name="color_theme" msgid="1535685696756738324">"रंग थीम"</string>
     <string name="default_theme" msgid="7085644992078579076">"डिफ़ॉल्ट"</string>
+    <string name="device_theme" msgid="4571803018917608588">"डिवाइस की थीम"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"अपने आप सेट होने वाली थीम (वॉलपेपर के हिसाब से)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"हल्के रंग की थीम"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"गहरे रंग की थीम"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"नेटवर्क का नाम"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"स्टेटस बार में नेटवर्क का नाम दिखाएं"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"जगह प्रबंधक: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4147,7 +4107,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी की नेटवर्क से जुड़ी जानकारी"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी का नेटवर्क ट्रिगर करें"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"\'परेशान न करें सुविधा\' अपडेट करें"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"किसी काम में ध्यान लगाने के लिए डिवाइस की सूचनाएं छिपाएं"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"ध्यान भटकने से रोकने के लिए डिवाइस की सूचनाओं को कुछ समय के लिए रोकें"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"नया और रोमांचक क्या है?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"अपने नए फ़ोन के बारे में अच्छी तरह जानें"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"अपने नए टैबलेट के बारे में अच्छी तरह जानें"</string>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 3ba8253..94a8da3 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Uvijek uključeno"</item>
     <item msgid="6385301106124765323">"Uvijek isključeno"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 5c60e1a..31eac4b 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -174,6 +174,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Dopustite tabletu da komunicira s Bluetooth uređajima u blizini"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Dopustite uređaju da komunicira s Bluetooth uređajima u blizini"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Dopustite telefonu da komunicira s Bluetooth uređajima u blizini"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Onemogući Bluetooth A2DP hardversko rasterećenje"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Ponovo pokrenuti?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Ponovo pokrenite uređaj da biste promijenili tu postavku."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Pokreni"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Odustani"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Dostupni medijski uređaji"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Dostupni uređaji za pozive"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Trenutačno povezano"</string>
@@ -183,6 +188,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Postavke veze"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Prethodno povezani uređaji"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Prethodno povezano"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Datum i vrijeme"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Odabir vremenske zone"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -208,11 +215,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Upisani priključak nije valjan."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Preglednik upotrebljava HTTP proxy poslužitelj, ali druge aplikacije ne mogu ga upotrebljavati."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"URL za PAC: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL propusnost (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL propusnost (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Informacije o lokaciji ćelije (obustavljeno):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Informacije o susjednoj ćeliji (obustavljeno):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Konfiguracija LTE fizičkog kanala:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Stopa osvježavanja informacija u ćeliji:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Sve informacije ćelija o mjerenju:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Informacije o podatkovnom povezivanju u stvarnom vremenu:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Podatkovna usluga:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1162,8 +1170,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatska svjetlina"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Aktivacija podizanjem"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambijentalni zaslon"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Uvijek uključen/povećana potrošnja baterije"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nove obavijesti"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kada prikazati"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nove obavijesti"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Aktiviraj zaslon kada stigne obavijest"</string>
@@ -1209,8 +1215,6 @@
       <item quantity="other">Netočan PIN kôd SIM kartice; imate još <xliff:g id="NUMBER_1">%d</xliff:g> pokušaja.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Operacija PIN-a SIM kartice nije uspjela!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status tabletnog uređaja"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Status telefona"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Ažuriranja sustava"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Verzija sustava Android"</string>
@@ -2467,6 +2471,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Signal za hitne pozive"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Postavite način ponašanja za hitni poziv"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Sigurnosna kopija"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Uključeno"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Isključeno"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Sigurnosna kopija i vraćanje"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Osobni podaci"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Sigurnosno kopiranje"</string>
@@ -2797,6 +2803,12 @@
       <item quantity="other">Provjeri certifikate</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Više korisnika"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Korisnici i profili"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Dodavanje korisnika ili profila"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Dodaj korisnika"</string>
@@ -2980,14 +2992,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"potrošnja podatkovnog prometa"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"žarišna točka"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Povezani uređaji"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, način za vožnju, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, način za vožnju"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacije i obavijesti"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Dopuštenja, zadane aplikacije"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Računi"</string>
@@ -3004,7 +3012,6 @@
     <string name="keywords_home" msgid="294182527446892659">"pokretač, zadano, aplikacije"</string>
     <string name="keywords_display" msgid="8910345814565493016">"zaslon, dodirni zaslon"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"zatamnjenje zaslona, dodirni zaslon, baterija, svijetlo"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"zatamnjenje zaslona, dodirni zaslon, baterija"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"zatamnjenje zaslona, noć, nijansa, noćna smjena, svjetlina, boja zaslona, boja"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"pozadina, personalizirati, prilagoditi, zaslon"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"veličina teksta"</string>
@@ -3045,8 +3052,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"mreža, stanje mobilne mreže, stanje usluge, jačina signala, vrsta mobilne mreže, roaming, ICCID"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"serijski broj, verzija hardvera"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"razina Androidove sigurnosne zakrpe, verzija osnovnog frekvencijskog pojasa, verzija jezgre"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambijentalni zaslon, prikaz zaključanog zaslona"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"otisak prsta"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"zatamnjenje zaslona, dodirni zaslon, baterija, pametna svjetlina, dinamična svjetlina"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"zakrenuti, okrenuti, rotacija, portret, pejzaž, usmjerenje, okomito, vodoravno"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"nadogradnja, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, raspored, obavijesti, blokiranje, tišina, vibracija, mirovanje, rad, fokus, zvuk, utišano, dan, dan u tjednu, vikend, noć tijekom tjedna, događaj"</string>
@@ -3130,18 +3140,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Dopusti vizualne signale"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Kada je uključen način Ne uznemiravaj"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Obavijesti"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Prikaži obavijesti tiho"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Obavijesti će se zanemariti"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Bez zvuka obavijesti"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Vidjet ćete obavijesti na zaslonu"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Kada obavijesti stignu, telefon neće davati zvučne signale niti vibrirati."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Sakrij obavijesti"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Nećete vidjeti nove ni postojeće obavijesti"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Bez vizualnih i zvučnih signala obavijesti"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Obavijesti se neće prikazivati niti davati zvučne signale"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Na telefonu se neće prikazivati nove ni postojeće obavijesti i neće biti zvučnih signala ni vibriranja. Obavijesti se neće prikazivati kada prijeđete prstom prema dolje od vrha zaslona.\n\nNapominjemo da će se obavijesti kritične za aktivnost i status telefona i dalje prikazivati."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Prilagođeno"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Omogući prilagođenu postavku"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Ukloni prilagođenu postavku"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Pojavit će se"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Bez zvuka obavijesti"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Djelomično skriveno"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Skriveno"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Bez vizualnih i zvučnih signala obavijesti"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Prilagođena ograničenja"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Kad je zaslon uključen"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Kad je zaslon isključen"</string>
@@ -3202,19 +3212,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Zanemareno, ali dopusti <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> i <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Poruke, događaji i podsjetnici"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Kada je način Ne uznemiravaj uključen, zanemarit će se poruke, podsjetnici i događaji, osim prethodno navedenih stavki koje dopustite. Možete prilagoditi postavke poruka da bi vaša obitelj, prijatelji ili drugi kontakti mogli stupiti u kontakt s vama."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Gotovo"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Postavke"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Bez vizualnih i zvučnih signala obavijesti"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Bez zvuka obavijesti"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Obavijesti se neće prikazivati niti davati zvučne signale. Dopušteni su pozivi kontakata označenih zvjezdicom i ponovnih pozivatelja."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Trenutačna postavka)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Želite li promijeniti postavke obavijesti za način Ne uznemiravaj?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Zvukovi radnog profila"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Upotreba zvuka osobnog profila"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Zvukovi su isti za radni i osobni profil"</string>
@@ -3390,11 +3394,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Dopusti pozive"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Kada je način Ne uznemiravaj uključen, dolazni se pozivi blokiraju. Možete prilagoditi postavke da bi vaša obitelj, prijatelji ili drugi kontakti mogli stupiti u kontakt s vama."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Kontakti označeni zvjezdicom"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">i <xliff:g id="NUM_PEOPLE">%d</xliff:g> drugi</item>
-      <item quantity="few">i <xliff:g id="NUM_PEOPLE">%d</xliff:g> druga</item>
-      <item quantity="other">i <xliff:g id="NUM_PEOPLE">%d</xliff:g> drugih</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Poruke"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Dopusti poruke"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Poruke"</string>
@@ -3837,10 +3837,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Hladna temperatura boje"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Upotrebljavaj hladnije boje prikaza"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Da biste primijenili promjenu boje, isključite zaslon"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitor povezivanja"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Monitor povezivanja prikupljat će zapisnike kada otkrije problem s povezivanjem i obavijestiti korisnika da prijavi programsku pogrešku"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Da biste primijenili promjenu koju je izvršio monitor povezivanja, ponovo pokrenite uređaj."</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Laserski senzor fotoaparata"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Logična kamera kao zadano"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatska ažuriranja sustava"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Primijeni ažuriranja pri ponovnom pokretanju uređaja"</string>
     <string name="usage" msgid="2977875522080448986">"Potrošnja"</string>
@@ -4164,8 +4162,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Usluga automatskog popunjavanja"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatski, popunjavanje, automatsko popunjavanje"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Provjerite je li ova aplikacija pouzdana&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google automatsko popunjavanje&gt;%1$s&lt;/xliff:g&gt; upotrebljava sadržaj na zaslonu za procjenu onoga što se može automatski popuniti."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Tema uređaja"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Tema u boji"</string>
     <string name="default_theme" msgid="7085644992078579076">"Zadano"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Tema uređaja"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automatski (na temelju pozadine)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Svijetlo"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Tamno"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Naziv mreže"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Prikaz naziva mreže na traci statusa"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Upravitelj pohrane: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4177,7 +4179,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informacije o uslugama mobilnog operatera"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Pokretanje usluga mobilnog operatera"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Ažuriranje načina Ne uznemiravaj"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Skrivanje obavijesti da biste ostali usredotočeni"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pauzirajte obavijesti da biste ostali usredotočeni"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Što je novo i uzbudljivo?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Upoznajte svoj novi telefon"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Upoznajte svoj novi tablet"</string>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index 1125d17..2ae3d36 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Mindig bekapcsolva"</item>
     <item msgid="6385301106124765323">"Mindig kikapcsolva"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 5e8074f..e547d7d 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Táblagépe kommunikálhat a közeli Bluetooth-eszközökkel"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Eszköze kommunikálhat a közeli Bluetooth-eszközökkel"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Telefonja kommunikálhat a közeli Bluetooth-eszközökkel"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Bluetooth A2DP hardver tehermentesítésének letiltása"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Újraindítja az eszközt?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"A beállítás módosításához újra kell indítania az eszközt."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Újraindít"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Mégse"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Rendelkezésre álló médiaeszközök"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Rendelkezésre álló hívóeszközök"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Csatlakoztatva"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Kapcsolati beállítások"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Korábban csatlakoztatott eszközök"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Korábban csatlakoztatva"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Dátum és idő"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Válasszon időzónát"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"A megadott port nem érvényes."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"A HTTP proxyt a böngésző használja, ám más alkalmazások nem használhatják."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Letöltési sávszélesség (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Feltöltési sávszélesség (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Mobilos helyadatok (megszűnt):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Szomszédos cellainformáció (megszűnt):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE fizikai csatorna konfigurációja:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Cellainformáció frissítési gyakorisága:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Minden cellamérési információ:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Adathálózattal kapcsolatos valós idejű információk:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Adatszolgáltatás:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Barangolás:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatikus fényerő"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Felébresztéshez emelje meg"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Környezeti kijelző"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Mindig be/Megnövekedett akkumulátorhasználat"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Új értesítések"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Mikor jelenjen meg?"</string>
     <string name="doze_title" msgid="2375510714460456687">"Új értesítések"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Képernyő felébresztése értesítés érkezésekor"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">A SIM-kártya PIN-kódja helytelen. <xliff:g id="NUMBER_0">%d</xliff:g> próbálkozás maradt. Utána a szolgáltatótól kell feloldást kérnie.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"A SIM-kártya PIN-művelete sikertelen!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Táblagép állapota"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefon állapota"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Rendszerfrissítések"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android verziója"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"A háttérben történő használat nem korlátozható"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Korlátozza a háttértevékenységet?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ha korlátozza az alkalmazások háttértevékenységét, lehetséges, hogy hibásan fognak működni"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Az alkalmazás nem korlátozható, mert nincs beállítva az akkumulátor optimalizálására.\n\nA korlátozáshoz kapcsolja be az akkumulátoroptimalizálást."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Képernyőhasználat teljes feltöltés óta"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"A képernyő energiafogyasztása"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobilhálózat keresése"</string>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Segélyhívó jelzés"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Viselkedés beállítása segélyhívás kezdeményezésekor"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Biztonsági másolat"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Be"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Ki"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Biztonsági mentés és visszaállítás"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Személyes adatok"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Adatok mentése"</string>
@@ -2761,6 +2766,12 @@
       <item quantity="one">Tanúsítvány ellenőrzése</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Több felhasználó"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Felhasználók és profilok"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Felhasználó vagy profil hozzáadása"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Felhasználó hozzáadása"</string>
@@ -2943,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"adathasználat"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Társított eszközök"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, vezetési mód, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, vezetési mód"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Alkalmazások és értesítések"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Engedélyek, alapértelmezett alkalmazások"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Fiókok"</string>
@@ -2967,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"indító, alapértelmezett, alkalmazások"</string>
     <string name="keywords_display" msgid="8910345814565493016">"képernyő, érintőképernyő"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"képernyő halványítása, érintőképernyő, akkumulátor, fényes"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"képernyő halványítása, érintőképernyő, akkumulátor"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"képernyő halványítása, éjszaka, színárnyalat, éjszakai, fényerő, képernyő színe, szín"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"háttér, személyre szabás, kijelző testreszabása"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"betűméret"</string>
@@ -3008,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"hálózat, mobilhálózat állapota, szolgáltatás állapota, jelerősség, mobilhálózat típusa, barangolás, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"sorozatszám, hardververzió"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"androidos biztonsági javítókészlet szintje, alapsáv verziója, kernel verziója"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Aktív kijelző, lezárási képernyő"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"ujjlenyomat"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"elforgatás, elfordítás, forgatás, álló, fekvő, tájolás, függőleges, vízszintes"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"verziófrissítés, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"ne zavarjanak, ütemezés, értesítések, letiltás, néma, rezgés, alvó mód, munka, fókusz, hang, némítás, nap, hétköznap, hétvége, hétköznap este, esemény"</string>
@@ -3092,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Vizuális jelek engedélyezése"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Ha a „Ne zavarjanak” mód aktív"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Értesítések"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Értesítések hangtalan megjelenítése"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Az értesítések némítva lesznek"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Nincs hang az értesítéseknél"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Az értesítések megjelennek a képernyőn"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Amikor értesítés érkezik, a telefon nem ad ki hangot, és nem rezeg."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Értesítések elrejtése"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Nem jelennek meg az új és a már meglévő értesítések"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Nincs hang vagy vizuális jelzés az értesítéseknél"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Nem fog értesítéseket látni vagy hallani"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"A telefonja nem jelenít meg új vagy meglévő értesítéseket, és nem csörög vagy rezeg. Az értesítések nem jelennek meg, amikor lecsúsztatja ujját a képernyő tetejétől.\n\nA telefon funkcióival és állapotával kapcsolatos fontos értesítések azonban így is megjelennek."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Egyéni"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Egyéni beállítás engedélyezése"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Egyéni beállítás törlése"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Megjelenítve"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Nincs hang az értesítéseknél"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Részben elrejtve"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Elrejtve"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Nincs hang vagy vizuális jelzés az értesítéseknél"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Egyéni korlátozások"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Ha a képernyő be van kapcsolva"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Ha a képernyő ki van kapcsolva"</string>
@@ -3162,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Némítva, de a(z) <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> és <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> hangjainak engedélyezése"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Üzenetek, események és emlékeztetők"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Ha a „Ne zavarjanak” mód aktív, akkor az SMS-ek, emlékeztetők és események némítva lesznek, kivéve a fent engedélyezett elemeket. Az üzenetek beállításainak megadásával lehetővé teheti, hogy ismerősei, családtagjai vagy más névjegyei elérhessék Önt."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Kész"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Beállítások"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Nincs hang vagy vizuális jelzés az értesítéseknél"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Nincs hang az értesítéseknél"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Nem fog értesítéseket látni vagy hallani. A csillaggal megjelölt névjegyektől és az ismétlődő hívóktól érkező hívások engedélyezettek."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Jelenlegi beállítás)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Módosítja a „Ne zavarjanak” értesítési beállításokat?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Munkaprofil hangebállításai"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Személyes profil hangjainak használata"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"A munkahelyi és a személyes profil hangjai megegyeznek"</string>
@@ -3346,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Hívások engedélyezése"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Ha a „Ne zavarjanak” mód aktív, akkor a bejövő hívások tiltva vannak. A beállítások módosításával lehetővé teheti, hogy ismerősei, családtagjai vagy más névjegyei elérhessék Önt."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Csillagozott névjegyek"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">és <xliff:g id="NUM_PEOPLE">%d</xliff:g> további</item>
-      <item quantity="one">és 1 további</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Üzenetek"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Üzenetek engedélyezése"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Üzenetek"</string>
@@ -3779,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Hideg színhőmérséklet"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Hidegebb színhőmérséklet használata a kijelzőn"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"A színmódosítások alkalmazásához kapcsolja ki a képernyőt"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Kapcsolódásfigyelő"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"A Kapcsolódásfigyelő begyűjti a naplókat, amikor kapcsolódási problémát észlel, és értesítésben javasolja a felhasználónak a hiba jelentését"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"A kapcsolódásfigyelő módosításának engedélyezéséhez indítsa újra az eszközt"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"A kamera lézeres érzékelője"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Logikai kamera alapértelmezettként"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatikus rendszerfrissítések"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Frissítések alkalmazása az eszköz újraindításakor"</string>
     <string name="usage" msgid="2977875522080448986">"Használat"</string>
@@ -4092,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Automatikus kitöltés"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatikus kitöltés, automatikus, kitöltés"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Győződjön meg arról, hogy az alkalmazás megbízható.&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; A(z) &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; az Ön képernyőjén szereplő információk alapján határozza meg, hogy mit lehet automatikusan kitölteni."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Eszköztéma"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Színösszeállítás"</string>
     <string name="default_theme" msgid="7085644992078579076">"Alapértelmezett"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Eszköztéma"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automatikus (a háttérkép alapján)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Világos"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Sötét"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Hálózat neve"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Hálózati név megjelenítése az állapotsorban"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Tárhelykezelő: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4105,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Információ a szolgáltatói hozzáférésről"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Szolgáltatói ellátás aktiválása"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"A Ne zavarjanak mód frissítése"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Értesítések elrejtése, hogy ne zavarják a koncentrálásban"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Az összpontosításhoz szüneteltetheti az értesítéseket"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Mi új és említésre méltó?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Az új telefon bemutatójának megtekintése"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Az új táblagép bemutatójának megtekintése"</string>
diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml
index ee6827f..dcddd87 100644
--- a/res/values-hy/arrays.xml
+++ b/res/values-hy/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Միշտ միացված է"</item>
     <item msgid="6385301106124765323">"Միշտ անջատած է"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 50ebc67..50a0894 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Թույլատրել պլանշետին միանալ մոտակայքում գտնվող Bluetooth սարքերին"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Թույլատրել սարքին միանալ մոտակայքում գտնվող Bluetooth սարքերին"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Թույլատրել հեռախոսին միանալ մոտակայքում գտնվող Bluetooth սարքերին"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Անջատել Bluetooth A2DP-ի բեռնաթափումը"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Վերագործարկե՞լ սարքը"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Վերագործարկեք սարքը՝ այս կարգավորումը փոխելու համար:"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Վերագործարկել"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Չեղարկել"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Հասանելի մեդիա սարքեր"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Հասանելի սարքեր զանգելու համար"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Ընթացիկ միացումներ"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Միացման կարգավորումներ"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Նախկինում միացված սարքեր"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Նախկինում միացված սարքեր"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Ամսաթիվ և ժամ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Ընտրել ժամային գոտին"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Ձեր մուտքագրած միացքը վավեր չէ:"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP պրոքսին օգտագործվում է դիտարկիչի կողմից, բայց չի կարող օգտագործվել այլ ծրագրերի կողմից:"</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL` "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL թողունակությունը (կբ/վ)՝"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL թողունակությունը (կբ/վ)՝"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Բջջի տեղադրության տվյալներ (հնացած)՝"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Հարևան բջջի տվյալներ (հնացած)՝"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE ֆիզիկական ալիքի կարգավորում՝"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Բջջի տվյալների թարմացման հաճախականությունը՝"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Բոլոր բջիջների չափման տվյալները՝"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Տվյալների կապի ընթացիկ տվյալներ՝"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Տվյալների ծառայություն՝"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Ռոումինգ`"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Ավտոմատ պայծառություն"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Բարձրացնել՝ միանալու համար"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ամբիենտ էկրան"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Մշտապես ակտիվ / Մարտկոցի ավելի երկար օգտագործում"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Նոր ծանուցումներ"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Երբ ցուցադրել"</string>
     <string name="doze_title" msgid="2375510714460456687">"Նոր ծանուցումներ"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Ակտիվացնել էկրանը ծանուցումներ ստանալու դեպքում"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="other">SIM PIN կոդը սխալ է: Մնաց <xliff:g id="NUMBER_1">%d</xliff:g> փորձ:</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM PIN կոդի գործողությունը ձախողվեց:"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Պլանշետի կարգավիճակը"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Հեռախոսի կարգավիճակը"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Համակարգի թարմացումներ"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android-ի տարբերակը"</string>
@@ -1717,7 +1721,7 @@
     <string name="default_emergency_app" msgid="1951760659640369980">"Արտակարգ իրավիճակների հավելված"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Զրոյացնել կարգավորումները"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Զրոյացնե՞լ կարգավորումները"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Կզրոյանան հետևյալ բոլոր կարգավորումները՝\n\n "<li>"Անջատած հավելվածները"</li>\n" "<li>"Հավելվածների անջատած ծանուցումները"</li>\n" "<li>"Կանխադրված հավելվածները"</li>\n" "<li>"Ֆոնային ռեժիմում տվյալների փոխանցման սահմանափակումները"</li>\n\n" "<li>"Թույլտվությունների բոլոր սահմանափակումները"</li>\n"BREAK_18 Հավելվածների տվյալները չեն կորի։"</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Կզրոյանան հետևյալ բոլոր կարգավորումները՝\n\n "<li>"Անջատած հավելվածները"</li>\n" "<li>"Հավելվածների անջատած ծանուցումները"</li>\n" "<li>"Կանխադրված հավելվածները"</li>\n" "<li>"Ֆոնային ռեժիմում տվյալների փոխանցման սահմանափակումները"</li>\n\n" "<li>"Թույլտվությունների բոլոր սահմանափակումները"</li>\n"Հավելվածների տվյալները չեն կորի։"</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Զրոյացնել"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Կառավարել տարածքը"</string>
     <string name="filter" msgid="2018011724373033887">"Զտիչ"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Ֆոնային ռեժիմում աշխատանքը հնարավոր չէ սահմանափակել"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Սահմանափակե՞լ ֆոնային գործողությունները"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Հավելվածի ֆոնային գործողությունների սահմանափակումը կարող է ազդել վերջինիս աշխատանքի վրա"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Մարտկոցի օպտիմալացումն այս հավելվածի համար կարգավորված չէ։\n\nՄիացրեք այն՝ հավելվածը սահմանափակելու համար։"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Էկրանի օգտագործումը վերջին լրիվ լիցքավորումից հետո"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Էկրան"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Բջջային ցանցի որոնում"</string>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Արտակարգ կանչի համարհավաքման ազդանշան"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Կարգավորել աշխատանքի ռեժիմը շտապ կանչի դեպքում"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Պահուստավորում"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Միացված է"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Անջատված է"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Պահուստավորել և վերականգնել"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Անձնական տվյալներ"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Պահուստավորել իմ տվյալները"</string>
@@ -2761,6 +2766,12 @@
       <item quantity="other">Ստուգել վկայականները</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Մի քանի օգտատեր"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Օգտատերեր &amp; պրոֆիլներ"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Ավելացնել օգտատեր կամ պրոֆիլ"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Ավելացնել օգտատեր"</string>
@@ -2943,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"տվյալների օգտագործում"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"թեժ կետ"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Միացված սարքեր"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, վարելու ռեժիմ, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, վարելու ռեժիմ"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Հավելվածներ և ծանուցումներ"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Թույլտվություններ, կանխադրված հավելվածներ"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Հաշիվներ"</string>
@@ -2967,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"գործարկիչ, կանխադրված, հավելվածներ, ծրագրեր"</string>
     <string name="keywords_display" msgid="8910345814565493016">"էկրան, հպէկրան"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"խամրեցված էկրան, հպէկրան, մարտկոց, պայծառ"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"խամրեցված էկրան, հպէկրան, մարտկոց"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"խամրեցնել էկրանը, գիշեր, երանգ, գիշերային ռեժիմ, պայծառություն, էկրանի գույն, գույն, գունավորում, լուսավորություն, լույս"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"ետին պլան, անհատականացնել, հարմարեցնել էկրանը"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"տեքստի չափը"</string>
@@ -3008,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"ցանց, բջջային ցանցի կարգավիճակ, ազդանշանի հզորություն, բջջային ցանցի տեսակ, ռոումինգ, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"սերիական համար, սարքակազմի տարբերակ"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"Android-ի խոցելիության շտկման մակարդակ, Baseband-ի տարբերակ, միջուկի տարբերակ"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ամբիենտ էկրան, կողպէկրան"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"մատնահետք"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"պտտել, շրջել, պտույտ, ուղղահայաց, հորիզոնական, դիրք, դիմանկար, բնանկար"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"թարմացնել, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"չանհանգստացնել, ժամանակացույց, ծանուցումներ, արգելափակել, անձայն ռեժիմ, թրթռալ, քուն, աշխատանք, կենտրոնացում, ձայն, անջատել ձայնը, օր, աշխատանքային օր, հանգստյան օր, աշխատանքային օրվա երեկո, միջոցառում"</string>
@@ -3092,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Թույլատրել տեսողական ազդանշանները"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Երբ «Չանհանգստացնել» ռեժիմը միացված է"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Ծանուցումներ"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Ցույց տալ ծանուցումներն առանց ձայնային ազդանշանի"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Ծանուցումների ձայնը կանջատվի"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Անջատել ծանուցումների ձայնը"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Ծանուցումները կցուցադրվեն էկրանին"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Երբ դուք ծանուցումներ ստանաք, հեռախոսում չի միանա ձայնային ազդանշան կամ թրթռոց:"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Թաքցնել ծանուցումները"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Դուք չեք տեսնի նոր և առկա ծանուցումները"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Ծանուցումներն ամբողջությամբ անջատել"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Ծանուցումներն ամբողջությամբ կանջատվեն։"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Ձեր հեռախոսում չեն ցուցադրվի նոր ու առկա ծանուցումները, և չի միանա ձայնային ազդանշան կամ թրթռոց: Ծանուցումները չեն հայտնվի, երբ դուք էկրանի վերևից մատը սահեցնեք ներքև:\n\nՆկատի առեք, որ հեռախոսի աշխատանքի ու կարգավիճակի մասին կարևոր ծանուցումները նախկինի պես կցուցադրվեն:"</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Հատուկ"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Միացնել հատուկ կարգավորումները"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Անջատել հատուկ կարգավորումները"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Ցուցադրել"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Անջատել ծանուցումների ձայնը"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Մասամբ թաքցնել"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Թաքցնել"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Ծանուցումներն ամբողջությամբ անջատել"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Հատուկ սահմանափակումներ"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Երբ էկրանը միացված է"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Երբ էկրանն անջատված է"</string>
@@ -3162,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Ձայնն անջատած է: Միայն թույլատրել <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>ը, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>ը և <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>ը"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Հաղորդագրություններ, իրադարձություններ և հիշեցումներ"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"«Չանհանգստացնել» ռեժիմում հաղորդագրությունների, հիշեցումների և իրադարձությունների համար ձայնն անջատվում է: Բացառություն են կազմում վերևում ձեր թույլատրած կետերը: Դուք կարող եք փոփոխել հաղորդագրությունների կարգավորումները, որպեսզի ձեր ընկերները, ընտանիքի անդամները և այլ կոնտակտներ կարողանան կապվել ձեզ հետ:"</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Պատրաստ է"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Կարգավորումներ"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Ծանուցումներն ամբողջությամբ անջատել"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Անջատել ծանուցումների ձայնը"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Ծանուցումներն ամբողջությամբ կանջատվեն։ Դուք զանգեր կստանաք միայն աստղանշված կոնտակտներից և մշտական զանգողներից։"</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(ընթացիկ կարգավորումը)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Փոփոխե՞լ «Չանհանգստացնել» ռեժիմի ծանուցումների կարգավորումները"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Աշխատանքային պրոֆիլի ձայները"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Օգտագործել անձնական պրոֆիլի ձայները"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Զանգերանգները նույնն են աշխատանքային և անձնական պրոֆիլների համար"</string>
@@ -3346,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Թույլատրել զանգերը"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"«Չանհանգստացնել» ռեժիմում մուտքային զանգերն արգելափակված են: Փոփոխեք կարգավորումները, որպեսզի ձեր մտերիմները և այլ կոնտակտներ կարողանան կապվել ձեզ հետ:"</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Աստղանշված կոնտակտներ"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">ու ևս <xliff:g id="NUM_PEOPLE">%d</xliff:g> հոգի</item>
-      <item quantity="other">ու ևս <xliff:g id="NUM_PEOPLE">%d</xliff:g> հոգի</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Հաղորդագրություններ"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Թույլատրել հաղորդագրությունները"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Հաղորդագրություններ"</string>
@@ -3779,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Գույնի սառը ջերմաստիճան"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Օգտագործել էկրանի ավելի սառը գույներ"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Գույնի փոփոխությունը կիրառելու համար անջատեք էկրանը"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Կապի հետ խնդիրներ հայտնաբերելու դեպքում Connectivity Monitor-ը կհավաքի մատյանները և օգտատիրոջը կհուշի վրիպակ գրանցելու անհրաժեշտության մասին"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"ConnectivityMonitor-ի փոփոխությունը կիրառելու համար վերագործարկեք սարքը"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Տեսախցիկի լազերային սենսոր"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Տրամաբանական տեսախցիկ՝ որպես կանխադրված"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Ավտոմատ համակարգային թարմացումներ"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Տեղադրել թարմացումները վերագործարկելիս"</string>
     <string name="usage" msgid="2977875522080448986">"Օգտագործում"</string>
@@ -4092,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Ինքնալրացման ծառայություն"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"ավտոմատ, լրացնել, ինքնալրացում"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Համոզվեք, որ վստահում եք այս հավելվածին&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt;-ն օգտագործում է էկրանի բովանդակությունը՝ որոշելու, թե ինչը կարող է ինքնալրացվել:"</string>
-    <string name="device_theme" msgid="4571803018917608588">"Սարքի թեման"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Գունային թեմա"</string>
     <string name="default_theme" msgid="7085644992078579076">"Կանխադրված"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Սարքի թեման"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Ավտոմատ (ըստ պաստառի)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Բաց"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Մուգ"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Ցանցի անունը"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Ցուցադրել ցանցի անունը կարգավիճակի գոտում"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Հիշողության կառավարիչ՝ <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4105,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Օպերատորի նախապատրաստման տվյալներ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Գործարկել օպերատորի նախապատրաստումը"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Թարմացնե՞լ «Չանհանգստացնել» ռեժիմը"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Թաքցրեք շեղող ծանուցումները"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Չցուցադրել շեղող ծանուցումները"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Ի՞նչ նորույթներ կան:"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Ծանոթացեք ձեր նոր հեռախոսին"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Ծանոթացեք ձեր նոր պլանշետին"</string>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 56d0377..0f8f82a 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Selalu aktif"</item>
     <item msgid="6385301106124765323">"Selalu nonaktif"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 9bbadd6..b2486fd 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Memungkinkan tablet Anda berkomunikasi dengan perangkat Bluetooth di sekitar"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Memungkinkan perangkat Anda berkomunikasi dengan perangkat Bluetooth di sekitar"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Memungkinkan ponsel Anda berkomunikasi dengan perangkat Bluetooth di sekitar"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Nonaktifkan offload hardware Bluetooth A2DP"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Mulai Ulang Perangkat?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Anda perlu memulai ulang perangkat untuk mengubah setelan."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Mulai Ulang"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Batal"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Perangkat media yang tersedia"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Perangkat panggilan yang tersedia"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Terhubung saat ini"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Preferensi sambungan"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Perangkat yang terhubung sebelumnya"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Perangkat yang terhubung sebelumnya"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Tanggal &amp; waktu"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Pilih zona waktu"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Port yang Anda ketik tidak valid."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy HTTP digunakan oleh browser, namun tidak boleh digunakan oleh aplikasi lain."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"URL PAC: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Bandwidth DL (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Bandwidth UL (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Info Lokasi Sel (tidak digunakan lagi):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Info Sel Tetangga (tidak digunakan lagi):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Konfigurasi Saluran Fisik LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Rasio Penyegaran Info Sel"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Semua Info Pengukuran Sel:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Info Sambungan Data Langsung:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Layanan Data:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI"</string>
@@ -1007,16 +1015,11 @@
     <string name="emergency_address_title" msgid="932729250447887545">"Alamat Darurat"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Digunakan sebagai lokasi Anda ketika Anda melakukan panggilan darurat melalui Wi‑Fi"</string>
     <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Pelajari lebih lanjut"</annotation>" tentang fitur DNS Pribadi"</string>
-    <!-- no translation found for wifi_calling_pref_managed_by_carrier (6845711858866828986) -->
-    <skip />
-    <!-- no translation found for wifi_calling_settings_activation_instructions (7492509632478260955) -->
-    <skip />
-    <!-- no translation found for wifi_calling_turn_on (1171403510313983983) -->
-    <skip />
-    <!-- no translation found for wifi_calling_not_supported (7878640438907807754) -->
-    <skip />
-    <!-- no translation found for carrier (5264014738689761132) -->
-    <skip />
+    <string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Setelan dikelola oleh operator"</string>
+    <string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Aktifkan Panggilan Wi-Fi"</string>
+    <string name="wifi_calling_turn_on" msgid="1171403510313983983">"Aktifkan panggilan Wi-Fi"</string>
+    <string name="wifi_calling_not_supported" msgid="7878640438907807754">"Panggilan Wi-Fi tidak didukung untuk %1$s"</string>
+    <string name="carrier" msgid="5264014738689761132">"Operator"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tampilan"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Suara"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volume"</string>
@@ -1151,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan otomatis"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Angkat untuk membangunkan"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Tampilan ambien"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Selalu aktif / Penggunaan baterai meningkat"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Notifikasi baru"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Waktu ditampilkan"</string>
     <string name="doze_title" msgid="2375510714460456687">"Notifikasi baru"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Aktifkan layar saat Anda menerima notifikasi"</string>
@@ -1197,8 +1198,6 @@
       <item quantity="one">Kode PIN SIM salah, sisa <xliff:g id="NUMBER_0">%d</xliff:g> percobaan sebelum Anda harus menghubungi operator untuk membuka kunci perangkat.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Operasi PIN SIM gagal!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status tablet"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Status ponsel"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Update sistem"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versi Android"</string>
@@ -2119,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Penggunaan background tidak dapat dibatasi"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Batasi aktivitas background?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Jika aktivitas background aplikasi dibatasi, mungkin fungsinya terganggu."</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Anda tidak dapat membatasi aplikasi karena tidak disetel untuk mengoptimalkan baterai.\n\nAktifkan pengoptimalan baterai untuk membatasi aplikasi."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Penggunaan layar sejak pengisian baterai penuh terakhir"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Konsumsi layar"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Pemindaian jaringan seluler"</string>
@@ -2440,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Sinyal panggilan darurat"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Setel perilaku ketika panggilan darurat dilakukan"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Backup"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Aktif"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Nonaktif"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Mencadangkan &amp; memulihkan"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Data pribadi"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Cadangkan data saya"</string>
@@ -2766,6 +2766,12 @@
       <item quantity="one">Periksa sertifikat</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Beberapa pengguna"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Pengguna &amp; profil"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Tambahkan pengguna atau profil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Tambahkan pengguna"</string>
@@ -2948,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"penggunaan data"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Perangkat terhubung"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, mode mengemudi, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, mode mengemudi"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikasi &amp; notifikasi"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Izin, aplikasi default"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Akun"</string>
@@ -2972,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"peluncur, default, aplikasi"</string>
     <string name="keywords_display" msgid="8910345814565493016">"layar, layar sentuh"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"layar redup, layar sentuh, baterai, terang"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"layar redup, layar sentuh, baterai"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"layar redup, malam, tint, shift malam, kecerahan, warna layar, warna, warni"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"latar belakang, personalisasi, sesuaikan tampilan"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ukuran teks"</string>
@@ -3013,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"jaringan, status jaringan seluler, status layanan, kekuatan sinyal, jenis jaringan seluler, roaming, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"nomor seri, versi hardware"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"level patch keamanan android, versi pita basis, versi kernel"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Tampilan standby, tampilan Layar kunci"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"sidik jari"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"putar, balik, rotasi, potret, lanskap, orientasi, vertikal, horizontal"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"upgrade, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, jadwal, notifikasi, blokir, matikan suara, getar, tidur, kerja, fokus, suara, nonaktifkan notifkasi, hari, hari kerja, akhir pekan, malam hari, acara"</string>
@@ -3097,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Izinkan sinyal visual"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Saat mode Jangan Ganggu diaktifkan"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notifikasi"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Tampilkan notifikasi tanpa suara"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Notifikasi akan dimatikan suaranya"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Tidak ada suara dari notifikasi"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Anda akan melihat notifikasi pada layar"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Jika ada notifikasi, ponsel tidak akan mengeluarkan suara atau bergetar."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Sembunyikan notifikasi"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Anda tidak akan melihat notifikasi baru atau yang sudah ada"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Tidak ada visual atau suara dari notifikasi"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Anda tidak akan melihat atau mendengar notifikasi"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Ponsel tidak akan menampilkan notifikasi baru atau yang sudah ada, dan tidak akan mengeluarkan suara atau bergetar. Notifikasi tidak akan muncul jika Anda menggeser layar dari atas ke bawah.\n\nPerlu diingat, notifikasi penting untuk aktivitas dan status ponsel tetap akan muncul."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Kustom"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Aktifkan setelan kustom"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Hapus setelan kustom"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Akan muncul"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Tidak ada suara dari notifikasi"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Sebagian tersembunyi"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Tersembunyi"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Tidak ada visual atau suara dari notifikasi"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Pembatasan kustom"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Saat layar aktif"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Saat layar nonaktif"</string>
@@ -3167,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Dimatikan, namun mengizinkan <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>, dan <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Pesan, acara &amp; pengingat"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Jika mode Jangan Ganggu diaktifkan, pesan, pengingat, dan acara akan dimatikan suara dan getarannya, kecuali item yang Anda izinkan di atas. Anda dapat menyesuaikan setelan pesan untuk mengizinkan teman, keluarga, atau kontak lain menghubungi Anda."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Selesai"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Setelan"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Tidak ada visual atau suara dari notifikasi"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Tidak ada suara dari notifikasi"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Anda tidak akan melihat atau mendengar notifikasi. Panggilan dari kontak berbintang dan penelepon berulang diizinkan."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Setelan saat ini)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Ubah setelan notifikasi mode Jangan Ganggu?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Suara profil kerja"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Gunakan suara profil pribadi"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Suara profil kerja dan pribadi sama"</string>
@@ -3348,17 +3347,12 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> sampai <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Panggilan telepon"</string>
-    <!-- no translation found for zen_mode_calls_title (623395033931747661) -->
-    <skip />
+    <string name="zen_mode_calls_title" msgid="623395033931747661">"Izinkan panggilan"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Jika mode Jangan Ganggu diaktifkan, panggilan masuk diblokir. Anda dapat menyesuaikan setelan untuk mengizinkan teman, keluarga, atau kontak lain menghubungi Anda."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Kontak berbintang"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">dan <xliff:g id="NUM_PEOPLE">%d</xliff:g> lainnya</item>
-      <item quantity="one">dan 1 lainnya</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Pesan"</string>
-    <!-- no translation found for zen_mode_messages_title (7729380010396411129) -->
-    <skip />
+    <string name="zen_mode_messages_title" msgid="7729380010396411129">"Izinkan pesan"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Pesan"</string>
     <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Beberapa pesan"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Dari siapa saja"</string>
@@ -3372,19 +3366,15 @@
     <string name="zen_mode_media" msgid="8808264142134422380">"Media"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Suara sentuhan"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Pengingat"</string>
-    <!-- no translation found for zen_mode_reminders_title (2345044406347406902) -->
-    <skip />
+    <string name="zen_mode_reminders_title" msgid="2345044406347406902">"Izinkan pengingat"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Acara"</string>
-    <!-- no translation found for zen_mode_events_title (5597241655883329085) -->
-    <skip />
+    <string name="zen_mode_events_title" msgid="5597241655883329085">"Izinkan acara"</string>
     <string name="zen_mode_all_callers" msgid="2378065871253871057">"semua orang"</string>
     <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"kontak"</string>
     <string name="zen_mode_starred_callers" msgid="1023167821338514140">"kontak yang berbintang"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Penelepon berulang"</string>
-    <!-- no translation found for zen_mode_repeat_callers_title (8553876328249671783) -->
-    <skip />
-    <!-- no translation found for zen_mode_calls_summary_one (3972333792749874863) -->
-    <skip />
+    <string name="zen_mode_repeat_callers_title" msgid="8553876328249671783">"Izinkan penelepon berulang"</string>
+    <string name="zen_mode_calls_summary_one" msgid="3972333792749874863">"Dari <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
     <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Dari <xliff:g id="CALLER_TYPE">%1$s</xliff:g> dan <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Jika orang yang sama menelepon untuk kedua kalinya dalam waktu <xliff:g id="MINUTES">%d</xliff:g> menit"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Khusus"</string>
@@ -3790,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Suhu foto sejuk"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gunakan suhu tampilan yang lebih sejuk"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Untuk menerapkan perubahan warna, nonaktifkan layar"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitor Konektivitas"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"MonitorKonektivitas akan mengumpulkan log jika mendeteksi masalah konektivitas, dan mengirimkan notifikasi kepada pengguna untuk melaporkan bug"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Untuk menerapkan perubahan monitor konektivitas, reboot perangkat"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor Laser Kamera"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Kamera Logis Sebagai Default"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Update sistem otomatis"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Terapkan update saat perangkat dinyalakan ulang"</string>
     <string name="usage" msgid="2977875522080448986">"Penggunaan"</string>
@@ -4103,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Layanan IsiOtomatis"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"otomatis, isi, isiotomatis"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Pastikan Anda memercayai aplikasi ini&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google IsiOtomatis&gt;%1$s&lt;/xliff:g&gt; menggunakan item yang ada di layar untuk menentukan item apa saja yang dapat diisi otomatis."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Tema perangkat"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Tema warna"</string>
     <string name="default_theme" msgid="7085644992078579076">"Default"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Tema perangkat"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Otomatis (berdasarkan wallpaper)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Cerah"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Gelap"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Nama jaringan"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Tampilkan nama jaringan di status bar"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Pengelola Penyimpanan: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4116,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Info Provisioning Operator"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Memicu Provisioning Operator"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Perbarui mode Jangan Ganggu"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Sembunyikan notifikasi agar terus fokus"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Jeda notifikasi agar tetap fokus"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Apa yang baru dan menarik?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Ikuti tur tentang ponsel baru Anda"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Ikuti tur tentang tablet baru Anda"</string>
diff --git a/res/values-is/arrays.xml b/res/values-is/arrays.xml
index 42edbc2..9be51b4 100644
--- a/res/values-is/arrays.xml
+++ b/res/values-is/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Alltaf kveikt"</item>
     <item msgid="6385301106124765323">"Alltaf slökkt"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 4c6ae99..31e708c 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Leyfa spjaldtölvunni þinni að eiga í samskiptum við nálæg Bluetooth-tæki"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Leyfa tækinu þínu að eiga í samskiptum við nálæg Bluetooth-tæki"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Leyfa símanum þínum að eiga í samskiptum við nálæg Bluetooth-tæki"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Slökkva á vélbúnaðarnotk. Bluetooth A2DP"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Endurræsa tæki?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Endurræsa þarf tækið til að breyta þessari stillingu."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Endurræsa"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Hætta við"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Tiltækir geymslumiðlar"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Tiltæk símtæki"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Tengt"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Tengingarstillingar"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Tæki sem hafa áður verið tengd"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Áður tengt"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Dagsetning og tími"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Veldu tímabelti"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Gáttin sem þú gafst upp er ekki gild."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy-þjónn fyrir HTTP er notaður af vafranum en ekki er víst að önnur forrit noti hann."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC-slóð: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Niðurhalsbandvídd (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Upphleðslubandvídd (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Staðsetningarupplýsingar loftneta (úrelt):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Upplýsingar um nálæg loftnet (úrelt):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE-rásarstilling:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Endurnýjunartíðni loftnetaupplýsinga:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Allar mælingarupplýsingar loftneta:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Rauntímaupplýsingar um gagnatengingu:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Gagnaþjónusta:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Reiki:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Sjálfvirk birtustilling"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lyfta til að vekja"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Umhverfisskjár"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Alltaf kveikt / aukin rafhlöðunotkun"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nýjar tilkynningar"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Sýnt hvenær"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nýjar tilkynningar"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Vekja skjáinn þegar þú færð tilkynningar"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="other">Rangt PIN-númer SIM-korts. Þú átt <xliff:g id="NUMBER_1">%d</xliff:g> tilraunir eftir.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"PIN-aðgerð SIM-korts mistókst!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Staða spjaldtölvu"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Staða síma"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Kerfisuppfærslur"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android útgáfa"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Ekki er hægt að takmarka notkun í bakgrunni"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Viltu takmarka bakgrunnsvirkni?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ef þú takmarkar bakgrunnsvirkni forrits gæti það látið illa"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Forrit notar ekki fínstillingu á rafhlöðu og því er ekki hægt að takmarka það.\n\nKveiktu á fínstillingu til að takmarka."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Skjánotkun frá síðustu fullu hleðslu"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Orkunotkun skjásins"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Leit að farsímaneti"</string>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Neyðarhringimerki"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Velja hvað gerist þegar neyðarsímtal er hringt"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Öryggisafrit"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Kveikt"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Slökkt"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Afritun og endurheimt"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Persónuleg gögn"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Taka öryggisafrit af gögnunum mínum"</string>
@@ -2761,6 +2766,12 @@
       <item quantity="other">Athuga vottorð</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Margir notendur"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Notendur og prófílar"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Bæta notanda eða sniði við"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Bæta notanda við"</string>
@@ -2943,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"gagnanotkun"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"heitur reitur"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Tengd tæki"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, akstursstilling, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, akstursstilling"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Forrit og tilkynningar"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Heimildir, sjálfgefin forrit"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Reikningar"</string>
@@ -2967,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"ræsiforrit, sjálfgefið, forrit"</string>
     <string name="keywords_display" msgid="8910345814565493016">"skjár, snertiskjár"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"myrkva skjá, snertiskjár, rafhlaða, bjart"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"dekkja skjá, snertiskjár, rafhlaða"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"myrkva skjá, nótt, litbrigði, næturstilling, birta, skjálitur, litur, litur"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"bakgrunnur, sérsníða, sérstilla skjá"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"textastærð"</string>
@@ -3008,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"netkerfi, staða farsímakerfis, staða þjónustu, sendistyrkur, tegund farsímakerfis, reiki, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"raðnúmer, vélbúnaðarútgáfa"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"stig Android öryggisplásturs, grunnbandsútgáfa, kjarnaútgáfa"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Umhverfisskjár, Lásskjár"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"fingrafar"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"snúa, spegla, snúningur, skammsnið, langsnið, stefna, lárétt, lóðrétt"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"uppfæra, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"ónáðið ekki, dagskrá, tilkynningar, setja á bannlista, þagga, titringur, sofa, vinna, fókus, hljóð, slökkva á hljóði, dagur, vikudagur, helgi, virkt kvöld, viðburður"</string>
@@ -3092,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Leyfa sjónræn merki"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Þegar kveikt er á „Ónáðið ekki“"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Tilkynningar"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Sýna tilkynningar án hljóðs"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Ekkert mun heyrast þegar tilkynningar berast"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Ekkert hljóð frá tilkynningum"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Þú munt sjá tilkynningar á skjánum þínum"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Þegar tilkynningar berast mun síminn hvorki gefa frá sér hljóð né titra."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Fela tilkynningar"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Þú munt ekki sjá nýjar eða fyrirliggjandi tilkynningar"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Engin skilaboð á skjá eða hljóð frá tilkynningum"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Þú munt hvorki sjá né heyra tilkynningar"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Síminn mun ekki birta nýjar eða fyrirliggjandi tilkynningar og mun hvorki hringja né titra. Tilkynningar munu ekki birtast þegar strokið er niður frá toppi skjásins .\n\nHafðu í huga að mikilvægar tilkynningar um virkni og stöðu símans munu áfram birtast."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Sérsniðið"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Kveikja á sérstillingu"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Fjarlægja sérstillingu"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Mun birtast"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Ekkert hljóð frá tilkynningum"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Falið að hluta"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Falið"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Engin skilaboð á skjá eða hljóð frá tilkynningum"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Sérsniðnar takmarkanir"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Þegar kveikt er á skjánum"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Þegar slökkt er á skjánum"</string>
@@ -3162,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Þaggað, en leyfa <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> og <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Skilaboð, viðburðir og áminningar"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Þegar kveikt er á „Ónáðið ekki“ munu engin hljóð heyrast vegna skilaboða, áminninga eða viðburða, nema fyrir þá sem þú heimilar að ofan. Hægt er að breyta stillingum til leyfa símtöl frá vinum, fjölskyldumeðlimum eða öðrum tengiliðum."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Lokið"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Stillingar"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Engin skilaboð á skjá eða hljóð frá tilkynningum"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Ekkert hljóð frá tilkynningum"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Þú hvorki sérð né heyrir tilkynningar. Símtöl frá stjörnumerktum tengiliðum og þeim sem hringja endurtekið eru leyfð."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Núverandi stilling)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Viltu breyta stillingum tilkynninga fyrir „Ónáðið ekki“?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Hljóð vinnuprófils"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Nota hljóð úr persónulegum prófíl"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Hljóð vinnuprófíls eru þau sömu og í persónulegum prófíl"</string>
@@ -3346,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Leyfa símtöl"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Lokað er á símtöl þegar kveikt er á „Ónáðið ekki“. Hægt er að breyta stillingum til leyfa símtöl frá vinum, fjölskyldumeðlimum eða öðrum tengiliðum."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Stjörnumerktir tengiliðir"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">og <xliff:g id="NUM_PEOPLE">%d</xliff:g> í viðbót</item>
-      <item quantity="other">og <xliff:g id="NUM_PEOPLE">%d</xliff:g> í viðbót</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Skilaboð"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Leyfa skilaboð"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Skilaboð"</string>
@@ -3779,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Svalur litblær skjás"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Nota svalari skjáliti"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Slökktu á skjánum til að virkja litbreytinguna"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Umsjón tenginga"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Umsjón tenginga safnar annálum þegar hún greinir vandamál með tengingu og birtir notandanum tilkynningu um að senda inn villutilkynningu"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Endurræstu tækið til að breyta umsjón tenginga"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Leysigeislaskynjari myndavélar"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Rökfræðileg myndavél sem sjálfgefin"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Sjálfvirkar kerfisuppfærslur"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Uppfæra þegar tækið er endurræst"</string>
     <string name="usage" msgid="2977875522080448986">"Notkun"</string>
@@ -4092,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Sjálfvirk útfyllingarþjónusta"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"sjálfvirk, útfylling, sjálfvirk útfylling"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Gakktu úr skugga um að þú treystir þessu forriti&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Sjálfvirk útfylling Google&gt;%1$s&lt;/xliff:g&gt; notar það sem er á skjánum til að ákvarða hvað er hægt að fylla sjálfkrafa út."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Þema tækisins"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Litaþema"</string>
     <string name="default_theme" msgid="7085644992078579076">"Sjálfgefið"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Þema tækisins"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Sjálfvirkt (út frá veggfóðri)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Ljóst"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Dökkt"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Heiti nets"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Birta heiti netkerfis í stöðustiku"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Geymsluumsjón: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4105,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Úthlutunarupplýsingar símafyrirtækis"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Kveikja á úthlutun símafyrirtækis"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Uppfæra „Ónáðið ekki“"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Fela tilkynningar svo þær trufli ekki"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Gera hlé á tilkynningum svo þær trufli ekki"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Hvað er nýtt og spennandi?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Skoðaðu kynningu á nýja símanum þínum"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Skoðaðu kynningu á nýju spjaldtölvunni þinni"</string>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 414f7f2..711246c 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Sempre attiva"</item>
     <item msgid="6385301106124765323">"Sempre disattivata"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index c3fc8ab..a37d9df 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Consenti la comunicazione del tablet con dispositivi Bluetooth nelle vicinanze"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Consenti la comunicazione del dispositivo con dispositivi Bluetooth nelle vicinanze"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Consenti la comunicazione del telefono con dispositivi Bluetooth nelle vicinanze"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Disatt. offload hardware Bluetooth A2DP"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Riavv. dispositivo?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Riavvia il dispositivo per modificare questa impostazione."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Riavvia"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Annulla"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Dispositivi multimediali disponibili"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Dispositivi di chiamata disponibili"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Attualmente collegati"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Preferenze di connessione"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Dispositivi connessi in precedenza"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Connessi in precedenza"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Data e ora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Scegli il fuso orario"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"La porta specificata non è valida."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Il proxy HTTP viene utilizzato dal browser ma potrebbe non essere utilizzato da altre applicazioni."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"URL PAC: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Larghezza di banda DL (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Larghezza di banda UL (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Informazioni sulla posizione delle celle (obsoleto):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Informazioni sulle celle vicine (obsoleto):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Configurazione canale fisico LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Frequenza di aggiornamento delle informazioni sulle celle:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Informazioni sulla misurazione di tutte le celle:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Informazioni in tempo reale sulla connessione dati:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Servizio dati:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminosità automatica"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Solleva per riattivare"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Display ambient"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Sempre attivo/Utilizzo elevato della batteria"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nuove notifiche"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Quando mostrare"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nuove notifiche"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Lo schermo viene riattivato quando ricevi notifiche"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">Codice PIN della SIM errato. Hai ancora <xliff:g id="NUMBER_0">%d</xliff:g> tentativo a disposizione, dopodiché dovrai contattare l\'operatore per sbloccare il dispositivo.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Operazione con PIN della SIM non riuscita."</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stato tablet"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Stato telefono"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Aggiornamenti di sistema"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versione di Android"</string>
@@ -2434,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Segnale chiamata di emergenza"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Imposta il comportamento in caso di chiamata di emergenza"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Backup"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"On"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Off"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Backup e ripristino"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dati personali"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Backup dei miei dati"</string>
@@ -2760,6 +2766,12 @@
       <item quantity="one">Controlla il certificato</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Utenti multipli"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Utenti e profili"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Aggiungi utente o profilo"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Aggiungi utente"</string>
@@ -2942,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"utilizzo dei dati"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivi collegati"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, modalità Auto, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, modalità Auto"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"App e notifiche"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Autorizzazioni, app predefinite"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Account"</string>
@@ -2966,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"avvio app, predefinite, app"</string>
     <string name="keywords_display" msgid="8910345814565493016">"schermo, touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"attenuazione schermo, touchscreen, batteria, luminosità"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"attenuazione schermo, touchscreen, batteria"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"attenuazione schermo, notte, tonalità, night shift, luminosità, colore dello schermo, colore"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"sfondo, personalizzare, personalizzazione display"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"dimensioni testo"</string>
@@ -3007,8 +3014,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"rete, stato rete mobile, stato servizio, intensità segnale, tipo di rete mobile, roaming, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"numero di serie, versione hardware"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"livello patch di sicurezza android, versione banda di base, versione kernel"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Display ambient, display della schermata di blocco"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"impronta digitale"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"attenuazione schermo, touchscreen, batteria, luminosità intelligente, luminosità dinamica"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"ruotare, capovolgere, rotazione, verticale, orizzontale, orientamento"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"upgrade, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"non disturbare, pianificare, notifiche, bloccare, silenziare, vibrazione, sospensione, lavoro, concentrazione, suono, audio disattivato, giorno, giorno feriale, fine settimana, notte di giorno feriale, evento"</string>
@@ -3091,18 +3101,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Consenti segnali visivi"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Quando è attiva la modalità Non disturbare"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notifiche"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Mostra notifiche in modalità silenziosa"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"L\'audio delle notifiche verrà disattivato"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Notifiche senza audio"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Vedrai le notifiche sullo schermo"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"All\'arrivo delle notifiche, il telefono non emetterà suoni o vibrazioni."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Nascondi notifiche"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Non vedrai le notifiche nuove o esistenti"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Nessuna immagine o nessun suono delle notifiche"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Non vedrai notifiche e non sentirai suoni"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Il tuo telefono non mostrerà notifiche nuove o esistenti e non emetterà suoni o vibrazioni. Le notifiche non verranno visualizzate quando scorri verso il basso sullo schermo.\n\nRicorda che le notifiche fondamentali per lo stato e le attività del telefono continueranno a essere visualizzate."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Personalizzata"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Attiva modalità personalizzata"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Rimuovi impostazione personalizzata"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Visibili"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Notifiche senza audio"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Parzialmente nascoste"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Nascoste"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Nessuna immagine o nessun suono delle notifiche"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Limitazioni personalizzate"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Quando lo schermo è acceso"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Quando lo schermo è spento"</string>
@@ -3161,19 +3171,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Audio disattivato, ma consenti <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> e <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Messaggi, eventi e promemoria"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Quando la modalità Non disturbare è attiva, l\'audio di messaggi, promemoria ed eventi verrà disattivato, ad eccezione degli elementi da te sopra consentiti. Puoi regolare le impostazioni dei messaggi affinché amici, familiari o altri contatti possano raggiungerti."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Fine"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Impostazioni"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Nessuna immagine o nessun suono delle notifiche"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Notifiche senza audio"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Non vedrai notifiche e non sentirai suonerie. Sono consentite le chiamate ripetute e dei contatti speciali."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Impostazione corrente)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Modificare le impostazioni delle notifiche Non disturbare?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Suoni profilo di lavoro"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Usa suoni profilo personale"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"I suoni dei profili di lavoro e personale sono gli stessi"</string>
@@ -3345,10 +3349,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Consenti chiamate"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Quando la modalità Non disturbare è attiva, le chiamate in arrivo sono bloccate. Puoi regolare le impostazioni affinché amici, familiari e altri contatti possano raggiungerti."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Contatti speciali"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">e altri <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="one">e 1 altro</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messaggi"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Consenti messaggi"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Messaggi"</string>
@@ -3778,10 +3779,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura di colore fredda"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilizza colori del display più freddi"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Per applicare la modifica ai colori, disattiva lo schermo"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"ConnectivityMonitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor raccoglierà log quando rileverà un problema di connettività e invierà una notifica all\'utente per segnalare il bug"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Riavvia il dispositivo per applicare la modifica a ConnectivityMonitor"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensore laser della fotocamera"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Logical Camera come predefinita"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Aggiornamenti di sistema automatici"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Applica gli aggiornamenti al riavvio del dispositivo"</string>
     <string name="usage" msgid="2977875522080448986">"Utilizzo"</string>
@@ -4091,8 +4090,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Compilazione automatica"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatico, compilazione, compilazione automatica"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Verifica che questa app sia attendibile&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=La Compilazione Automatica di Google&gt;%1$s&lt;/xliff:g&gt; usa ciò che è presente nella schermata per stabilire quali contenuti possono essere compilati automaticamente."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Tema del dispositivo"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Tema a colori"</string>
     <string name="default_theme" msgid="7085644992078579076">"Valore predefinito"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Tema del dispositivo"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automatico (in base allo sfondo)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Chiaro"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Scuro"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Nome della rete"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Nome della Rete Display nella bara di stato"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gestione memoria: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4104,7 +4107,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informazioni sul provisioning operatore"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Attiva provisioning operatore"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Aggiorna modalità Non disturbare"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Nascondi le notifiche per mantenere la concentrazione"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Metti in pausa le notifiche per mantenere la concentrazione"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Quali entusiasmanti novità ti attendono?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Scopri il tuo nuovo telefono"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Scopri il tuo nuovo tablet"</string>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index e2efd6b..0add9c7 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"פועל תמיד"</item>
     <item msgid="6385301106124765323">"כבוי תמיד"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 5e7dcac..4d7cfe9 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -175,6 +175,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"‏הטאבלט שלך יוכל לתקשר עם מכשירי Bluetooth שנמצאים בקרבת מקום"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"‏המכשיר שלך יוכל לתקשר עם מכשירי Bluetooth שנמצאים בקרבת מקום"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"‏הטלפון שלך יוכל לתקשר עם מכשירי Bluetooth שנמצאים בקרבת מקום"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"‏השבתת העברה לחומרת A2DP של Bluetooth"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"להפעיל מכשיר מחדש?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"עליך להפעיל מחדש את המכשיר כדי לשנות הגדרה זו."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"הפעלה מחדש"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"ביטול"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"מכשירי מדיה זמינים"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"מכשירי התקשרות זמינים"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"מחובר כעת"</string>
@@ -184,6 +189,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"העדפות חיבור"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"מכשירים שהיו מחוברים בעבר"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"מכשירים שחוברו בעבר"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"תאריך ושעה"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"בחירת אזור זמן"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -209,11 +216,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"היציאה שהקלדת אינה חוקית."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"‏שרת ה-Proxy של HTTP נמצא בשימוש הדפדפן, אך אפליקציות אחרות לא יכולות להשתמש בו."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"‏כתובת אתר של PAC: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"‏רוחב פס DL (ב-kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"‏רוחב פס UL (ב-kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"מידע על מיקום סלולרי (הוצא משימוש):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"מידע סלולרי לשכן (הוצא משימוש):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"‏תצורת ערוץ פיזי של LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"קצב רענון של מידע סלולרי:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"כל המידע של מדידה סלולרית:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"מידע בזמן אמת על חיבור נתונים:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"שירות נתונים:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"נדידה:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1178,8 +1186,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"בהירות אוטומטית"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"הרם כדי להוציא ממצב שינה"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"תצוגה רגישה לסביבה"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"פועל תמיד / צריכה מוגברת של הסוללה"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"הודעות חדשות"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"מתי להציג"</string>
     <string name="doze_title" msgid="2375510714460456687">"הודעות חדשות"</string>
     <string name="doze_summary" msgid="3846219936142814032">"המסך יתעורר כשמתקבלות הודעות"</string>
@@ -1226,8 +1232,6 @@
       <item quantity="one">‏קוד גישה שגוי של כרטיס SIM. נותר לך ניסיון <xliff:g id="NUMBER_0">%d</xliff:g> לפני שיהיה עליך ליצור קשר עם הספק כדי לבטל את נעילת המכשיר.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"‏פעולת קוד הגישה של כרטיס ה-SIM נכשלה!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"סטטוס טאבלט"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"סטטוס הטלפון"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"עדכוני מערכת"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"‏גרסת Android"</string>
@@ -2166,8 +2170,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"לא ניתן להגביל שימוש ברקע"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"להגביל את הפעילות ברקע?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"הגבלת הפעילות של אפליקציה ברקע עלולה לשבש את פעולתה"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"מכיוון שהאפליקציה לא מוגדרת לאופטימיזציה של הסוללה, לא ניתן להגבילה.\n\nכדי להגביל אותה, תחילה יש להפעיל אופטימיזציה של הסוללה."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"שימוש במסך מאז הטעינה המלאה"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"צריכת החשמל של המסך"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"סריקה של רשתות סלולריות"</string>
@@ -2501,6 +2504,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"אות לחיוג חירום"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"הגדר אופן פעולה בעת ביצוע שיחת חירום"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"גיבוי"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"פועל"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"כבוי"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"גיבוי ושחזור"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"נתונים אישיים"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"גיבוי הנתונים שלי"</string>
@@ -2837,6 +2842,12 @@
       <item quantity="one">בדוק אישור</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"משתמשים מרובים"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"משתמשים ופרופילים"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"הוסף משתמש או פרופיל"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"הוספת משתמש"</string>
@@ -3021,14 +3032,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"שימוש בנתונים"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"נקודה לשיתוף אינטרנט"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"מכשירים מחוברים"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"‏Bluetooth, מצב נהיגה, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"‏Bluetooth, מצב נהיגה"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"‏Bluetooth,‏ NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"אפליקציות והודעות"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"הרשאות ואפליקציות המוגדרות כברירת מחדל"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"חשבונות"</string>
@@ -3045,7 +3052,6 @@
     <string name="keywords_home" msgid="294182527446892659">"מרכז האפליקציות, ברירת מחדל, אפליקציות"</string>
     <string name="keywords_display" msgid="8910345814565493016">"מסך, מסך מגע"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"עמעום מסך, מסך מגע, סוללה, בהיר"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"עמעם מסך, מסך מגע, סוללה"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"עמעום מסך, לילה, גוון, משמרת לילה, בהירות, צבע מסך, צבע"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"רקע, התאמה אישית, התאם אישית את התצוגה"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"גודל טקסט"</string>
@@ -3086,8 +3092,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"‏רשת, מצב הרשת הסלולרית, מצב השירות, עוצמת האות, סוג הרשת הסלולרית, נדידה, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"מספר סידורי, גרסת חומרה"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"‏רמת תיקון האבטחה ב-Android, גרסת פס בסיס, גרסת ליבה"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"תצוגה רגישה לסביבה, תצוגה של מסך נעילה"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"טביעת אצבע"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"לסובב, להפוך, סיבוב, לאורך, לרוחב, כיוון, אנכי, אופקי"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"‏שדרוג, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"‏dnd, לוח זמנים, הודעות, חסימה, השתקה, רטט, שינה, עבודה, הדגשה, צליל, יום, יום בשבוע, סוף שבוע, לילה באמצע שבוע, אירוע"</string>
@@ -3172,18 +3182,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"הפעלת אותות חזותיים"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"כשמצב \'נא לא להפריע\' פועל"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"הודעות"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"הצגת הודעות בלי להשמיע צליל"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"ההודעות יושתקו"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"ללא צליל מהודעות"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"יוצגו הודעות במסך"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"כשיגיעו הודעות, הטלפון לא ישמיע צליל ולא יפעיל רטט."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"הסתרת הודעות"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"לא יוצגו הודעות חדשות או הודעות קיימות"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"ללא סימנים חזותיים או צלילים מהודעות"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"הודעות לא יוצגו ולא יושמעו"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"הטלפון שלך לא יציג הודעות חדשות או קיימות, ולא ישמיע צליל או רטט. הודעות לא יופיעו בעת החלקה כלפי מטה מהחלק העליון של המסך.\n\nחשוב לזכור, הודעות החיוניות לפעולת הטלפון ולסטטוס עדיין יופיעו."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"התאמה אישית"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"הפעלת הגדרה מותאמת אישית"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"הסרת הגדרה מותאמת אישית"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"יופיעו"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"ללא צליל מהודעות"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"מוסתרות חלקית"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"מוסתרות"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"ללא סימנים חזותיים או צלילים מהודעות"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"הגבלות מותאמות אישית"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"כאשר המסך פועל"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"כאשר המסך כבוי"</string>
@@ -3246,19 +3256,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"מושתקים, אבל אני רוצה לאפשר <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> וכן <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"הודעות, אירועים ותזכורות"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"כשמצב \'נא לא להפריע\' פועל, הודעות, תזכורות ואירועים מושתקים, חוץ מהפריטים שאפשרת למעלה. ניתן לשנות את הגדרות ההודעות כדי לאפשר לחברים, לבני משפחה או לאנשי קשר אחרים ליצור איתך קשר."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"סיום"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"הגדרות"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"ללא סימנים חזותיים או צלילים מהודעות"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"ללא צליל מהודעות"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"הודעות לא יוצגו ולא יושמעו. מותרות שיחות מאנשי קשר שמסומנים בכוכב וממתקשרים חוזרים."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(ההגדרה הנוכחית)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"האם לשנות את ההגדרות של ההודעות במצב \'נא לא להפריע\'?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"צלילי פרופיל עבודה"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"השתמש בצלילי הפרופיל האישי"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"הצלילים זהים עבור הפרופיל האישי ופרופיל העבודה"</string>
@@ -3438,12 +3442,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"אני רוצה לאפשר שיחות"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"כשמצב \'נא לא להפריע\' פועל, השיחות הנכנסות חסומות. ניתן לשנות את ההגדרות כדי לאפשר לחברים, לבני משפחה או לאנשי קשר אחרים ליצור איתך קשר."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"אנשי קשר שמסומנים בכוכב"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="two">ועוד <xliff:g id="NUM_PEOPLE">%d</xliff:g> נוספים</item>
-      <item quantity="many">ועוד <xliff:g id="NUM_PEOPLE">%d</xliff:g> נוספים</item>
-      <item quantity="other">ועוד <xliff:g id="NUM_PEOPLE">%d</xliff:g> נוספים</item>
-      <item quantity="one">ועוד אחד נוסף</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"הודעות"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"אני רוצה לאפשר הודעות"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"הודעות"</string>
@@ -3899,10 +3898,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"טמפרטורת צבעים קרים"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"השתמש בצבעי תצוגה קרירים יותר"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"כבה את המסך כדי להחיל שינוי צבע"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"‏ConnectivityMonitor יאסוף מידע ביומנים כשיזהה בעית קישוריות וישלח הודעה למשתמש כדי שיוכל להגיש דוח על באג"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"‏כדי להחיל את השינוי ב-Connectivity Monitor, יש להפעיל מחדש את המכשיר"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"חיישן הלייזר של המצלמה"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"מצלמה לוגית כברירת מחדל"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"עדכוני מערכת אוטומטיים"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"החלת עדכונים כאשר המכשיר מופעל מחדש"</string>
     <string name="usage" msgid="2977875522080448986">"שימוש"</string>
@@ -4240,8 +4237,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"שירות מילוי אוטומטי"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"‏אוטומטי, אוטומטית, מילוי, מילוי אוטומטי, autofill"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"‏&lt;b&gt;ודא שאתה סומך על האפליקציה הזו&lt;/b&gt;‏ ‏&lt;br/&gt; &lt;br/&gt;‏ ‏&lt;xliff:g id=app_name example=Google Autofill&gt;‏%1$s‏&lt;/xliff:g&gt; ניגשת למידע המופיע במסך כדי לזהות אילו שדות אפשר למלא באופן אוטומטי."</string>
-    <string name="device_theme" msgid="4571803018917608588">"עיצוב המכשיר"</string>
+    <string name="color_theme" msgid="1535685696756738324">"עיצוב צבעים"</string>
     <string name="default_theme" msgid="7085644992078579076">"ברירת מחדל"</string>
+    <string name="device_theme" msgid="4571803018917608588">"עיצוב המכשיר"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"אוטומטי (מבוסס על טפט)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"בהיר"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"כהה"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"שם הרשת"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"הצגת שם הרשת בשורת הסטטוס"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"מנהל אחסון: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4253,7 +4254,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"פרטי ניהול תצורה של ספק סלולרי"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"הפעל ניהול תצורה של ספק סלולרי"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"עדכון המצב \'נא לא להפריע\'"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"אפשר להסתיר את ההודעות כדי לשמור על ריכוז"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"אפשר להשהות את ההודעות כדי לשמור על ריכוז"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"מה חדש ומעניין?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"סיור היכרות עם הטלפון החדש"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"סיור היכרות עם הטאבלט החדש"</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index b571a1c..8bb5873 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"常に ON"</item>
     <item msgid="6385301106124765323">"常に OFF"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 727181a..769272d 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"タブレットが付近の Bluetooth デバイスと通信することを許可する"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"端末が付近の Bluetooth デバイスと通信することを許可する"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"スマートフォンが付近の Bluetooth デバイスと通信することを許可する"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Bluetooth A2DP ハードウェア オフロードの無効化"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"端末を再起動しますか？"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"この設定を変更するには、端末の再起動が必要です。"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"再起動"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"キャンセル"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"利用可能なメディア デバイス"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"利用可能な通話デバイス"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"現在接続されている端末"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"接続の設定"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"以前接続されていたデバイス"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"以前に接続"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"日付と時刻"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"タイムゾーンの選択"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"入力したポートは無効です。"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTPプロキシはブラウザで使用されていますが、他のアプリでは使用できません。"</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL 帯域幅（kbps）:"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL 帯域幅（kbps）:"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"セルの位置情報（サポート終了）:"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"隣接セル情報（サポート終了）:"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE の物理チャネル設定:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"セル情報の更新間隔:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"すべてのセルの測定情報:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"データ接続のリアルタイム情報:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"データサービス:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"ローミング:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"明るさを自動調整"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"指を離してスリープ状態から復帰"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"アンビエント表示"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"常に ON / 電池使用量が増えます"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"新しい通知"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"表示するタイミング"</string>
     <string name="doze_title" msgid="2375510714460456687">"新しい通知"</string>
     <string name="doze_summary" msgid="3846219936142814032">"通知を受信したときにスリープ状態から復帰"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">SIM PINコードが無効です。入力できるのはあと<xliff:g id="NUMBER_0">%d</xliff:g>回です。この回数を超えた場合は、携帯通信会社にお問い合わせください。</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM PIN操作に失敗しました。"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"タブレットの状態"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"端末の状態"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"システムアップデート"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Androidバージョン"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"バックグラウンドでの使用を制限できません"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"バックグラウンド アクティビティの制限"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"アプリのバックグラウンド アクティビティを制限すると、アプリが正常に機能しないことがあります"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"このアプリは、電池の最適化が設定されていないため、制限することはできません。\n\nこのアプリを制限するには、電池の最適化を ON にしてください。"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"フル充電以降の画面の電池使用状況"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"画面消費"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"モバイル ネットワークのスキャン"</string>
@@ -2439,6 +2442,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"緊急通報信号"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"緊急通報時の動作を設定します"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"バックアップ"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"ON"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"OFF"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"バックアップと復元"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"個人データ"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"データのバックアップ"</string>
@@ -2765,6 +2770,12 @@
       <item quantity="one">証明書を確認</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"複数ユーザー"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"ユーザーとプロファイル"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ユーザーまたはプロファイルを追加"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"ユーザーを追加"</string>
@@ -2947,14 +2958,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"データ使用量"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"アクセス ポイント"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"接続済みの端末"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth、運転モード、NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth、運転モード"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth、NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"アプリと通知"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"権限、デフォルト アプリ"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"アカウント"</string>
@@ -2971,7 +2978,6 @@
     <string name="keywords_home" msgid="294182527446892659">"ランチャー, デフォルト, アプリ"</string>
     <string name="keywords_display" msgid="8910345814565493016">"画面、タッチスクリーン"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"画面を暗くする, タッチスクリーン, 電池, 明るさ"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"画面を暗くする、タッチスクリーン、電池"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"画面を暗くする, 夜間, 色合い, 夜間切り替え, 明るさ, 画面の色, 色, カラー"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"背景、パーソナライズ、表示のカスタマイズ"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"文字 サイズ"</string>
@@ -3012,8 +3018,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"ネットワーク, モバイル ネットワークの状態, サービスの状態, 電波強度, モバイル ネットワークの種類, ローミング, ICCID"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"シリアル番号, ハードウェア バージョン"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"Android セキュリティ パッチ レベル, ベースバンド バージョン, カーネル バージョン"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"アンビエント表示, ロック画面表示"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"指紋"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"回転, 切り替え, ローテーション, 縦向き, 横向き, 画面の向き, 縦, 横"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"アップグレード, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"マナーモード, スケジュール, 通知, ブロック, 消音, バイブレーション, スリープ, 仕事, 集中, 通知音, ミュート, 日, 平日, 週末, 平日の夜, イベント"</string>
@@ -3096,18 +3106,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"視覚的な割り込みを許可"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"マナーモードが ON のとき"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"通知"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"通知をマナーモードで表示する"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"通知はミュートされます"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"通知音なし"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"画面に通知が表示されます"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"スマートフォンに通知が届いても、通知音やバイブレーションは作動しません。"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"通知を非表示"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"新しい通知や既存の通知は表示されません"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"通知の非表示、通知音なし"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"通知は表示されず、通知音も鳴りません"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"スマートフォンに新しい通知や既存の通知は表示されず、通知音やバイブレーションも作動しません。また、画面の上から下にスワイプしても通知は表示されません。\n\nスマートフォンの操作やステータスに必要な通知は引き続き表示されます。"</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"カスタム"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"カスタム設定の有効化"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"カスタム設定の削除"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"表示"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"通知音なし"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"一部非表示"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"非表示"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"通知の非表示、通知音なし"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"カスタムの制限"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"画面が ON のとき"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"画面が OFF のとき"</string>
@@ -3166,19 +3176,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"ミュート中（<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>、<xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>、<xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>を除く）"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"メッセージ、予定、リマインダー"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"マナーモードが ON の場合、上記の許可した項目を除き、メッセージ、リマインダー、予定はミュートされます。メッセージの設定を調整することで、友だち、家族などの連絡先からの着信のブロックを解除できます。"</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"完了"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"設定"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"通知の非表示、通知音なし"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"通知音なし"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"通知は表示されず、通知音も鳴りません。スター付きの連絡先からの発信や同一発信者による再発信は許可されます。"</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"（現在の設定）"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"マナーモードの通知設定を変更しますか？"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"仕事用プロファイルの音"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"個人用プロファイルの音の使用"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"仕事用プロファイルと個人用プロファイルの音は同じです"</string>
@@ -3215,7 +3219,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"アプリの通知"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"通知のカテゴリ"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"通知のカテゴリ グループ"</string>
-    <string name="notification_importance_title" msgid="4368578960344731828">"重要度"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"動作"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"音の許可"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"通知を表示しない"</string>
     <string name="notification_importance_min" msgid="9054819132085066824">"マナーモードで表示し最小化"</string>
@@ -3350,10 +3354,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"通話の許可"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"マナーモードが ON の場合、着信がブロックされます。設定を調整することで、友だち、家族などの連絡先からの着信のブロックを解除できます。"</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"スター付きの連絡先"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">他 <xliff:g id="NUM_PEOPLE">%d</xliff:g> 人</item>
-      <item quantity="one">他 1 人</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"メッセージ"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"メッセージの許可"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"メッセージ"</string>
@@ -3783,10 +3784,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"寒色の色温度"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"寒色の表示色を使用します"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"色の変更を適用するには、画面を OFF にしてください"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"ConnectivityMonitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor は、接続の問題が検出されたときにログを収集し、バグを報告するようユーザーに通知を表示します"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"ConnectivityMonitor の変更を適用するには、端末を再起動してください"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"カメラのレーザー センサー"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Logical Camera をデフォルトに設定"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"自動システム アップデート"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"端末の再起動時にアップデートを適用する"</string>
     <string name="usage" msgid="2977875522080448986">"使用量"</string>
@@ -4096,8 +4095,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"自動入力サービス"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"自動, 入力, 自動入力"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;このアプリが信頼できることを確認してください&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; は画面上の内容に基づいて、入力可能な情報を判別します。"</string>
-    <string name="device_theme" msgid="4571803018917608588">"端末のテーマ"</string>
+    <string name="color_theme" msgid="1535685696756738324">"色のテーマ"</string>
     <string name="default_theme" msgid="7085644992078579076">"デフォルト"</string>
+    <string name="device_theme" msgid="4571803018917608588">"端末のテーマ"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"自動（壁紙に基づく）"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"ライト"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"ダーク"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"ネットワーク名"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"ステータスバーにネットワーク名を表示する"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"ストレージ マネージャ: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4109,7 +4112,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"携帯通信会社のプロビジョニング情報"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"携帯通信会社のプロビジョニングをトリガー"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"マナーモードの更新"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"集中するために通知を非表示にする"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"集中するために通知を一時停止する"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"注目の新機能"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"新しいスマートフォンの使い方をご紹介します"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"新しいタブレットの使い方をご紹介します"</string>
diff --git a/res/values-ka/arrays.xml b/res/values-ka/arrays.xml
index b4bae22..bd2faf4 100644
--- a/res/values-ka/arrays.xml
+++ b/res/values-ka/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"ყოველთვის ჩართული"</item>
     <item msgid="6385301106124765323">"ყოველთვის გამორთული"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 0e6383f..2069d8d 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"თქვენი ტაბლეტის მიერ ახლომდებარე Bluetooth მოწყობილობებთან კომუნიკაციის დაშვება"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"თქვენი მოწყობილობის მიერ ახლომდებარე Bluetooth მოწყობილობებთან კომუნიკაციის დაშვება"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"თქვენი ტელეფონის მიერ ახლომდებარე Bluetooth მოწყობილობებთან კომუნიკაციის დაშვება"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Bluetooth A2DP-ის აპარატული განტვირთვის გათიშვა"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"გადაიტვირთოს მოწყობილობა?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"ამ პარამეტრის შესაცვლელად საჭიროა მოწყობილობის გადატვირთვა."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"გადატვირთვა"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"გაუქმება"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"ხელმისაწვდომი მედია-მოწყობილობები"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"ხელმისაწვდომი დასარეკი მოწყობილობები"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"ამჟამად დაკავშირებულია"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"კავშირის პარამეტრები"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"წარსულში დაკავშირებული მოწყობილობები"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"წარსულში დაკავშირებული"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"თარიღი და დრო"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"დროის ზონის არჩევა"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"თქვენს მიერ შეყვანილი პორტი არასწორია."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP პროქსი სერვერს იყენებს ბრაუზერი, თუმცა მისი გამოყენება სხვა აპლიკაციების მიერ დაუშვებელია."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"ჩამოტვირთვის გამტარუნარიანობა (კბიტ/წმ):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"ატვირთვის გამტარუნარიანობა (კბიტ/წმ):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"ფიჭური მდებარეობის ინფორმაცია (მოძველდა):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"მეზობელი ფიჭის ინფორმაცია (მოძველდა):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE ფიზიკური არხის კონფიგურაცია:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"ფიჭური ინფორმაციის განახლების სიხშირე:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"სრული ინფორმაცია ფიჭური ქსელის შესახებ:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"რეალურ დროში მიღებული ინფორმაცია მობილური ინტერნეტის შესახებ:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"მობილური ინტერნეტის სერვისი:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"როუმინგი:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"ავტომატური სიკაშკაშე"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"გაღვიძება აწევისას"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"ემბიენტური ეკრანი"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"ყოველთვის ჩართული / ბატარეის მოხმარება გაიზრდება"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"ახალი შეტყობინებები"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ჩვენების დრო"</string>
     <string name="doze_title" msgid="2375510714460456687">"ახალი შეტყობინებები"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ეკრანის გამოღვიძება შეტყობინებების მიღებისას"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">SIM-ის PIN არასწორია. დაგრჩათ <xliff:g id="NUMBER_0">%d</xliff:g> მცდელობა, სანამ მოგიწევთ მოწყობილობის განსაბლოკად ოპერატორთან დაკავშირება.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM PIN ოპერაცია ჩაიშალა!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"ტაბლეტის სტატუსი"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"ტელეფონის სტატუსი"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"სისტემური განახლებები"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android-ის ვერსია"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"ფონურ რეჟიმში მოხმარების შეზღუდვა ვერ მოხერხდება"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"გსურთ ფონური აქტივობის შეზღუდვა?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"აპისთვის ფონური აქტივობის შეზღუდვის შემთხვევაში, მან შეიძლება არასათანადოდ იმუშაოს"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"რადგან ეს აპი ბატარეის ოპტიმიზებისთვის დაყენებული არაა, მას ვერ შეზღუდავთ.\n\nჩართეთ ბატარეის ოპტიმიზაცია აპის შესაზღუდავად."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"ეკრანის მოხმარება ბოლო სრული დატენვიდან"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"ეკრანის მოხმარება"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"მობილური ქსელის სკანირება"</string>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"საგანგებო დარეკვის სიგნალი"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"ქცევის დაყენება, როცა განხორციელებულია გადაუდებელი ზარი"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"სარეზერვო კოპირება"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"ჩართული"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"გამორთული"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"სარეზერვო კოპირება და აღდგენა"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"პერსონალური მონაცემები"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"მონაცემების სარეზერვო კოპირება"</string>
@@ -2761,6 +2766,12 @@
       <item quantity="one">სერტიფიკატის შემოწმება</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"მრავალი მომხმარებელი"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"მომხმარებლები და პროფილები"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"მომხმარებლის ან პროფილის დამატება"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"მომხმარებლის დამატება"</string>
@@ -2943,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"მონაცემთა მოხმარება"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"უსადენო ქსელი"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"დაკავშირებული მოწყობილობები"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, საავტომობილო რეჟიმი, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, საავტომობილო რეჟიმი"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"აპები და შეტყობინებები"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ნებართვები, ნაგულისხმევი აპები"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"ანგარიშები"</string>
@@ -2967,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"გამშვები, ნაგულისხმევი, აპები"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ეკრანი, სენსორული ეკრანი"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"ეკრანის გამქრქალება, სენსორული ეკრანი, ბატარეა, ნათელი"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"ეკრანის გამქრქალება, სენსორული ეკრანი, ბატარეა"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"ეკრანის გამქრქალება, ღამე, ელფერი, ღამის ცვლა, სიკაშკაშე, ეკრანის ფერი, ფერი, ფერი"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"ფონი, პერსონალიზება, ეკრანის მორგება"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ტექსტის ზომა"</string>
@@ -3008,8 +3014,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"ქსელი, მობილური ქსელის მდგომარეობა, სერვისის მდგომარეობა, სიგნალის სიძლიერე, მობილური ქსელის ტიპი, როუმინგი, ICCID"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"სერიული ნომერი, აპარატურის ვერსია"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"Android-ის უსაფრთხოების ჩასწორების დონე, baseband-ის ვერსია, kernel-ის ვერსია"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"ემბიენტური ეკრანი, ჩაკეტილი ეკრანი"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"თითის ანაბეჭდი"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"ეკრანის გამქრქალება, სენსორული ეკრანი, ბატარეა, გონივრული სიკაშკაშე, დინამიკური სიკაშკაშე"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"შეტრიალება, ამობრუნება, შეტრიალება, პორტრეტი, ლანდშაფტი, ორიენტაცია, ვერტიკალური, ჰორიზონტალური"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"განახლება, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"DND, განრიგი, შეტყობინებები, დაბლოკვა, სიჩუმე, ვიბრაცია, ძილი, მუშაობა, კონცენტრირება, ხმა, დადუმება, დღე, სამუშაო დღე, შაბათ-კვირა, სამუშაო კვირის საღამო, მოვლენა"</string>
@@ -3092,18 +3101,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"ვიზუალური სიგნალების დაშვება"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"როცა ჩართულია „არ შემაწუხოთ“"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"შეტყობინებები"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"შეტყობინებების უხმოდ ჩვენება"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"შეტყობინებები დადუმდება"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"შეტყობინებები ხმის გარეშე"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"შეტყობინებები გამოჩნდება ეკრანზე"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"შეტყობინებების მიღებისას თქვენს ტელეფონზე არ ამოქმედდება ხმოვანი ან ვიბროსიგნალი."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"შეტყობინებების დამალვა"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"თქვენ არ დაინახავთ ახალ ან არსებულ შეტყობინებებს"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"უხილავი და უხმო შეტყობინებები"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"თქვენ არ დაინახავთ და არც გაიგონებთ შეტყობინებებს"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"თქვენს ტელეფონზე არ გამოჩნდება ახალი ან არსებული შეტყობინებები და არც ხმოვანი თუ ვიბროსიგნალი ამოქმედდება. შეტყობინებები არ გამოჩნდება ეკრანზე ქვემოდან ზემოთ გადაფურცვლისას.\n\nგაითვალისწინეთ, რომ ტელეფონის აქტივობასთან და სტატუსთან დაკავშირებული კრიტიკულად მნიშვნელოვანი შეტყობინებები მაინც გამოჩნდება."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"მორგებული"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"მორგებული პარამეტრის ჩართვა"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"მორგებული პარამეტრის გაუქმება"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"გამოჩენა"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"შეტყობინებები ხმის გარეშე"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"ნაწილობრივ დამალული"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"დამალული"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"უხილავი და უხმო შეტყობინებები"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"მორგებული შეზღუდვები"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"როცა ეკრანი ჩართულია"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"როცა ეკრანი გამორთულია"</string>
@@ -3162,19 +3171,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"დადუმებული, თუმცა დაიშვას <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> და <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"შეტყობინებები, მოვლენები და შეხსენებები"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"როცა ჩართულია რეჟიმი „არ შემაწუხოთ“, დადუმდება ყველა შეტყობინება, შეხსენება და მოვლენა იმ ერთეულების გარდა, რომლებსაც ზემოთ დაუშვებთ. სურვილისამებრ, შეგიძლიათ შეცვალოთ პარამეტრები და მისცეთ თქვენთან დაკავშირების საშუალება მეგობრებს, ოჯახის წევრებს და სხვა კონტაქტებს."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"მზადაა"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"პარამეტრები"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"უხილავი და უხმო შეტყობინებები"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"შეტყობინებები ხმის გარეშე"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"შეტყობინებები იქნება უხილავი და უხმო. ვარსკვლავით მონიშნული კონტაქტები და აბონენტებისგან განმეორებითი ზარები დაშვებულია."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(მიმდინარე პარამეტრი)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"გსურთ, შეცვალოთ „არ შემაწუხოთ“ რეჟიმის შეტყობინებათა პარამეტრები?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"სამსახურის პროფილის ხმები"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"პირადი პროფილის ხმების გამოყენება"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"სამსახურისა და პირადი პროფილები ხმები იდენტურია"</string>
@@ -3346,10 +3349,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"ზარების დაშვება"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"როცა ჩართულია რეჟიმი „არ შემაწუხოთ“, შემომავალი ზარები იბლოკება. სურვილისამებრ, შეგიძლიათ შეცვალოთ პარამეტრები და მისცეთ თქვენთან დაკავშირების საშუალება მეგობრებს, ოჯახის წევრებს და სხვა კონტაქტებს."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"ვარსკვლავით მონიშნული კონტაქტები"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">და <xliff:g id="NUM_PEOPLE">%d</xliff:g> სხვა</item>
-      <item quantity="one">და 1 სხვა</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"შეტყობინებები"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"შეტყობინებების დაშვება"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"შეტყობინებები"</string>
@@ -3779,10 +3779,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"ცივი ფერები"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ეკრანზე ცივი ფერების გამოყენება"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"ფერთა ცვლილების მისასადაგებლად, გამორთეთ ეკრანი"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"კავშირის მონიტორინგი"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"კავშირის გამართულ მუშაობასთან მიმართებით პრობლემის გამოვლენისას, კავშირის მონიტორინგი შეაგროვებს ჟურნალების ჩანაწერებს, ხოლო მომხმარებელს დაუყოვნებლივ აცნობებს და შეცდომის შესახებ მოხსენებას შეთავაზებს"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"კავშირის მონიტორინგთან მიმართებით ცვლილებების მისასადაგებლად, გადატვირთეთ მოწყობილობა"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"კამერის ლაზერული სენსორი"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"ლოგიკური კამერის ნაგულისხმევად გამოყენება"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"სისტემის ავტომატური განახლება"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"განახლებების მიყენება მოწყობილობის გადატვირთვისას"</string>
     <string name="usage" msgid="2977875522080448986">"მოხმარება"</string>
@@ -4092,8 +4090,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"ავტომატური შევსების სერვისი"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"ავტომატური, შევსება, ავტოშევსება"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;დარწმუნდით, რომ ენდობით ამ აპს&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google-ის ავტომატური შევსება&gt;%1$s&lt;/xliff:g&gt; იყენებს თქვენს ეკრანზე არსებულ კონტენტს, რათა გაარკვიოს, რა შეიძლება შეივსოს ავტომატურად."</string>
-    <string name="device_theme" msgid="4571803018917608588">"მოწყობილობის თემა"</string>
+    <string name="color_theme" msgid="1535685696756738324">"ფერთა თემა"</string>
     <string name="default_theme" msgid="7085644992078579076">"ნაგულისხმევი"</string>
+    <string name="device_theme" msgid="4571803018917608588">"მოწყობილობის თემა"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"ავტომატური (ფონის მიხედვით)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"ნათურა"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"მუქი"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"ქსელის სახელი"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"ქსელის სახელის სტატუსის ზოლში ჩვენება"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"მეხსიერების მენეჯერი: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4105,7 +4107,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"ოპერატორის უზრუნველყოფის ინფორმაცია"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ოპერატორის უზრუნველყოფის გაშვება"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"„არ შემაწუხოთ“ რეჟიმის განახლება"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"კონცენტრირების შესანარჩუნებლად შეტყობინებების დამალვა"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"შეტყობინებების დაპაუზება კონცენტრირების შესანარჩუნებლად"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"რა არის ახალი და გამორჩეული?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ისარგებლეთ თქვენი ახალი ტელეფონის გაცნობითი ტურით"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ისარგებლეთ თქვენი ახალი ტაბლეტის გაცნობითი ტურით"</string>
diff --git a/res/values-kk/arrays.xml b/res/values-kk/arrays.xml
index 64540a3..36745b4 100644
--- a/res/values-kk/arrays.xml
+++ b/res/values-kk/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Үнемі қосулы"</item>
     <item msgid="6385301106124765323">"Үнемі өшірулі"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 08f1de0..40702b1 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Планшетіңізге маңайдағы Bluetooth құрылғыларымен байланыс орнатуға рұқсат етіңіз"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Құрылғыңызға маңайдағы Bluetooth құрылғыларымен байланыс орнатуға рұқсат етіңіз"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Телефоныңызға маңайдағы Bluetooth құрылғыларымен байланыс орнатуға рұқсат етіңіз"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Bluetooth A2DP жүктемесін түсіруді өшіру"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Құрылғы қайта қосылсын ба?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Бұл параметрді өзгерту үшін құрылғыны қайта қосу қажет."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Қайта қосу"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Бас тарту"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Қолжетімді медиа құрылғылары"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Қолжетімді қоңырау шалу құрылғылары"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Қазір байланыста тұрғандар"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Байланыс параметрлері"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Бұрын байланысқан құрылғылар"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Бұрын қосылған"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Күн және уақыт"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Уақыт аймағын таңдау"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Сіз терген порт жарамсыз."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP прокси браузер арқылы қолданылады, бірақ басқа қолданбалар оны пайдаланбауы мүмкін."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL мекенжайы: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL өткізу мүмкіндігі (кбит/сек):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL өткізу мүмкіндігі (кбит/сек):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Ұялы желінің орналасқан жері туралы ақпарат (қолдауы тоқтатылды):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Жанындағы ұялы желі туралы ақпарат (қолдауы тоқтатылды):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE физикалық арна конфигурациясы:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Ұялы желі туралы ақпаратты жаңарту жиілігі:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Барлық ұялы желі өлшемдері туралы ақпарат:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Нақты уақыттағы деректер байланысы туралы ақпарат:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Деректер қызметі:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Роуминг:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI (Халықаралық мобильдік құрылғы анықтағышы):"</string>
@@ -376,8 +384,8 @@
     <string name="decryption_settings_summary" product="default" msgid="5671817824042639849">"Телефон шифрланбаған"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Құрылғы шифрланған"</string>
     <string name="decryption_settings_summary" product="tablet" msgid="5794135636155570977">"Құрылғы шифрланбаған"</string>
-    <string name="lockscreen_settings_title" msgid="1099738951060387656">"Құлып экраны дисплейі"</string>
-    <string name="lockscreen_settings_what_to_show_category" msgid="278055252361575926">"Көрсетілетін мазмұн"</string>
+    <string name="lockscreen_settings_title" msgid="1099738951060387656">"Құлып экранындағы ақпарат"</string>
+    <string name="lockscreen_settings_what_to_show_category" msgid="278055252361575926">"Көрсетілетін ақпарат"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Менің аймағым, экран бекіту, SIM картасын құлыптау, растау дерекқорын бекітуді орнату"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Менің аймағым, экран бекітпесі, растау деректері жадының бекітпесін реттеу"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Құпиялылық"</string>
@@ -1007,16 +1015,11 @@
     <string name="emergency_address_title" msgid="932729250447887545">"Төтенше жағдайда пайдаланылатын мекенжай"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Wi‑Fi арқылы жедел қызметке қоңырау шалғанда орналасқан орныңыз ретінде пайдаланылады"</string>
     <string name="private_dns_help_message" msgid="3299567069152568958">"Жеке DNS функциялары туралы "<annotation id="url">"толығырақ"</annotation></string>
-    <!-- no translation found for wifi_calling_pref_managed_by_carrier (6845711858866828986) -->
-    <skip />
-    <!-- no translation found for wifi_calling_settings_activation_instructions (7492509632478260955) -->
-    <skip />
-    <!-- no translation found for wifi_calling_turn_on (1171403510313983983) -->
-    <skip />
-    <!-- no translation found for wifi_calling_not_supported (7878640438907807754) -->
-    <skip />
-    <!-- no translation found for carrier (5264014738689761132) -->
-    <skip />
+    <string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Параметрді оператор басқарады"</string>
+    <string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Wi-Fi қоңырауын іске қосу"</string>
+    <string name="wifi_calling_turn_on" msgid="1171403510313983983">"Wi-Fi қоңырауларын қосу"</string>
+    <string name="wifi_calling_not_supported" msgid="7878640438907807754">"Wi‑Fi қоңырауларын %1$s қолдамайды"</string>
+    <string name="carrier" msgid="5264014738689761132">"Оператор"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Дыбыс"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Дыбыс қаттылығы"</string>
@@ -1151,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Aвтоматтық жарықтық"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ояту үшін көтеру"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Экранды автоматты қосу"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Әрдайым қосулы / Батарея заряды тезірек таусылады"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Жаңа хабарландырулар"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Көрсетілетін уақыты"</string>
     <string name="doze_title" msgid="2375510714460456687">"Жаңа хабарландырулар"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Хабарландырулар келгенде, экранды ұйқы режимінен шығару"</string>
@@ -1197,8 +1198,6 @@
       <item quantity="one">SIM PIN коды дұрыс емес, операторға құрылғы бекітпесін ашуы үшін хабарласуға дейін <xliff:g id="NUMBER_0">%d</xliff:g> әрекет қалды.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM PIN жұмысы орындалмады!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Планшет күйі"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Телефон күйі"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Жүйе жаңартулары"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android нұсқасы"</string>
@@ -1470,7 +1469,7 @@
     <string name="reset_esim_error_title" msgid="1464195710538232590">"eSIM карталарының деректері қайтарылмайды"</string>
     <string name="reset_esim_error_msg" msgid="8434956817922668388">"Қате пайда болғандықтан, eSIM карталарының деректері қайтарылмайды."</string>
     <string name="master_clear_title" msgid="3531267871084279512">"Барлық деректерді өшіру (зауыттық параметрлерді қайтару)"</string>
-    <string name="master_clear_short_title" msgid="8652450915870274285">"Барлық деректерді өшіру (зауыттық параметрлерді қайтару)"</string>
+    <string name="master_clear_short_title" msgid="8652450915870274285">"Барлық деректерді өшіру"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Бұл сіздің планшетіңіздің "<b>"ішкі жадынан"</b>" барлық дерекқорды өшіреді, келесі деректерді қоса:\n\n"<li>"Google есептік жазбаңыз"</li>\n<li>"Жүйе және қолданба дерекқоры және параметрлері"</li>\n<li>"Жүктелген қолданбалар"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Телефонның "<b>"ішкі жадында"</b>" бар бүкіл дерек өшеді, соның ішінде:\n\n"<li>" Google есептік жазбаңыз"</li>\n<li>"Жүйе және қолданба деректері мен параметрлері"</li>\n<li>"Жүктелген қолданбалар"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Сіз келесі есептік жазбаларға кірдіңіз:\n"</string>
@@ -2119,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Фондық режимде пайдалану шектелмеген"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Фондық режимдегі әрекет шектелсін бе?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Қолданбаның фондық режимдегі әрекетін шектесеңіз, күтпеген әрекет көрсетуі мүмкін."</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Бұл қолданба батареяны оңтайландыруға реттелмегендіктен, оны шектей алмайсыз. \n\nБұл үшін батареяны оңтайландыруды қосыңыз."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Толық зарядталғаннан кейін экранның зарядты тұтынуы"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Экран жарығына жұмсалатын заряд шығыны"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Мобильдік желіні сканерлеу"</string>
@@ -2440,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Төтенше жағдайда теру сигналы"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Төтенше қоңырау шалу әрекетін орнату"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Сақтық көшірме"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Қосу"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Өшіру"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Сақтық көшірме жасау және қалпына келтіру"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Жеке деректер"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Деректердің сақтық көшірмесін жасау"</string>
@@ -2766,6 +2766,12 @@
       <item quantity="one">Сертификатқа құлбелгі қою</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Бірнеше пайдаланушы"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Пайдаланушылар мен профайлдар"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Пайдаланушы немесе профиль қосу"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Пайдаланушы қосу"</string>
@@ -2841,7 +2847,7 @@
     <string name="nfc_payment_pay_with" msgid="7524904024378144072">"\"Tap &amp; pay\" терминалында төлеу жолы:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Терминалда төлеу"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Төлем қолданбасын орнатыңыз. Содан кейін жай телефонның артқы жағын тигізбейтін таңбасы бар кез келген терминал жанында ұстап тұрыңыз."</string>
-    <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Түсіндім"</string>
+    <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Түсінікті"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"Қосымша…"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Қалаулы ретінде реттеу қажет пе?"</string>
     <string name="nfc_payment_set_default" msgid="8532426406310833489">"\"Tap &amp; pay\" үшін әрқашан <xliff:g id="APP">%1$s</xliff:g> пайдаланылсын ба?"</string>
@@ -2948,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"дерек шығыны"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"хотспот"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Байланысқан құрылғылар"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, көлік жүргізу режимі, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, көлік жүргізу режимі"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Қолданбалар мен хабарландырулар"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Рұқсаттар, әдепкі қолданбалар"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Есептік жазбалар"</string>
@@ -2972,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"іске қосқыш, әдепкі, қолданбалар"</string>
     <string name="keywords_display" msgid="8910345814565493016">"экран, сенсорлық экран"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"экранды күңгірттеу, сенсорлық экран, батарея, жарық"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"экранды күңгірттеу, сенсорлық экран, батарея"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"экранды күңгірттеу, түн, реңк, түнгі ауысым, жарықтық, экран түсі, түс"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"фон, жекелендіру, дисплейді теңшеу"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"мәтін өлшемі"</string>
@@ -3013,8 +3014,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"желі, мобильдік желі күйі, қызмет күйі, сигнал күші, мобильдік желі түрі, роуминг, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"сериялық нөмір, жабдық нұсқасы"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android қауіпсіздік түзетуінің деңгейі, тікелей тарату нұсқасы, ядро нұсқасы"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Қосулы экран, құлып экраны"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"саусақ ізі"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"күңгірт экран, сенсорлық экран, батарея, ақылды жарықтық, динамикалық жарықтық"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"бұру, аудару, айналдыру, портреттік, альбомдық, бағыт, тік, көлденең"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"жаңа нұсқа орнату, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"мазаламау, кесте, хабарландырулар, бөгеу, дыбыссыз режим, діріл, ұйқы, жұмыс, ерекшелеу, дыбыс, дыбысын өшіру, күн, жұмыс күні, демалыс күндері, жұмыс күнгі кеш, оқиға"</string>
@@ -3097,18 +3101,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Визуалды сигналдарды қосу"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"\"Мазаламау\" режимі қосулы кезде"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Хабарландырулар"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Хабарландыруларды үнсіз көрсету"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Хабарландырулардың дыбысы өшеді"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Хабарландырулар дыбыстық сигналсыз беріледі"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Хабарландырулар экранға шығады"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Хабарландырулар келіп түскенде, телефон дыбыс шығармайды не дірілдемейді."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Хабарландыруларды жасыру"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Жаңа не бұрыннан бар хабарландырулар көрсетілмейді"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Хабарландырулар визуалды не дыбыстық сигналсыз беріледі"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Хабарландырулар көрсетілмейді не естілмейді"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Телефоныңыз жаңа не бұрыннан бар хабарландыруларды көрсетпейді, сондай-ақ дыбыс шығармайды не дірілдемейді. Экранның жоғары жағынан төмен қарай саусақпен сырғытқанда, хабарландырулар шықпайды.\n\nТелефон әрекеттері мен оның күйі туралы маңызды хабарландырулар өшірілмейтінін ұмытпаңыз."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Арнаулы"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Арнаулы параметрді қосу"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Арнаулы параметрді өшіру"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Шығады"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Хабарландырулар дыбыстық сигналсыз беріледі"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Бір бөлігі жасырулы"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Жасырын"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Хабарландырулар визуалды не дыбыстық сигналсыз беріледі"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Арнаулы шектеулер"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Экран қосулы кезде"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Экран өшірулі кезде"</string>
@@ -3167,19 +3171,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Дыбысы өшірілген, бірақ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> және <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> үшін рұқсат берілген"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Хабарлар, іс-шаралар және еске салғыштар"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"\"Мазаламау\" режимі қосулы кезде, хабарлардың, еске салғыштардың және іс-шаралардың дыбысы өшіріледі (жоғарыда рұқсат берілгендерді қоспағанда). Достарыңыз, отбасы мүшелері не басқа контактілер сізге хабарласа алуы үшін, хабарлардың параметрлерін реттей аласыз."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Дайын"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Параметрлер"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Хабарландырулар визуалды не дыбыстық сигналсыз беріледі"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Хабарландырулар дыбыссыз беріледі"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Хабарландырулар көрсетілмейді не естілмейді. Жұлдызшалы және тұрақты контактілерден келетін қоңырауларға рұқсат етілген."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(ағымдағы параметр)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"\"Мазаламау\" режиміндегі хабарландыру параметрлері өзгертілсін бе?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Жұмыс профилінің дыбыстары"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Жеке профиль дыбыстарын пайдалану"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Жұмыс пен жеке профильдер үшін дыбысы қолданылады"</string>
@@ -3348,17 +3346,12 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Қоңыраулар"</string>
-    <!-- no translation found for zen_mode_calls_title (623395033931747661) -->
-    <skip />
+    <string name="zen_mode_calls_title" msgid="623395033931747661">"Қоңырауларға рұқсат ету"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"\"Мазаламау\" режимі қосулы кезде, кіріс қоңыраулар бөгеледі. Достарыңыз, отбасы мүшелері не басқа контактілер сізге хабарласа алатын етіп параметрлерді реттей аласыз."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Жұлдызшалы контактілер"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">және тағы <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="one">және тағы 1</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Хабарлар"</string>
-    <!-- no translation found for zen_mode_messages_title (7729380010396411129) -->
-    <skip />
+    <string name="zen_mode_messages_title" msgid="7729380010396411129">"Хабарларға рұқсат ету"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Хабарлар"</string>
     <string name="zen_mode_selected_messages" msgid="1047355526202106114">"Кейбір хабарлар"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Бәрінен"</string>
@@ -3372,19 +3365,15 @@
     <string name="zen_mode_media" msgid="8808264142134422380">"Мультимедиа"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"Түрту дыбысы"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Еске салғыштар"</string>
-    <!-- no translation found for zen_mode_reminders_title (2345044406347406902) -->
-    <skip />
+    <string name="zen_mode_reminders_title" msgid="2345044406347406902">"Еске салғыштарға рұқсат ету"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Іс-шаралар"</string>
-    <!-- no translation found for zen_mode_events_title (5597241655883329085) -->
-    <skip />
+    <string name="zen_mode_events_title" msgid="5597241655883329085">"Оқиғаларға рұқсат ету"</string>
     <string name="zen_mode_all_callers" msgid="2378065871253871057">"кез келген адам"</string>
     <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"контактілер"</string>
     <string name="zen_mode_starred_callers" msgid="1023167821338514140">"жұлдызшалы контактілер"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Қайта қоңырау шалушылар"</string>
-    <!-- no translation found for zen_mode_repeat_callers_title (8553876328249671783) -->
-    <skip />
-    <!-- no translation found for zen_mode_calls_summary_one (3972333792749874863) -->
-    <skip />
+    <string name="zen_mode_repeat_callers_title" msgid="8553876328249671783">"Тұрақты қоңырау шалушыларға рұқсат ету"</string>
+    <string name="zen_mode_calls_summary_one" msgid="3972333792749874863">"Кімнен: <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
     <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> және <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Бір адам <xliff:g id="MINUTES">%d</xliff:g> минут ішінде қайта шалса"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Арнаулы"</string>
@@ -3790,10 +3779,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Суық түс температурасы"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Суығырақ дисплей түстерін пайдалану"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Түс өзгерісін қолдану үшін экранды өшіріңіз"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor функциясы байланыс ақауын анықтаған кезде журналдарды жинайды және пайдаланушыға қате туралы есеп жіберуді ұсынады"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Connectivity Monitor функциясындағы өзгеріс күшіне енуі үшін, құрылғыны қайта жүктеңіз"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Камераның лазерлік датчигі"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Логикалық камераны әдепкі ретінде пайдалану"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматты жүйе жаңартулары"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Құрылғы өшіп, қайта қосылғанда, жаңа нұсқа қолданылады"</string>
     <string name="usage" msgid="2977875522080448986">"Трафик"</string>
@@ -4103,8 +4090,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Автотолтыру қызметі"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"авто, толтыру, автотолтыру"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Осы қолданбаның қауіпсіз екеніне көз жеткізіңіз&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; экранда көрсетілгенді пайдаланып, нені автоматты түрде толтыруға болатынын анықтайды."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Құрылғы тақырыбы"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Түс тақырыбы"</string>
     <string name="default_theme" msgid="7085644992078579076">"Әдепкі"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Құрылғы тақырыбы"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Автоматты (тұсқағаз негізінде)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Жарық"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Қараңғы"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Желі атауы"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Күй жолағында желі атауын көрсету"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Жад менеджері: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4116,7 +4107,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Операторды инициализациялау туралы ақпарат"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Операторды инциализациялауды іске қосу"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"\"Мазаламау\" режимін жаңарту"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Алаңдататын хабарландыруларды жасыру"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Алаңдататын хабарландыруларды кідірту"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Қандай қызық жаңа мүмкіндік бар?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Жаңа телефонның ішін аралаңыз"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Жаңа планшеттің ішін аралаңыз"</string>
diff --git a/res/values-km/arrays.xml b/res/values-km/arrays.xml
index e9e36fb..1689486 100644
--- a/res/values-km/arrays.xml
+++ b/res/values-km/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"បើក​ជានិច្ច"</item>
     <item msgid="6385301106124765323">"បិទជានិច្ច"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 45c8725..22f984a 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"អនុញ្ញាត​ឱ្យ​ថេប្លេត​របស់អ្នក​ភ្ជាប់​​ជាមួយ​ឧបករណ៍​ប៊្លូធូស​ដែល​នៅ​ជិត"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"អនុញ្ញាត​ឱ្យ​ឧបករណ៍​របស់អ្នក​ភ្ជាប់​ជាមួយ​ឧបករណ៍​ប៊្លូធូស​ដែល​នៅ​ជិត"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"អនុញ្ញាត​ឱ្យ​ទូរសព្ទ​របស់អ្នក​ភ្ជាប់​​ជាមួយ​ឧបករណ៍​ប៊្លូធូស​ដែល​នៅ​ជិត"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"បិទការ​កាត់បន្ថយ​ការផ្ទុកផ្នែក​រឹង A2DP ប៊្លូធូស"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"ចាប់ផ្តើមឧបករណ៍ឡើងវិញ?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"អ្នក​ត្រូវ​ចាប់ផ្ដើម​ឧបករណ៍​របស់អ្នកឡើងវិញ ដើម្បី​ផ្លាស់ប្ដូរ​ការកំណត់​នេះ។"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"ចាប់ផ្ដើមឡើងវិញ"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"បោះបង់"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"ឧបករណ៍​មេឌៀ​ដែល​អាច​ប្រើ​បាន"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"ឧបករណ៍​ហៅ​ទូរសព្ទ​ដែល​អាច​ប្រើ​បាន"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"បាន​ភ្ជាប់​បច្ចុប្បន្ននេះ"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"​ចំណូល​ចិត្ត​នៃការ​ភ្ជាប់"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"ឧបករណ៍​ដែលបាន​ភ្ជាប់​ពីមុន"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"បាន​ភ្ជាប់​ពីមុន​"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"កាលបរិច្ឆេទ និង ម៉ោង"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"ជ្រើស​តំបន់​ពេល​វេលា"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"ច្រក​ដែល​អ្នក​បាន​បញ្ចូល​មិន​ត្រឹមត្រូវ។"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"ប្រូកស៊ី HTTP ​ប្រើ​ជាមួយ​​កម្មវិធីរុករកតាម​អ៊ីនធឺណិត ប៉ុន្តែ​ប្រហែលជាមិនអាចប្រើជាមួយ​កម្មវិធី​ផ្សេងទេ។"</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"កម្រិត​បញ្ជូន DL (kbps)៖"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"កម្រិត​បញ្ជូន UL (kbps)៖"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"ព័ត៌មានអំពីទីតាំងបណ្តាញចល័ត (បានបញ្ឈប់)៖"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"ព័ត៌មានទិន្នន័យចល័តជិតខាង (បានបញ្ឈប់)៖"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"ការកំណត់​រចនាសម្ព័ន្ធបណ្ដាញរូបវន្ត LTE៖"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"អត្រាធ្វើឲ្យថ្មីឡើងវិញនៃព័ត៌មានទិន្នន័យចល័ត៖"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"ព័ត៌មាននៃការវាស់វែងទិន្នន័យចល័តទាំងអស់៖"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"ព័ត៌មានពេលជាក់ស្តែងនៃការតភ្ជាប់ទិន្នន័យ៖"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"សេវាកម្មទិន្នន័យ៖"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"រ៉ូមីង៖"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI ៖"</string>
@@ -1007,7 +1015,7 @@
     <string name="emergency_address_title" msgid="932729250447887545">"អាសយដ្ឋានគ្រាអាសន្ន"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"ត្រូវបានប្រើជាទីតាំងរបស់អ្នក នៅពេលដែលអ្នកហៅទូរសព្ទសង្គ្រោះបន្ទាន់តាមរយៈ Wi‑Fi"</string>
     <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"ស្វែង​យល់​បន្ថែម"</annotation>"អំពី​មុខងារ DNS ឯកជន"</string>
-    <string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"​កំណត់​ត្រូវ​បាន​គ្រប់គ្រង​ដោយ​ក្រុមហ៊ុន​សេវាទូរសព្ទ"</string>
+    <string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"​ការកំណត់​ត្រូវ​បាន​គ្រប់គ្រង​ដោយ​ក្រុមហ៊ុន​សេវាទូរសព្ទ"</string>
     <string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"បើក​ដំណើរការ​ការ​ហៅ​តាម​ Wi-Fi"</string>
     <string name="wifi_calling_turn_on" msgid="1171403510313983983">"បើក​ការ​ហៅ​តាម Wi‑Fi"</string>
     <string name="wifi_calling_not_supported" msgid="7878640438907807754">"មិន​ស្គាល់​ការហៅតាម Wi‑Fi សម្រាប់​ %1$s នោះទេ"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"ពន្លឺ​ស្វ័យ​ប្រវត្តិ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"លើក​ដៃ​ដើម្បី​ឲ្យ​ភ្ញាក់"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"មុខងារអេក្រង់សម្ងំ"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"បើក​ជានិច្ច / ប្រើ​ថាមពលថ្ម​ច្រើន​ជាងមុន"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"ការជូនដំណឹងថ្មីៗ"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ពេលដែលត្រូវ​បង្ហាញ"</string>
     <string name="doze_title" msgid="2375510714460456687">"ការជូនដំណឹងថ្មីៗ"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ដាស់អេក្រង់នៅពេលដែលអ្នកទទួលបានការជូនដំណឹង"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">លេខកូដសម្ងាត់ស៊ីមមិនត្រឹមត្រូវ អ្នកនៅសល់ការព្យាយាម <xliff:g id="NUMBER_0">%d</xliff:g> ដងទៀត មុនពេលពេលដែលអ្នកត្រូវទាក់ទងទៅអ្នកផ្តល់សេវាកម្មរបស់អ្នកដើម្បីដោះសោឧបករណ៍របស់អ្នក។</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"បាន​បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិ​​លេខ​កូដ PIN ស៊ីម!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"ស្ថានភាព​កុំព្យូទ័រ​បន្ទះ"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"ស្ថានភាព​ទូរស័ព្ទ"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"បច្ចុប្បន្នភាព​ប្រព័ន្ធ"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"កំណែ Android"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"​មិន​អាច​ដាក់​កំហិត​ការប្រើប្រាស់​នៅ​ផ្ទៃ​ខាងក្រោយ​បានទេ"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"ដាក់កម្រិតលើសកម្មភាពផ្ទៃខាងក្រោយ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"ប្រសិនបើអ្នកដាក់កម្រិតលើសកម្មភាពផ្ទៃខាងក្រោយសម្រាប់កម្មវិធី វាអាចនឹងដំណើរការខុសប្រក្រតី"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"ដោយសារ​កម្មវិធីនេះ​មិនត្រូវ​បានកំណត់ ដើម្បី​បង្កើន​ប្រសិទ្ធភាពថ្ម អ្នកមិន​អាចដាក់​កំហិតវា​បានទេ។\n\nដើម្បី​ដាក់កំហិត​កម្មវិធី សូមបើក​ការបង្កើន​ប្រសិទ្ធភាពថ្ម​ជាមុនសិន។"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"ការប្រើប្រាស់អេក្រង់​ចាប់តាំងពី​សាកថ្មពេញ"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"ការប្រើប្រាស់​អេក្រង់"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"ការស្កេន​បណ្ដាញ​ទូរសព្ទ​ចល័ត"</string>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"សញ្ញា​ហៅទូរសព្ទ​ពេលអាសន្ន"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"កំណត់​ឥរិយាបថ​ពេល​ហៅ​ពេល​មាន​អាសន្ន"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"បម្រុង​ទុក"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"បើក"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"បិទ"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"បម្រុងទុក &amp; ស្ដារ​ឡើងវិញ"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"ទិន្នន័យ​ផ្ទាល់ខ្លួន"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"បម្រុង​ទុក​ទិន្នន័យ​របស់​ខ្ញុំ"</string>
@@ -2761,6 +2766,12 @@
       <item quantity="one">ពិនិត្យវិញ្ញាបនបត្រ</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"អ្នក​ប្រើប្រាស់​ច្រើន"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"អ្នកប្រើ &amp; ប្រវត្តិរូប"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"បន្ថែម​អ្នក​ប្រើ ឬ​ប្រវត្តិរូប"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"បន្ថែម​អ្នកប្រើ"</string>
@@ -2943,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ការប្រើទិន្នន័យ"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"ហតស្ប៉ត"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"ឧបករណ៍ដែលបានភ្ជាប់"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"ប៊្លូធូស, មុខងារ​បើកបរ, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"ប៊្លូធូស មុខងារ​បើកបរ"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"ប៊្លូធូស, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"ប៊្លូធូស"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"កម្មវិធី និងការជូនដំណឹង"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ការ​អនុញ្ញាត កម្មវិធី​លំនាំដើម"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"គណនី"</string>
@@ -2967,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"កម្មវិធីចាប់ផ្តើម លំនាំដើម កម្មវិធី"</string>
     <string name="keywords_display" msgid="8910345814565493016">"អេក្រង់, ប៉ះអេក្រង់"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"អេក្រង់​ខ្សោយ​ពន្លឺ អេក្រង់ចុច ថ្ម ភ្លឺ"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"អេក្រង់ព្រិល, ប៉ះអេក្រង់, ថ្ម"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"អេក្រង់​ខ្សោយ​ពន្លឺ រាត្រី ពណ៌ព្រឿងៗ វេនយប់ ភាពភ្លឺ ពណ៌​អេក្រង់ ពណ៌ ពណ៌"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"ផ្ទៃខាងក្រោយ, ធ្វើលក្ខណៈផ្ទាល់ខ្លួន, កំណត់ការបង្ហាញផ្ទាល់ខ្លួន"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ទំហំ​អក្សរ"</string>
@@ -3008,8 +3014,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"បណ្តាញ, ស្ថាន​ភាព​បណ្តាញ​ទូរសព្ទចល័ត, ស្ថានភាព​សេវាកម្ម, កម្លាំងរលកសញ្ញា, ប្រភេទ​បណ្តាញ​ទូរសព្ទចល័ត, រ៉ូ​មីង, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"លេខស៊េរី កំណែផ្នែក​រឹង"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"កម្រិតផេឆសុវត្ថិភាព android, កំណែ​មូលដ្ឋាន, កំណែ​ខឺណែល"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"មុខងារ​អេក្រង់​សម្ងំ មុខងារ​អេក្រង់​ចាក់សោ"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"ស្នាមម្រាមដៃ"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"អេក្រង់​ខ្សោយពន្លឺ អេក្រង់​ចុច ថ្ម ពន្លឺ​ចែងចាំង ពន្លឺ​ឌីណាមិក"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"បង្វិល ត្រឡប់ រង្វិល បញ្ឈរ ផ្តេក ទិស បន្ទាត់ឈរ បន្ទាត់ដេក"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"ដំឡើងកំណែ, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, កាលវិភាគ ការជូនដំណឹង ទប់ស្កាត់ ស្ងាត់ ញ័រ ដេក ធ្វើការ ផ្តោត សំឡេង បិទសំឡេង ថ្ងៃ ថ្ងៃធ្វើការ ចុងសប្តាហ៍ ពេលយប់នៃថ្ងៃធ្វើការ ព្រឹត្តិការណ៍"</string>
@@ -3092,18 +3101,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"អនុញ្ញាត​សញ្ញា​ដែលមើល​ឃើញ"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"នៅ​ពេល​មុខងារ​កុំ​រំខាន​បើក"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"ការ​ជូនដំណឹង"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"បង្ហាញការជូនដំណឹងស្ងាត់ៗ"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"ការជូន​ដំណឹង​នឹង​ត្រូវ​បានបិទ​សំឡេង"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"គ្មានសំឡេង​ពីការជូន​ដំណឹងទេ"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"អ្នក​នឹង​ឃើញ​ការ​ជូនដំណឹង​នៅលើអេក្រង់​របស់អ្នក"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"នៅ​ពេល​មាន​ការ​ជូនដំណឹង ទូរសព្ទ​របស់អ្នក​នឹង​មិន​បន្លឺ​សំឡេង ឬ​ញ័រ​ទេ។"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"លាក់​ការជូន​ដំណឹង"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"អ្នក​នឹង​មិន​ឃើញ​ការ​ជូនដំណឹង​ថ្មីៗ ឬ​ដែល​មាន​ស្រាប់​ទេ"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"គ្មាន​រូបភាព ឬសំឡេងពីការជូនដំណឹង​ទេ"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"អ្នក​នឹង​មិនឃើញ ឬឮការជូនដំណឹង​ទេ"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"ទូរសព្ទ​របស់អ្នក​នឹងមិន​បង្ហាញ​ការ​ជូនដំណឹង​ថ្មីៗ ឬ​ដែលមាន​ស្រាប់​ ហើយ​នឹងមិន​បន្លឺសំឡេង ឬញ័រ​ទេ។ ការជូនដំណឹង​នឹងមិន​បង្ហាញទេ នៅពេលអ្នកអូស​អេក្រង់​របស់អ្នក​ពី​លើ​ចុះ​ក្រោម។\n\nសូមចាំថា ការជូនដំណឹង​សំខាន់ៗ​សម្រាប់​ស្ថានភាព និង​សកម្មភាព​ទូរសព្ទនឹង​នៅតែ​បង្ហាញ។"</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"តាម​បំណង"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"បើក​ការ​កំណត់​តាមបំណង"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"លុប​ការ​កំណត់​តាម​បំណង"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"នឹង​បង្ហាញ"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"គ្មានសំឡេង​ពីការជូន​ដំណឹងទេ"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"លាក់​មួយ​ផ្នែក"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"លាក់"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"គ្មាន​រូបភាព ឬសំឡេងពីការជូនដំណឹង​ទេ"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"ការ​ដាក់​កំហិត​តាម​បំណង"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"នៅ​ពេល​អេកេ្រង់​បើក"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"នៅពេល​អេក្រង់​បិទ"</string>
@@ -3162,19 +3171,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"បានបិទ​សំឡេង​ ប៉ុន្តែ​អនុញ្ញាត​ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> និង <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"សារ ព្រឹត្តិការណ៍ និងការរំលឹក"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"នៅ​ពេល​មុខងារ​កុំរំខាន​បើក សារ ការរំលឹក និង​ព្រឹត្តិការណ៍​នឹង​​ត្រូវបានបិទ​សំឡេង លើក​លែង​តែធាតុ​ដែល​អ្នកអនុញ្ញាត​ខាង​លើតែប៉ុណ្ណោះ។ អ្នក​អាច​កែតម្រូវ​ការកំណត់​សារ ដើម្បី​អនុញ្ញាត​​ឱ្យ​មិត្តភ័ក្តិ ក្រុមគ្រួសារ ឬ​ទំនាក់ទំនង​ផ្សេង​ទៀត​របស់អ្នកអាច​ទាក់ទង​អ្នកបាន។"</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"រួចរាល់"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"ការកំណត់"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"គ្មាន​រូបភាព ឬសំឡេងពីការជូនដំណឹង​ទេ"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"គ្មានសំឡេង​ពីការជូន​ដំណឹងទេ"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"អ្នកនឹង​មិនឃើញ ឬមិន​​ឮការជូន​ដំណឹងទេ។ ការហៅ​ទូរសព្ទ​ពីទំនាក់​ទំនងមានផ្កាយ និង​អ្នកហៅ​ទូរសព្ទ​ដដែលៗ​ត្រូវបាន​អនុញ្ញាត។"</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(ការកំណត់​បច្ចុប្បន្ន)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"ប្ដូរ​ការកំណត់​ការជូនដំណឹង​នៃមុខងារ​កុំរំខាន?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"សំឡេងប្រវត្តិរូបការងារ"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"ប្រើសំឡេងប្រវត្តិរូបផ្ទាល់ខ្លួន"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"សំឡេងសម្រាប់កម្រងព័ត៌មានការងារ និងផ្ទាល់ខ្លួនគឺដូចគ្នា"</string>
@@ -3346,10 +3349,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"អនុញ្ញាត​ការហៅ"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"នៅពេល​មុខងារ​កុំរំខាន​បើក ការហៅចូល​ត្រូវបាន​ទប់ស្កាត់។ អ្នកអាច​កែតម្រូវ​ការកំណត់ ដើម្បី​អនុញ្ញាតឱ្យ​មិត្តភ័ក្តិ គ្រួសារ ឬទំនាក់ទំនង​ផ្សេងទៀត​របស់អ្នក​អាចទាក់ទង​អ្នកបាន។​"</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"ទំនាក់​ទំនង​​​​​មាន​ផ្កាយ"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">និង <xliff:g id="NUM_PEOPLE">%d</xliff:g> នាក់ទៀត</item>
-      <item quantity="one">និង 1 នាក់ទៀត</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"សារ"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"អនុញ្ញាត​សារ"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"សារ"</string>
@@ -3779,10 +3779,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"សីតុណ្ហភាពពណ៌ត្រជាក់"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ប្រើពណ៌បង្ហាញត្រជាក់ជាងមុន"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"ដើម្បីប្តូរពណ៌ សូមបិទអេក្រង់"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"កម្មវិធីតាមដានការភ្ជាប់"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"កម្មវិធីតាមដានការភ្ជាប់ នឹងប្រមូលកំណត់ហេតុ នៅពេលវារកឃើញបញ្ហាក្នុងការភ្ជាប់ និងបញ្ជូនការ​ជូន​ដំណឹង​ទៅកាន់​អ្នក​ប្រើប្រាស់​ដើម្បី​រាយការណ៍​ពី​បញ្ហា"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"ដើម្បី​អនុវត្ត​ការ​ផ្លាស់ប្តូរលើកម្មវិធីតាមដានការភ្ជាប់ សូម​ចាប់ផ្តើម​ឧបករណ៍​ឡើងវិញ"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"ឧបករណ៍ចាប់សញ្ញារបស់កាមេរ៉ាដែលការពារពន្លឺឡាស៊ែរ"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Logical Camera ជាលំនាំដើម"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"បច្ចុប្បន្នភាពប្រព័ន្ធដោយស្វ័យប្រវត្តិ"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"អនុវត្ត​កំណែថ្មី ​នៅពេល​ឧបករណ៍​ចាប់ផ្តើម​ឡើងវិញ"</string>
     <string name="usage" msgid="2977875522080448986">"ការប្រើប្រាស់"</string>
@@ -4092,8 +4090,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"សេវាកម្មបំពេញដោយស្វ័យប្រវត្តិ"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"ស្វ័យ​ប្រវត្តិ បំពេញ បំពេញ​ស្វ័យ​ប្រវត្តិ"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;ត្រូវ​ប្រាកដថា​អ្នក​ជឿជាក់​លើ​កម្មវិធី​នេះ&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google បំពេញស្វ័យប្រវត្តិ&gt;%1$s&lt;/xliff:g&gt; ប្រើប្រាស់​អ្វី​ដែល​មាននៅ​លើ​អេក្រង់​របស់អ្នក ដើម្បី​កំណត់​អ្វីដែល​អាចបំពេញ​ដោយ​ស្វ័យប្រវត្តិ។"</string>
-    <string name="device_theme" msgid="4571803018917608588">"រចនាប័ទ្ម​ឧបករណ៍"</string>
+    <string name="color_theme" msgid="1535685696756738324">"រចនាប័ទ្ម​ពណ៌"</string>
     <string name="default_theme" msgid="7085644992078579076">"លំ​នាំ​ដើម"</string>
+    <string name="device_theme" msgid="4571803018917608588">"រចនាប័ទ្ម​ឧបករណ៍"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"ស្វ័យប្រវត្តិ (ផ្អែកលើ​ផ្ទាំងរូបភាព)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"ភ្លឺ"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"ងងឹត"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"ឈ្មោះ​បណ្តាញ"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"បង្ហាញឈ្មោះបណ្ដាញនៅក្នុងរបារស្ថានភាព"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"កម្មវិធី​គ្រប់គ្រង​ទំហំផ្ទុក៖ <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4105,7 +4107,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"ព័ត៌មាន​អំពី​ការ​ផ្តល់​ទិន្នន័យ​របស់​ក្រុមហ៊ុន​បម្រើ​សេវា​ទូរសព្ទ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ជំរុញ​ការ​ផ្តល់​ទិន្នន័យ​របស់​ក្រុមហ៊ុន​បម្រើ​សេវា​ទូរសព្ទ"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"ធ្វើ​បច្ចុប្បន្នភាព​មុខងារ​កុំរំខាន"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"លាក់​ការជូនដំណឹង​ដើម្បីផ្តោត​អារម្មណ៍"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"ផ្អាក​ការជូនដំណឹង​ដើម្បីផ្តោត​អារម្មណ៍"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"តើមានអ្វីដែលថ្មី និងគួរឲ្យចាប់អារម្មណ៍ដែរទេ?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"មើលការណែនាំ​ទូរសព្ទថ្មី​របស់អ្នក"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"មើលការណែនាំ​ថេប្លេតថ្មីរបស់អ្នក"</string>
diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml
index 8930da7..b215d1b 100644
--- a/res/values-kn/arrays.xml
+++ b/res/values-kn/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"ಯಾವಾಗಲೂ ಆನ್"</item>
     <item msgid="6385301106124765323">"ಯಾವಾಗಲೂ ಆಫ್"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index f04dd8b..df5f142 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"ಸಮೀಪದ ಬ್ಲೂಟೂತ್ ಸಾಧನಗಳೊಂದಿಗೆ ಸಂವಹನ ನಡೆಸಲು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"ಸಮೀಪದ ಬ್ಲೂಟೂತ್ ಸಾಧನಗಳೊಂದಿಗೆ ಸಂವಹನ ನಡೆಸಲು ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"ಸಮೀಪದ ಬ್ಲೂಟೂತ್ ಸಾಧನಗಳೊಂದಿಗೆ ಸಂವಹನ ನಡೆಸಲು ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನುಮತಿಸಿ"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Bluetooth A2DP ಹಾರ್ಡ್‌ವೇರ್‌ ಅಪ್‌ಲೋಡ್‌ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"ಸಾಧನ ಮರುಪ್ರಾರಂಭಿಸಬೇಕೆ?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"ಈ ಸೆಟ್ಟಿಂಗ್ ಅನ್ನು ಬದಲಾಯಿಸಲು ನಿಮ್ಮ ಸಾಧನವನ್ನು ನೀವು ಮರುಪ್ರಾರಂಭಿಸುವ ಅಗತ್ಯವಿದೆ."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"ಮರುಪ್ರಾರಂಭ"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"ರದ್ದುಮಾಡಿ"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"ಲಭ್ಯವಿರುವ ಮಾಧ್ಯಮ ಸಾಧನಗಳು"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"ಲಭ್ಯವಿರುವ ಕರೆ ಸಾಧನಗಳು"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"ಪ್ರಸ್ತುತ ಸಂಪರ್ಕಿಸಲಾಗಿದೆ"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"ಸಂಪರ್ಕ ಆದ್ಯತೆಗಳು"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"ಹಿಂದೆ ಸಂಪರ್ಕಗೊಂಡಿದ್ದ ಸಾಧನಗಳು"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"ಹಿಂದೆ ಸಂಪರ್ಕಗೊಂಡಿದ್ದ"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"ದಿನಾಂಕ &amp; ಸಮಯ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"ಸಮಯದ ವಲಯವನ್ನು ಆರಿಸಿ"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"ನೀವು ಟೈಪ್‌ ಮಾಡಿದ ಪೋರ್ಟ್ ಮಾನ್ಯವಾಗಿಲ್ಲ."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"ಬ್ರೌಸರ್ HTTP ಪ್ರಾಕ್ಸಿ ಬಳಸಿಕೊಂಡಿದೆ. ಇತರೆ ಆಪ್‌ಗಳು ಬಳಸಿಕೊಳ್ಳದೆ ಇರಬಹುದು."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL ಬ್ಯಾಂಡ್‌ವಿಡ್ತ್ (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL ಬ್ಯಾಂಡ್‌ವಿಡ್ತ್ (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"ಸೆಲ್ ಸ್ಥಳ ಮಾಹಿತಿ (ತಡೆಹಿಡಿಯಲಾಗಿದೆ):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"ನೆರೆಯ ಸೆಲ್ ಮಾಹಿತಿ (ತಡೆಹಿಡಿಯಲಾಗಿದೆ):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE ಭೌತಿಕ ಚಾನೆಲ್ ಕಾನ್ಫಿಗರೇಶನ್:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"ಸೆಲ್ ಮಾಹಿತಿ ರಿಫ್ರೆಶ್ ದರ:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"ಎಲ್ಲಾ ಸೆಲ್ ಮಾಪನ ಮಾಹಿತಿ:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"ಡೇಟಾ ಸಂಪರ್ಕ ನೈಜ-ಸಮಯದ ಮಾಹಿತಿ:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"ಡೇಟಾ ಸೇವೆ:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"ರೋಮಿಂಗ್:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1007,16 +1015,11 @@
     <string name="emergency_address_title" msgid="932729250447887545">"ತುರ್ತು ವಿಳಾಸ"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"ವೈ-ಫೈ ಮೂಲಕ ತುರ್ತು ಕರೆಯನ್ನು ನೀವು ಮಾಡಿದಾಗ ನಿಮ್ಮ ಸ್ಥಳದಂತೆ ಬಳಸಲಾಗುತ್ತದೆ"</string>
     <string name="private_dns_help_message" msgid="3299567069152568958">"ಖಾಸಗಿ DNS ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಕುರಿತು "<annotation id="url">"ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ"</annotation></string>
-    <!-- no translation found for wifi_calling_pref_managed_by_carrier (6845711858866828986) -->
-    <skip />
-    <!-- no translation found for wifi_calling_settings_activation_instructions (7492509632478260955) -->
-    <skip />
-    <!-- no translation found for wifi_calling_turn_on (1171403510313983983) -->
-    <skip />
-    <!-- no translation found for wifi_calling_not_supported (7878640438907807754) -->
-    <skip />
-    <!-- no translation found for carrier (5264014738689761132) -->
-    <skip />
+    <string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"ವಾಹಕದಿಂದ ಸೆಟ್ಟಿಂಗ್‌ ನಿರ್ವಹಿಸಲ್ಪಡುತ್ತದೆ"</string>
+    <string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"ವೈ-ಫೈ ಕರೆ ಮಾಡುವಿಕೆಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <string name="wifi_calling_turn_on" msgid="1171403510313983983">"ವೈ-ಫೈ ಕರೆ ಮಾಡುವಿಕೆ ಆನ್‌ ಮಾಡಿ"</string>
+    <string name="wifi_calling_not_supported" msgid="7878640438907807754">"%1$s ಗಾಗಿ ವೈ-ಫೈ ಕರೆಯನ್ನು ಬೆಂಬಲಿತವಾಗಿಲ್ಲ"</string>
+    <string name="carrier" msgid="5264014738689761132">"ವಾಹಕ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ಪ್ರದರ್ಶನ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ಧ್ವನಿ"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ವಾಲ್ಯುಮ್‌ಗಳು"</string>
@@ -1151,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"ಸ್ವಯಂಚಾಲಿತ ಪ್ರಖರತೆ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"ಎಬ್ಬಿಸಲು ಎತ್ತಿರಿ"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"ಆಂಬಿಯೆಂಟ್ ಡಿಸ್‌ಪ್ಲೇ"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"ಯಾವಾಗಲೂ ಆನ್ / ಅಧಿಕ ಬ್ಯಾಟರಿ ಬಳಕೆ"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"ಹೊಸ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ಯಾವಾಗ ತೋರಿಸಬೇಕು"</string>
     <string name="doze_title" msgid="2375510714460456687">"ಹೊಸ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ಅಧಿಸೂಚನೆಗಳನ್ನು ನೀವು ಸ್ವೀಕರಿಸಿದಾಗ ಪರದೆಯನ್ನು ಎಚ್ಚರಗೊಳಿಸಿ"</string>
@@ -1197,8 +1198,6 @@
       <item quantity="other">ಸಿಮ್‌ ಪಿನ್ ಕೋಡ್‌ ತಪ್ಪಾಗಿದೆ, ನಿಮ್ಮಲ್ಲಿ <xliff:g id="NUMBER_1">%d</xliff:g> ಪ್ರಯತ್ನಗಳು ಬಾಕಿ ಉಳಿದಿವೆ.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"ಸಿಮ್‌ ಪಿನ್‌ ಕಾರ್ಯಾಚರಣೆ ವಿಫಲವಾಗಿದೆ!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"ಟ್ಯಾಬ್ಲೆಟ್ ಸ್ಥಿತಿ"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"ಫೋನ್ ಸ್ಥಿತಿ"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"ಸಿಸ್ಟಂ ಅಪ್‌ಡೇಟ್‌ಗಳು"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android ಆವೃತ್ತಿ"</string>
@@ -2119,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"ಹಿನ್ನೆಲೆ ಬಳಕೆಯನ್ನು ನಿರ್ಬಂಧಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"ಹಿನ್ನೆಲೆ ಚಟುವಟಿಕೆಯನ್ನು ಸೀಮಿತಗೊಳಿಸುವುದೇ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"ಒಂದು ಅಪ್ಲಿಕೇಶನ್‌ನ ಹಿನ್ನೆಲೆ ಚಟುವಟಿಕೆಯನ್ನು ನೀವು ಸೀಮಿತಗೊಳಿಸಿದರೆ, ಅದು ಸರಿಯಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸದಿರಬಹುದು"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"ಬ್ಯಾಟರಿ ಅನ್ನು ಆಪ್ಟಿಮೈಜ್ ಮಾಡಲು ಈ ಅಪ್ಲಿಕೇಶನ್ ಹೊಂದಿಸದ ಕಾರಣ, ನೀವು ಇದನ್ನು ನಿರ್ಬಂಧಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.\n\n ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ನಿರ್ಬಂಧಿಸಲು, ಮೊದಲು ಬ್ಯಾಟರಿ ಆಪ್ಟಿಮೈಸೇಷನ್ ಅನ್ನು ಆನ್ ಮಾಡಿ."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"ಕೊನೆಯ ಬಾರಿ ಪೂರ್ಣ ಚಾರ್ಜ್ ಬಳಿಕ ಪರದೆಯ ಬಳಕೆ"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"ಪರದೆ ಬಳಕೆ ಮಾಡಿದ್ದು"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್‌ ಸ್ಕ್ಯಾನ್ ಮಾಡುವುದು"</string>
@@ -2440,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"ತುರ್ತು ಡೈಯಲಿಂಗ್ ಸಿಗ್ನಲ್"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"ತುರ್ತು ಕರೆ ಮಾಡಿದಾಗ ಕಾರ್ಯ ರೀತಿಯನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"ಬ್ಯಾಕಪ್"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"ಆನ್"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"ಆಫ್"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"ಬ್ಯಾಕಪ್ &amp; ಮರುಸ್ಥಾಪನೆ"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"ವೈಯಕ್ತಿಕ ಡೇಟಾ"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"ನನ್ನ ಡೇಟಾ ಬ್ಯಾಕಪ್ ಮಾಡು"</string>
@@ -2766,6 +2766,12 @@
       <item quantity="other">ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಪರಿಶೀಲಿಸಿ</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"ಬಹು ಬಳಕೆದಾರರು"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"ಬಳಕೆದಾರರು &amp; ಪ್ರೊಫೈಲ್‌ಗಳು"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ಬಳಕೆದಾರ ಅಥವಾ ಪ್ರೊಫೈಲ್ ಸೇರಿಸಿ"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಿ"</string>
@@ -2948,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ಡೇಟಾ ಬಳಕೆ"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"ಹಾಟ್‌ಸ್ಪಾಟ್"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"ಸಂಪರ್ಕಗೊಂಡಿರುವ ಸಾಧನಗಳು"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"ಬ್ಲೂಟೂತ್, ಡ್ರೈವಿಂಗ್ ಮೋಡ್, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"ಬ್ಲೂಟೂತ್, ಡ್ರೈವಿಂಗ್ ಮೋಡ್"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"ಬ್ಲೂಟೂತ್, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"ಬ್ಲೂಟೂತ್"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ಆ್ಯಪ್ &amp; ಅಧಿಸೂಚನೆ"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ಅನುಮತಿಗಳು, ಡಿಫಾಲ್ಟ್ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"ಖಾತೆಗಳು"</string>
@@ -2972,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"ಲಾಂಚರ್, ಡಿಫಾಲ್ಟ್, ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ಪರದೆ, ಟಚ್‌ಸ್ಕ್ರೀನ್"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"ಮಂದ ಪರದೆ, ಟಚ್‌ಸ್ಕ್ರೀನ್, ಬ್ಯಾಟರಿ, ಪ್ರಖರತೆ"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"ಡಿಮ್‌‌ ಪರದೆ, ಟಚ್‌ಸ್ಕ್ರೀನ್, ಬ್ಯಾಟರಿ"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"ಮಂದ ಪರದೆ, ರಾತ್ರಿ, ಟಿಂಟ್, ರಾತ್ರಿ ಪಾಳಿ, ಪ್ರಕಾಶಮಾನ, ಪರದೆ ಬಣ್ಣ, ಬಣ್ಣ, ಬಣ್ಣ"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"ಹಿನ್ನೆಲೆ, ವೈಯಕ್ತೀಕರಿಸು, ಕಸ್ಟಮೈಸ್ ಪ್ರದರ್ಶನ"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ಪಠ್ಯದ ಗಾತ್ರ"</string>
@@ -3013,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"ನೆಟ್‌ವರ್ಕ್, ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್ ಸ್ಥಿತಿ, ಸೇವಾ ಸ್ಥಿತಿ, ಸಿಗ್ನಲ್ ಸಾಮರ್ಥ್ಯ, ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್ ವಿಧ, ರೋಮಿಂಗ್, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"ಕ್ರಮ ಸಂಖ್ಯೆ, ಹಾರ್ಡ್‌ವೇರ್ ಆವೃತ್ತಿ"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android ಭದ್ರತೆ ಪ್ಯಾಚ್ ಮಟ್ಟ, ಬೇಸ್‌ಬ್ಯಾಂಡ್ ಆವೃತ್ತಿ, ಕೆರ್ನಲ್ ಆವೃತ್ತಿ"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"ಆಂಬಿಯೆಂಟ್ ಡಿಸ್‌ಪ್ಲೇ, ಲಾಕ್ ಸ್ಕ್ರೀನ್ ಡಿಸ್‌ಪ್ಲೇ"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"ಫಿಂಗರ್‌ ಪ್ರಿಂಟ್"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"ತಿರುಗಿಸಿ, ಫ್ಲಿಪ್, ಸರದಿ, ಭಾವಚಿತ್ರ, ಲ್ಯಾಂಡ್‌ಸ್ಕೇಪ್, ದೃಷ್ಟಿಕೋನ, ಲಂಬವಾದ, ಅಡ್ಡವಾದ"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"ಅಪ್‌ಗ್ರೇಡ್ ಮಾಡಿ, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, ನಿಗದಿಗೊಳಿಸಿ, ಅಧಿಸೂಚನೆಗಳು, ನಿರ್ಬಂಧಿಸಿ, ನಿಶ್ಯಬ್ಧಗೊಳಿಸಿ, ವೈಬ್ರೇಟ್, ನಿದ್ರಾವಸ್ಥೆ, ಕೆಲಸ, ಫೋಕಸ್, ಧ್ವನಿ, ಮ್ಯೂಟ್, ದಿನ, ವಾರದದಿನ, ವಾರಾಂತ್ಯ, ವಾರದ ರಾತ್ರಿ, ಈವೆಂಟ್"</string>
@@ -3097,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"ದೃಶ್ಯ ಸಂಕೇತಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಆನ್ ಇದ್ದಾಗ"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"ಅಧಿಸೂಚನೆಗಳು"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"ಅಧಿಸೂಚನೆಗಳನ್ನು ನಿಶ್ಯಬ್ಧವಾಗಿ ತೋರಿಸಿ"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"ಅಧಿಸೂಚನೆಗಳನ್ನು ಮ್ಯೂಟ್ ಮಾಡಲಾಗುತ್ತದೆ"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"ಅಧಿಸೂಚನೆಗಳಿಂದ ಯಾವುದೇ ಧ್ವನಿ ಇಲ್ಲ"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"ನಿಮ್ಮ ಪರದೆಯ ಮೇಲೆ ನೀವು ಅಧಿಸೂಚನೆಗಳನ್ನು ನೋಡುತ್ತೀರಿ"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"ಹೊಸ ಅಧಿಸೂಚನೆಗಳು ಬಂದಾಗ ನಿಮ್ಮ ಫೋನ್ ಧ್ವನಿ ಮಾಡುವುದಿಲ್ಲ ಅಥವಾ ವೈಬ್ರೇಟ್‌ ಆಗುವುದಿಲ್ಲ."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"ಅಧಿಸೂಚನೆಗಳನ್ನು ಮರೆಮಾಡಿ"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"ನೀವು ಹೊಸ ಅಥವಾ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಅಧಿಸೂಚನೆಗಳನ್ನು ನೋಡುವುದಿಲ್ಲ"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"ಅಧಿಸೂಚನೆಗಳಿಂದ ಯಾವುದೇ ದೃಶ್ಯಗಳು ಅಥವಾ ಧ್ವನಿಗಳಿಲ್ಲ"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"ನೀವು ಅಧಿಸೂಚನೆಗಳನ್ನು ನೋಡುವುದಿಲ್ಲ ಅಥವಾ ಆಲಿಸುವುದಿಲ್ಲ"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"ನಿಮ್ಮ ಫೋನ್ ಹೊಸ ಅಥವಾ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸುವುದಿಲ್ಲ, ಮತ್ತು ಧ್ವನಿ ಅಥವಾ ವೈಬ್ರೇಟ್ ಮಾಡುವುದಿಲ್ಲ. ನೀವು ಸ್ಕ್ರೀನ್‍ನ ಮೇಲಿನಿಂದ ಕೆಳಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿದಾಗ ಅಧಿಸೂಚನೆಗಳು ಗೋಚರಿಸುವುದಿಲ್ಲ.\n\nನೆನಪಿನಲ್ಲಿಡಿ, ಫೋನ್ ನ ಚಟುವಟಿಕೆಯ ಮತ್ತು ಸ್ಥಿತಿಯ ಗಂಭೀರ ಅಧಿಸೂಚನೆಗಳು ಇನ್ನೂ ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತವೆ."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"ಕಸ್ಟಮ್"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"ಕಸ್ಟಮ್ ಸೆಟ್ಟಿಂಗ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"ಕಸ್ಟಮ್ ಸೆಟ್ಟಿಂಗ್ ಅನ್ನು ತೆಗೆದುಹಾಕಿ"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"ಗೋಚರಿಸುತ್ತದೆ"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"ಅಧಿಸೂಚನೆಗಳಿಂದ ಯಾವುದೇ ಧ್ವನಿ ಇಲ್ಲ"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"ಭಾಗಶಃ ಮರೆಮಾಡಲಾಗಿದೆ"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"ಮರೆಮಾಡಿರುವುದು"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"ಅಧಿಸೂಚನೆಗಳಿಂದ ಯಾವುದೇ ದೃಶ್ಯಗಳು ಅಥವಾ ಧ್ವನಿಗಳಿಲ್ಲ"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"ಕಸ್ಟಮ್ ನಿರ್ಬಂಧಗಳು"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"ಪರದೆಯು ಆನ್ ಆಗಿರುವಾಗ"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"ಪರದೆಯು ಆಫ್ ಆಗಿರುವಾಗ"</string>
@@ -3167,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"ಮ್ಯೂಟ್ ಮಾಡಲಾಗಿದೆ, ಆದರೆ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>, ಮತ್ತು <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> ರನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"ಸಂದೇಶಗಳು, ಈವೆಂಟ್‌ಗಳು &amp; ಜ್ಞಾಪನೆಗಳು"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಆನ್ ಇದ್ದಾಗ, ನೀವು ಮೇಲ್ಭಾಗದಲ್ಲಿ ಅನುಮತಿಸುವ ಐಟಂಗಳನ್ನು ಹೊರತುಪಡಿಸಿ, ಸಂದೇಶಗಳು, ಜ್ಞಾಪನೆಗಳು ಮತ್ತು ಈವೆಂಟ್‌ಗಳು ಮ್ಯೂಟ್ ಆಗುತ್ತವೆ. ನಿಮ್ಮ ಸ್ನೇಹಿತರು, ಕುಟುಂಬ, ಅಥವಾ ಇತರ ಸಂಪರ್ಕಗಳು ನಿಮ್ಮನ್ನು ತಲುಪಲು ಅನುಮತಿಸಲು ಸಂದೇಶಗಳ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ನೀವು ಸರಿಹೊಂದಿಸಬಹುದು."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"ಮುಗಿದಿದೆ"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"ಅಧಿಸೂಚನೆಗಳಿಂದ ಯಾವುದೇ ದೃಶ್ಯಗಳು ಅಥವಾ ಧ್ವನಿಗಳಿಲ್ಲ"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"ಅಧಿಸೂಚನೆಗಳಿಂದ ಯಾವುದೇ ಧ್ವನಿ ಇಲ್ಲ"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"ನೀವು ಅಧಿಸೂಚನೆಗಳನ್ನು ನೋಡುವುದಿಲ್ಲ ಅಥವಾ ಆಲಿಸುವುದಿಲ್ಲ. ನಕ್ಷತ್ರ ಗುರುತು ಮಾಡಿದ ಸಂಪರ್ಕಗಳಿಂದ ಕರೆಗಳು ಮತ್ತು ಪುನರಾವರ್ತಿತ ಕರೆಗಳನ್ನು ಅನುಮತಿಸಲಾಗಿದೆ."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(ಪ್ರಸ್ತುತ ಸೆಟ್ಟಿಂಗ್)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"ಅಡಚಣೆ ಮಾಡಬೇಡ ಅಧಿಸೂಚನೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬದಲಾಯಿಸುವುದೇ?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಧ್ವನಿಗಳು"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"ವೈಯಕ್ತಿಕ ಪ್ರೊಫೈಲ್ ಧ್ವನಿಗಳನ್ನು ಬಳಸಿ"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"ಕೆಲಸ ಮತ್ತು ವೈಯಕ್ತಿಕ ಪ್ರೊಫೈಲ್‌ಗಳಿಗೆ ಧ್ವನಿಗಳು ಒಂದೇ ಆಗಿವೆ"</string>
@@ -3348,17 +3347,12 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> ರಿಂದ <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"ಕರೆಗಳು"</string>
-    <!-- no translation found for zen_mode_calls_title (623395033931747661) -->
-    <skip />
+    <string name="zen_mode_calls_title" msgid="623395033931747661">"ಕರೆಗಳಿಗೆ ಅನುಮತಿಸಿ"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಆನ್ ಆದಾಗ ಒಳಬರುವ ಕರೆಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸ್ನೇಹಿತರು, ಕುಟುಂಬ, ಅಥವಾ ಇತರ ಸಂಪರ್ಕಗಳು ನಿಮ್ಮನ್ನು ತಲುಪಲು ಅನುಮತಿಸಲು ನೀವು ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಸರಿಹೊಂದಿಸಬಹುದು."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"ನಕ್ಷತ್ರ ಹಾಕಿರುವ ಸಂಪರ್ಕಗಳು"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">ಮತ್ತು <xliff:g id="NUM_PEOPLE">%d</xliff:g> ಇತರರು</item>
-      <item quantity="other">ಮತ್ತು <xliff:g id="NUM_PEOPLE">%d</xliff:g> ಇತರರು</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"ಸಂದೇಶಗಳು"</string>
-    <!-- no translation found for zen_mode_messages_title (7729380010396411129) -->
-    <skip />
+    <string name="zen_mode_messages_title" msgid="7729380010396411129">"ಸಂದೇಶಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"ಸಂದೇಶಗಳು"</string>
     <string name="zen_mode_selected_messages" msgid="1047355526202106114">"ಕೆಲವು ಸಂದೇಶಗಳು"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"ಯಾರಿಂದಲಾದರೂ"</string>
@@ -3372,19 +3366,15 @@
     <string name="zen_mode_media" msgid="8808264142134422380">"ಮಾಧ್ಯಮ"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"ಸ್ಪರ್ಶ ಧ್ವನಿಗಳು"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"ಜ್ಞಾಪನೆಗಳು"</string>
-    <!-- no translation found for zen_mode_reminders_title (2345044406347406902) -->
-    <skip />
+    <string name="zen_mode_reminders_title" msgid="2345044406347406902">"ಜ್ಞಾಪನೆಗಳಿಗೆ ಅನುಮತಿಸಿ"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ಈವೆಂಟ್‌ಗಳು"</string>
-    <!-- no translation found for zen_mode_events_title (5597241655883329085) -->
-    <skip />
+    <string name="zen_mode_events_title" msgid="5597241655883329085">"ಈವೆಂಟ್‌ಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="zen_mode_all_callers" msgid="2378065871253871057">"ಯಾರಾದರೂ"</string>
     <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"ಸಂಪರ್ಕಗಳು"</string>
     <string name="zen_mode_starred_callers" msgid="1023167821338514140">"ನಕ್ಷತ್ರ ಹಾಕಿದ ಸಂಪರ್ಕಗಳು"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ಪುನರಾವರ್ತಿತ ಕರೆದಾರರು"</string>
-    <!-- no translation found for zen_mode_repeat_callers_title (8553876328249671783) -->
-    <skip />
-    <!-- no translation found for zen_mode_calls_summary_one (3972333792749874863) -->
-    <skip />
+    <string name="zen_mode_repeat_callers_title" msgid="8553876328249671783">"ಪುನರಾವರ್ತಿತ ಕರೆದಾರರಿಗೆ ಅನುಮತಿಸಿ"</string>
+    <string name="zen_mode_calls_summary_one" msgid="3972333792749874863">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> ನಿಂದ"</string>
     <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> ಮತ್ತು <xliff:g id="CALLERT_TPYE">%2$s</xliff:g> ರಿಂದ"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"ಒಂದು ವೇಳೆ ಒಬ್ಬನೇ ವ್ಯಕ್ತಿ <xliff:g id="MINUTES">%d</xliff:g> ನಿಮಿಷಗಳೊಳಗೆ ಎರಡನೇ ಬಾರಿ ಕರೆ ಮಾಡಿದರೆ"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"ಕಸ್ಟಮ್"</string>
@@ -3790,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"ತಂಪು ಬಣ್ಣದ ತಾಪಮಾನ"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ತಂಪಾದ ಪ್ರದರ್ಶನ ಬಣ್ಣಗಳನ್ನು ಬಳಸಿ"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"ಬಣ್ಣದ ಬದಲಾವಣೆಯನ್ನು ಅನ್ವಯಿಸಲು, ಪರದೆ ಆಫ್ ಮಾಡಿ"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"ಸಂಪರ್ಕ ಕಲ್ಪಿಸುವಿಕೆಯ ಪರಿವೀಕ್ಷಣೆ"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ಸಂಪರ್ಕ ಕಲ್ಪಿಸುವಿಕೆಯಲ್ಲಿ ಸಮಸ್ಯೆಯನ್ನು ಪತ್ತೆಹಚ್ಚಿದಾಗ ಸಂಪರ್ಕ ಕಲ್ಪಿಸುವಿಕೆ ಮಾನಿಟರ್ ಲಾಗ್‌ಗಳನ್ನು ಸಂಗ್ರಹಿಸುತ್ತದೆ ಮತ್ತು ಪ್ರಾಂಪ್ಟ್ ಅಧಿಸೂಚನೆಯನ್ನು ದೋಷದ ಕುರಿತು ವರದಿ ಸಲ್ಲಿಸಲು ಬಳಕೆದಾರನಿಗೆ ಸೂಚನೆ ನೀಡುತ್ತದೆ"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"ಸಂಪರ್ಕ ಕಲ್ಪಿಸುವಿಕೆ ಮಾನಿಟರ್ ಬದಲಾವಣೆಯನ್ನು ಅನ್ವಯಿಸಲು, ಸಾಧನವನ್ನು ರೀಬೂಟ್ ಮಾಡಿ"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"ಕ್ಯಾಮೆರಾ ಲೇಸರ್ ಸೆನ್ಸರ್"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"ತಾರ್ಕಿಕ ಕ್ಯಾಮರಾವನ್ನು ಡೀಫಾಲ್ಟ್‌ನಂತೆ ಹೊಂದಿಸಲಾಗಿದೆ"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ಸ್ವಯಂಚಾಲಿತ ಸಿಸ್ಟಂ ಅಪ್‌ಡೇಟ್‌ಗಳು"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"ಸಾಧನ ಮರುಪ್ರಾರಂಭಿಸಿದಾಗ ಅಪ್‌ಡೇಟ್‌ಗಳನ್ನು ಅನ್ವಯಿಸಿ"</string>
     <string name="usage" msgid="2977875522080448986">"ಬಳಕೆ"</string>
@@ -4103,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"ಸ್ವಯಂತುಂಬುವಿಕೆ ಸೇವೆ"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"ಸ್ವಯಂ, ತುಂಬುವಿಕೆ, ಸ್ವಯಂತುಂಬುವಿಕೆ"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;ನಿಮಗೆ ಈ ಅಪ್ಲಿಕೇಶನ್ ಮೇಲೆ ವಿಶ್ವಾಸವಿರುವುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ &lt;/b&gt; &lt;br/&gt; &lt;br/&gt; ಯಾವ ಕ್ಷೇತ್ರಗಳನ್ನು ಸ್ವಯಂ-ಭರ್ತಿ ಮಾಡಬಹುದು ಎಂಬುದನ್ನು ನಿರ್ಧರಿಸಲು &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; ನಿಮ್ಮ ಪರದೆಯಲ್ಲಿರುವ ಮಾಹಿತಿಯನ್ನು ಬಳಸಿಕೊಳ್ಳುತ್ತದೆ."</string>
-    <string name="device_theme" msgid="4571803018917608588">"ಸಾಧನದ ಥೀಮ್‌"</string>
+    <string name="color_theme" msgid="1535685696756738324">"ಬಣ್ಣ ಥೀಮ್‌"</string>
     <string name="default_theme" msgid="7085644992078579076">"ಡಿಫಾಲ್ಟ್"</string>
+    <string name="device_theme" msgid="4571803018917608588">"ಸಾಧನದ ಥೀಮ್‌"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"ಸ್ವಯಂಚಾಲಿತ (ವಾಲ್‌ಪೇಪರ್‌ ಅನ್ನು ಆಧರಿಸಿ)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"ಹಗುರ"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"ಕತ್ತಲೆ"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"ನೆಟ್‌ವರ್ಕ್‌ ಹೆಸರು"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"ಸ್ಥಿತಿ ಬಾರ್‌ನಲ್ಲಿ ನೆಟ್‌ವರ್ಕ್‌ ಹೆಸರನ್ನು ಪ್ರದರ್ಶಿಸಿ"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"ಸಂಗ್ರಹಣಾ ನಿರ್ವಾಹಕ: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4116,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"ವಾಹಕ ಪೂರೈಕೆಯ ಮಾಹಿತಿ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ಟ್ರಿಗ್ಗರ್ ವಾಹಕ ಪೂರೈಕೆ"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಅನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಿ"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"ಫೋಕಸ್‌ ಆಗಿ ಇರಲು ಅಧಿಸೂಚನೆಗಳನ್ನು ಮರೆಮಾಡಿ"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"ಫೋಕಸ್‌ ಆಗಿ ಇರಲು ಅಧಿಸೂಚನೆಗಳನ್ನು ವಿರಾಮಗೊಳಿಸಿ"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"ಆಕರ್ಷಕವಾಗಿ ಮತ್ತು ಹೊಸದಾಗಿ ಏನಿದೆ?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ನಿಮ್ಮ ಹೊಸ ಫೋನ್‌ನ ಬಳಕೆಯನ್ನು ಪ್ರಾರಂಭಿಸಿ"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ನಿಮ್ಮ ಹೊಸ ಟ್ಯಾಬ್ಲೆಟ್‌ನ ಬಳಕೆ ಪ್ರಾರಂಭಿಸಿ"</string>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index f11d67e..9f40512 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"항상 사용"</item>
     <item msgid="6385301106124765323">"항상 사용 안함"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 0f417c4..d960ff8 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"태블릿이 주변 블루투스 기기와 통신하도록 허용"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"기기가 주변 블루투스 기기와 통신하도록 허용"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"휴대전화가 주변 블루투스 기기와 통신하도록 허용"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"블루투스 A2DP 하드웨어 오프로드 사용 중지"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"기기 다시 시작"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"설정을 변경하려면 기기를 다시 시작해야 합니다."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"다시 시작"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"취소"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"사용할 수 있는 미디어 기기"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"사용할 수 있는 통화 기기"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"현재 연결된 기기"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"연결 환경설정"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"이전에 연결된 기기"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"이전에 연결됨"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"날짜 및 시간"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"시간대 선택"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"입력한 포트가 올바르지 않습니다."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP 프록시는 브라우저에서 사용되며 다른 앱에서는 사용되지 않을 수 있습니다."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL 대역폭(kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL 대역폭(kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"셀 위치 정보(사용 중단됨):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"이웃 셀 정보(사용 중단됨):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE 물리적 채널 구성:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"셀 정보 새로고침 빈도:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"모든 셀 측정 정보:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"데이터 연결 실시간 정보:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"데이터 서비스:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"로밍:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"자동 밝기"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"기기를 들어 대기 모드 해제"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"절전 모드 자동 해제"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"상시 사용 설정/배터리 사용량 증가"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"새로운 알림"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"표시 시점"</string>
     <string name="doze_title" msgid="2375510714460456687">"새로운 알림"</string>
     <string name="doze_summary" msgid="3846219936142814032">"알림을 수신하면 절전 모드를 해제"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">SIM PIN 코드가 잘못되었습니다. <xliff:g id="NUMBER_0">%d</xliff:g>번 더 실패하면 이동통신사에 문의하여 기기를 잠금 해제해야 합니다.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM PIN 작업이 실패했습니다."</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"태블릿 상태"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"휴대전화 상태"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"시스템 업데이트"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android 버전"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"백그라운드 사용은 제한할 수 없습니다."</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"백그라운드 활동을 제한하시겠습니까?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"앱의 백그라운드 활동을 제한하면 앱이 정상적으로 작동하지 않을 수도 있습니다."</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"배터리 최적화를 설정하지 않아 이 앱을 제한할 수 없습니다.\n\n앱을 제한하려면 먼저 배터리 최적화를 사용 설정하세요."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"충전 완료 후 화면 사용"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"화면 소비 전력"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"모바일 네트워크 검색"</string>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"응급 상황 다이얼링 신호"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"긴급 통화 중 동작 설정"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"백업"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"사용"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"사용 안함"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"백업 및 복원"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"개인 데이터"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"내 데이터 백업"</string>
@@ -2761,6 +2766,12 @@
       <item quantity="one">인증서 확인</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"여러 사용자"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"사용자 및 프로필"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"사용자 또는 프로필 추가"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"사용자 추가"</string>
@@ -2943,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"데이터 사용"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"핫스팟"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"연결된 기기"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"블루투스, 운전 모드, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"블루투스, 운전 모드"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"블루투스, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"블루투스"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"앱 및 알림"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"권한, 기본 앱"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"계정"</string>
@@ -2967,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"런처, 기본, 앱"</string>
     <string name="keywords_display" msgid="8910345814565493016">"화면, 터치스크린"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"화면 어둡게 하기, 터치스크린, 배터리, 밝음"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"화면 어둡게, 터치스크린, 배터리"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"화면 어둡게 하기, 밤, 톤, 밤 시간대, 밝기, 화면 색상, 색상, 색"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"백그라운드, 맞춤설정, 디스플레이 맞춤설정"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"텍스트 크기"</string>
@@ -3008,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"네트워크, 모바일 네트워크 상태, 서비스 상태, 신호 강도, 모바일 네트워크 유형, 로밍, ICCID"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"일련번호, 하드웨어 버전"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"Android 보안 패치 수준, 베이스밴드 버전, 커널 버전"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"절전 모드 자동 해제, 잠금 화면 표시"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"지문"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"돌리기, 뒤집기, 회전, 세로 모드, 가로 모드, 방향, 세로, 가로"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"업그레이드, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"알림 일시중지, 일정, 알림, 차단, 무음, 진동, 절전 모드, 업무, 집중, 소리, 음소거, 낮, 평일, 주말, 평일 밤, 이벤트"</string>
@@ -3092,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"시각적 신호 허용"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"알림 일시중지 사용 시"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"알림"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"무음으로 알림 표시"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"알림이 음소거됨"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"알림 소리 차단"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"화면에 알림을 표시합니다."</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"알림이 도착해도 휴대전화에서 소리가 나거나 진동이 울리지 않습니다."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"알림 숨기기"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"새로운 알림이나 기존 알림이 표시되지 않음"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"알림 표시 및 소리 차단"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"알림을 보거나 들을 수 없게 됩니다."</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"휴대전화에 새로운 알림이나 기존 알림이 표시되지 않으며, 소리나 진동이 울리지 않습니다. 또한 화면 상단에서 아래로 스와이프해도 알림이 표시되지 않습니다.\n\n하지만 휴대전화 활동 및 상태에 관한 중요한 알림은 계속해서 표시됩니다."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"맞춤"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"맞춤 설정 사용"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"맞춤 설정 삭제"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"표시함"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"알림 소리 차단"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"부분적으로 숨김"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"숨김"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"알림 표시 및 소리 차단"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"맞춤 제한"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"화면이 켜져 있을 때"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"화면이 꺼져 있을 때"</string>
@@ -3162,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>, <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>을(를) 제외하고 음소거됨"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"메시지, 일정, 알림"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"알림 일시중지가 사용 설정되어 있으면 위에서 허용한 항목을 제외한 메시지, 알림, 일정이 음소거됩니다. 메시지 설정을 조정하여 친구, 가족 또는 연락처에 등록된 다른 사용자가 나에게 연락하도록 허용할 수 있습니다."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"완료"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"설정"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"알림 표시 및 소리 차단"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"알림 소리 차단"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"알림을 보거나 들을 수 없게 됩니다. 별표표시된 연락처 및 반복 발신자의 전화는 허용됩니다."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(현재 설정)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"알림 일시중지의 알림 설정을 변경하시겠습니까?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"직장 프로필 사운드"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"개인 프로필 사운드 사용"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"직장 프로필과 개인 프로필의 소리가 같습니다."</string>
@@ -3346,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"통화 허용"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"알림 일시중지가 사용 설정되어 있으면 수신 전화가 차단됩니다. 설정을 조정하여 친구, 가족 또는 연락처에 등록된 다른 사용자가 나에게 연락하도록 허용할 수 있습니다."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"별표 표시한 연락처"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">외 <xliff:g id="NUM_PEOPLE">%d</xliff:g>명</item>
-      <item quantity="one">외 1명</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"메시지"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"메시지 허용"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"메시지"</string>
@@ -3779,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"차가운 색상 온도"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"더 차가운 디스플레이 색상 사용"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"색상 변경을 적용하려면 화면을 끄세요."</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"연결 모니터"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"연결 모니터에서 연결 문제가 감지될 경우 로그를 수집하며 버그를 신고하라는 알림을 표시"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"연결 모니터의 변경사항을 적용하려면 기기를 재부팅하세요."</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"카메라 레이저 센서"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"기본값으로 논리 카메라 전환"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"자동 시스템 업데이트"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"기기가 다시 시작되면 업데이트 적용"</string>
     <string name="usage" msgid="2977875522080448986">"사용량"</string>
@@ -4092,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"자동완성 서비스"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"자동, 완성, 자동완성"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;이 앱을 신뢰할 수 있는지 확인하세요.&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt;에서는 자동완성할 수 있는 항목을 결정하기 위해 화면의 내용을 사용합니다."</string>
-    <string name="device_theme" msgid="4571803018917608588">"기기 테마"</string>
+    <string name="color_theme" msgid="1535685696756738324">"색상 테마"</string>
     <string name="default_theme" msgid="7085644992078579076">"기본값"</string>
+    <string name="device_theme" msgid="4571803018917608588">"기기 테마"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"자동(배경화면에 따라)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"밝게"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"어둡게"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"네트워크 이름"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"상태 표시줄에 네트워크 이름 표시"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"저장용량 관리자: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4105,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Carrier Provisioning Info"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Carrier Provisioning"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"알림 일시중지 업데이트"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"방해받지 않도록 알림 숨기기"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"방해받지 않도록 알림 일시중지"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"흥미로운 새 기능 살펴보기"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"새 휴대전화 둘러보기"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"새 태블릿 둘러보기"</string>
diff --git a/res/values-ky/arrays.xml b/res/values-ky/arrays.xml
index 8c1b884..9adebce 100644
--- a/res/values-ky/arrays.xml
+++ b/res/values-ky/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Ар дайым күйүк"</item>
     <item msgid="6385301106124765323">"Ар дайым өчүк"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 012001f..a0b6823 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -172,6 +172,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Планшетиңизге жакын жердеги Bluetooth түзмөктөрү менен байланышууга уруксат бериңиз"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Түзмөгүңүзгө жакын жердеги Bluetooth түзмөктөрү менен байланышууга уруксат бериңиз"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Телефонуңузду жакын жердеги Bluetooth түзмөктөрүнө байланыштырат."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Bluetooth A2DP программасын кайра баштоону өчүрүү"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Түзмөк өчүп күйсүнбү?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Бул жөндөөнү өзгөртүү үчүн түзмөгүңүздү өчүрүп күйгүзүңүз."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Кайра баштоо"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Жок"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Жеткиликтүү медиа түзмөктөрү"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Жеткиликтүү чалуу түзмөктөрү"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Учурда туташып турган түзмөктөр"</string>
@@ -181,6 +186,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Туташуу параметрлери"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Мурунтан туташкан түзмөктөр"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Мурда туташкан"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Күн жана убакыт"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Саат алкагын тандаңыз"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -206,11 +213,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Сиз терген порт жараксыз."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP прокси серепчи тарабынан колдонулат, бирок башка колдонмолор пайдалана алышпайт."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL өткөрүү жөндөмдүүлүгү (кб/сек.):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL өткөрүү жөндөмдүүлүгү (кб/сек.):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Уюлдук тармакта жайгашкан жери тууралуу маалымат (жоюлган):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Айланадагы Мобилдик тармак жөнүндө маалымат (жоюлган):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE физикалык каналынын конфигурациясы:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Уюлдук маалыматты жаңылоо ылдамдыгы:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Уюлдук чен-өлчөм маалыматтары:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Мобилдик туташуу тууралуу учурдагы маалымат:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Мобилдик туташуу кызматы:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Роуминг:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1145,8 +1153,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматтык жарыктык"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ойготуу үчүн көтөрүү"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Экран автоматтык түрдө күйөт"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Ар дайым күйүк (батарея тез отуруп калат)"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Жаңы билдирмелер"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Экран качан күйөт"</string>
     <string name="doze_title" msgid="2375510714460456687">"Жаңы билдирмелер"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Билдирме келгенде экран күйөт"</string>
@@ -1191,8 +1197,6 @@
       <item quantity="one">SIM PIN-коду туура эмес, түзмөк кулпусун ачуу үчүн операторуңузга кайрылуудан мурун <xliff:g id="NUMBER_0">%d</xliff:g> аракет калды.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM-карта PIN аракети кыйрады!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Планшеттин абалы"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Телефондун абалы"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Тутум жаңыртуулары"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android версиясы"</string>
@@ -2113,8 +2117,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Фондо колдонуу чектелбейт"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Фондогу аракеттери чектелсинби?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Колдонмонун фондогу аракеттери чектелсе, ал туура эмес иштеп калышы мүмкүн"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Бул колдонмодо батареянын үнөмдөлүшү жөндөлбөгөндүктөн, аны чектөөгө болбойт.\n\nКолдонмону чектөө үчүн, адегенде Батареяны үнөмдөө режимин күйгүзүңүз."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Толук кубатталгандан бери экран канча убакыт колдонулду"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Экран керектеген кубат"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Мобилдик тармак скандалууда"</string>
@@ -2434,6 +2437,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Шашылыш чалуу сигналы"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Шашылыш чалуу аткарылганда көрүлчү аракетти коюу"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Камдык көчүрмөнү сактоо"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Күйүк"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Өчүк"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Бэкаптоо жана калыбына келтирүү"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Жеке дайындар"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Дайындарымдын камдык көчүрмөсү сакталсын"</string>
@@ -2760,6 +2765,12 @@
       <item quantity="one">Тастыктаманы текшерүү</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Бир нече колдонуучу"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Колдонуучулар жана профайлдар"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Колдонуучу же профиль кошуу"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Колдонуучу кошуу"</string>
@@ -2942,14 +2953,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"дайындардын колдонулушу"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"байланыш түйүнү"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Туташкан түзмөктөр"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, айдоо режими, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, айдоо режими"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Колдонмолор/билдирмелер"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Уруксаттар, демейки колдонмолор"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Аккаунттар"</string>
@@ -2966,7 +2973,6 @@
     <string name="keywords_home" msgid="294182527446892659">"жүргүзгүч, демейки, колдонмолор"</string>
     <string name="keywords_display" msgid="8910345814565493016">"экран, сенсордук экран"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"күңүрт экран, сенсордук экран, батарея, жарык"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"күңүрт экран, сенсордук экран, батарея"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"күңүрт экран, түн, кошумча түс, түнкү алмашуу, жарыктык, экрандын түсү, түс, түс"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"фон, жекелештирүү, дисплейди ыгайлаштыруу"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"текст өлчөмү"</string>
@@ -3007,8 +3013,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"тармак, мобилдик тармактын абалы, кызматтын абалы, сигналдын күчү, мобилдик тармактын түрү, роуминг, смарт-картанын идентификатору"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"сериялык номер, аппараттык камсыздоонун версиясы"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android коопсуздугун жаңыртуу деңгээли, байланыш модулунун версиясы, өзөктүн версиясы"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Экран автоматтык түрдө күйөт, экран кулпусу"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"манжа изи"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"күңүрт экран, сенсордук экран, батарея, акылдуу жарыктык, динамикалык жарыктык"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"буруу, көрсөтүү, айлануу, тигинен, туурасынан, багыт, вертикалдык, горизонталдык"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"кийинки версияга көтөрүү, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"та, график, эскертмелер, бөгөттөө, үнүн басуу, дирилдөө, уйку режими, жумуш, фокустоо, добуш, үнсүз, күн, иш күнү, дем алыш, иш күндөрүнүн кечтери, окуя"</string>
@@ -3091,18 +3100,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Визуалдык сигнал иштетилсин"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"\"Тынчымды алба\" режими күйүп турганда"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Билдирмелер"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Үнсүз көрүнөт"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Билдирмелердин үнү басылат"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Билдирмелердин добушу чыкпайт"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Билдирмелерди экранда көрөсүз"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Билдирмелер келгенде телефонуңуздун үнү чыкпайт же дирилдебейт."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Эскертмелерди жашыруу"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Жаңы же учурдагы билдирмелерди көрбөйсүз"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Билдирмелерди көрбөйсүз да, укпайсыз"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Билдирмелерди көрбөйсүз да, укпайсыз"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Телефонуңуз жаңы же учурдагы билдирмелерди көрсөтпөйт жана үн чыгарып же дирилдебейт. Экранды ылдый сүрсөңүз, билдирмелер көрсөтүлбөйт.\n\nБирок телефондун негизги аракеттери жана абалы үчүн зарыл болгон маанилүү билдирмелер көрсөтүлө берээрин эске алыңыз."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Ыңгайлаштырылган"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Ыңгайлаштырылган жөндөөнү иштетүү"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Ыңгайлаштырылган жөндөөнү алып салуу"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Көрүнөт"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Билдирмелердин добушу чыкпайт"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Жарым-жартылай жашырылган"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Жашырылды"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Билдирмелерди көрбөйсүз да, укпайсыз"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Ыңгайлаштырылган чектөөлөр"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Экран күйүп турганда"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Экран өчүп турганда"</string>
@@ -3161,19 +3170,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Үнсүз, бирок төмөнкүлөргө уруксат берилсин: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> жана <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Билдирүүлөр, иш-чаралар жана эстеткичтер"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"\"Тынчымды алба\" режими күйүп турганда, жогоруда сиз уруксат берген нерселерден тышкары билдирүүлөр, эстеткичтер жана иш-чаралардын үнү басылат. Достор, үй-бүлө же башка тааныштарыңызга сиз менен байланышууга уруксат берүү үчүн жөндөөлөрдү тууралап алсаңыз болот."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Бүттү"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Жөндөөлөр"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Билдирмелерди көрбөйсүз да, укпайсыз"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Билдирмелердин добушу чыкпайт"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Билдирмелерди көрбөйсүз да, укпайсыз. Белгиленген байланыштардан келген жана кайталанма чалууларга уруксат берилди."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Учурдагы жөндөө)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"\"Тынчымды алба\" режиминин билдирмелеринин жөндөөлөрү өзгөртүлсүнбү?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Жумуш профилиндеги үндөр"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Жеке профилдин үндөрүн колдонуу"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Жумуш жана жеке профилдер үчүн окшош добуштар колдонулат"</string>
@@ -3345,10 +3348,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Чалууларга уруксат берүү"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"\"Тынчымды алба\" режими күйүп турганда кириш чалуулар бөгөттөлөт. Достор, үй-бүлө же башка тааныштарыңызга сиз менен байланышууга уруксат берүү үчүн жөндөөлөрдү тууралап алсаңыз болот."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Белгиленген байланыштар"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">жана дагы <xliff:g id="NUM_PEOPLE">%d</xliff:g> адам</item>
-      <item quantity="one">жана дагы 1 адам</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Билдирүүлөр"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Билдирүүлөргө уруксат берүү"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Билдирүүлөр"</string>
@@ -3778,10 +3778,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Салкын температура түсү"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Салкыныраак дисплей түстөрүн колдонуңуз"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Түс өзгөртүүлөрүн күчүнө киргизүү үчүн, экранды өчүрүңүз"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Connectivity Monitor туташууда кандайдыр бир көйгөй тапса, ал жөнүндө маалымат топтоп, колдонуучуга ката тууралуу отчет жөнөтүү керек деп сунуштап турат"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Connectivity Monitor функциясын колдонуу үчүн түзмөктү өчүрүп-күйгүзүү керек"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Камеранын лазердик сенсору"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Логикалык камера демейки катары коюлду"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Тутум автоматтык түрдө жаңырып турат"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Жаңыртуулар түзмөк өчүрүлүп-күйгүзүлгөндө орнотулат"</string>
     <string name="usage" msgid="2977875522080448986">"Дайындардын өткөрүлүшү"</string>
@@ -4091,8 +4089,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Автотолтуруу кызматы"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"авто, толтуруу, автотолтуруу"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Колдонмонун коопсуз экенин текшериңиз&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; экрандагы нерселерди талдап, автоматтык түрдө толтурула турган саптарды табат."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Түзмөктүн темасы"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Өң темасы"</string>
     <string name="default_theme" msgid="7085644992078579076">"Демейки"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Түзмөктүн темасы"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Автоматтык (тушкагаздын негизинде)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Жарык"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Караңгы"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Тармактын аталышы"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Тармактын аталышы абал тилкесинде көрсөтүлсүн"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Сактагычты көзөмөлдөгүч: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4104,7 +4106,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Байланыш оператору жөнүндө маалымат"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Байланыш операторун өзгөртүү"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"\"Тынчымды алба\" режимин жаңыртуу"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Алагды кылбоо үчүн билдирмелерди жашыруу"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Алагды кылбоо үчүн билдирмелерди тындыруу"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Эмне жаңылык бар?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Жаңы телефонуңузду карап чыгыңыз"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Жаңы планшетиңизди карап чыгыңыз"</string>
diff --git a/res/values-lo/arrays.xml b/res/values-lo/arrays.xml
index 9f3b08d..66aa9fd 100644
--- a/res/values-lo/arrays.xml
+++ b/res/values-lo/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"ເປີດຕະຫຼອດ"</item>
     <item msgid="6385301106124765323">"ປິດຕະຫຼອດ"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index b204f62..47c8537 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"ເຮັດໃຫ້ແທັບເລັດຂອງທ່ານເຊື່ອມຕໍ່ກັບອຸປະກອນ Bluetooth ທີ່ຢູ່ໃກ້ຄຽງໄດ້"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"ເຮັດໃຫ້ອຸປະກອນຂອງທ່ານເຊື່ອມຕໍ່ກັບອຸປະກອນ Bluetooth ທີ່ຢູ່ໃກ້ຄຽງໄດ້"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"ເຮັດໃຫ້ໂທລະສັບຂອງທ່ານເຊື່ອມຕໍ່ກັບອຸປະກອນ Bluetooth ທີ່ຢູ່ໃກ້ຄຽງໄດ້"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"ປິດການອອບໂຫລດຮາດແວ Bluetooth A2DP"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"ຣີສະຕາດອຸປະກອນບໍ?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"ທ່ານຕ້ອງຣີສະຕາດອຸປະກອນຂອງທ່ານເພື່ອປ່ຽນການຕັ້ງຄ່ານີ້."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"ປິດເປີດໃໝ່"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"ຍົກເລີກ"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"ອຸປະກອນມີເດຍທີ່ໃຊ້ໄດ້"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"ອຸປະກອນໂທທີ່ໃຊ້ໄດ້"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"ຕອນນີ້ເຊື່ອມຕໍ່ແລ້ວ"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"ການຕັ້ງຄ່າການເຊື່ອມຕໍ່"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"ອຸປະກອນທີ່ເຊື່ອມຕໍ່ກ່ອນໜ້າ"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"ເຊື່ອມຕໍ່ກ່ອນໜ້ານີ້"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"ວັນ​ທີ &amp; ເວ​ລາ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"ເລືອກເຂດເວລາ"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"ພອດທີ່ທ່ານລະບຸນັ້ນບໍ່ຖືກຕ້ອງ."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP proxy ນີ້ຖືກໃຊ້ໂດຍໂປຣແກຣມທ່ອງເວັບແລ້ວ ແລະບໍ່ອາດໃຊ້ກັບແອັບຯອື່ນໄດ້."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"ແບນວິດ DL (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"ແບນວິດ UL (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"ຂໍ້ມູນສະຖານທີ່ມືຖື (ລ້າສະໄໝແລ້ວ):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"ຂໍ້ມູນມືຖືທີ່ຢູ່ໃກ້ຄຽງ (ລ້າສະໄໝແລ້ວ):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"ການຕັ້ງຄ່າຊ່ອງ LTE ກາຍະພາບ:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"ອັດຕາການໂຫຼດຂໍ້ມູນໂທລະສັບຄືນໃໝ່:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"ຂໍ້ມູນການວັດແທກໂທລະສັບທັງໝົດ:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"ຂໍ້ມູນການເຊື່ອມຕໍ່ຂໍ້ມູນແບບສົດໆ:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"ບໍລິການຂໍ້ມູນ:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"ໂຣມມິງ​:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI​:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"ປັບຄວາມແຈ້ງອັດຕະໂນມັດ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"ຍົກ​ເພື່ອ​ເປີດ​ໜ້າ​ຈໍ"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"ການສະແດງຜົນສະພາບແວດລ້ອມ"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"ເປີດຕະຫຼອດເວລາ / ໃຊ້ແບັດເຕີຣີຫຼາຍຂຶ້ນ"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"ການແຈ້ງເຕືອນໃໝ່"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ສະແດງຕອນໃດ"</string>
     <string name="doze_title" msgid="2375510714460456687">"ການແຈ້ງເຕືອນໃໝ່"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ເປີດໜ້າຈໍເມື່ອທ່ານໄດ້ຮັບການແຈ້ງເຕືອນ"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">ລະຫັດ PIN ຂອງ SIM ບໍ່ຖືກຕ້ອງ, ທ່ານສາມາດລອງໄດ້ອີກ <xliff:g id="NUMBER_0">%d</xliff:g> ເທື່ອກ່ອນທີ່ທ່ານຈະຕ້ອງຕິດຕໍ່ຫາຜູ່ໃຫ້ບໍລິການຂອງທ່ານ ເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານ.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"PIN ຂອງ SIM ເຮັດວຽກລົ້ມເຫຼວ!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"ສະຖານະແທັບເລັດ"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"ສະ​ຖາ​ນະ​ໂທລະ​ສັບ"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"ອັບເດດລະບົບ"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"ເວີຊັນຂອງ Android"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"ບໍ່ສາມາດຈຳກັດການນຳໃຊ້ໃນພື້ນຫຼັງໄດ້"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"ຈຳກັດການເຄື່ອນໄຫວໃນພື້ນຫຼັງບໍ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"ຫາກທ່ານຈຳກັດການເຄື່ອນໄຫວໃນພື້ນຫຼັງສຳລັບແອັບໃດໜຶ່ງ, ມັນຈະເຮັດວຽກຜິດປົກກະຕິ"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"ເນື່ອງຈາກແອັບນີ້ຍັງບໍ່ໄດ້ປັບແຕ່ງໃຫ້ໃຊ້ແບັດເຕີຣີໄດ້ຢ່າງເໝາະສົມເທື່ອ, ທ່ານຈຶ່ງບໍ່ສາມາດຈຳກັດມັນໄດ້.\n\nເພື່ອຈຳກັດແອັບດັ່ງກ່າວ, ໃຫ້ເປີດການປັບແຕ່ງແບັດເຕີຣີໃຫ້ເໝາະສົມກ່ອນ."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"ການນຳໃຊ້ໜ້າຈໍຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"ການໃຊ້ພະລັງງານໄປກັບໜ້າຈໍ"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"ການສະແກນເຄືອຂ່າຍມືຖື"</string>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"ສັນຍານການໂທສຸກເສີນ"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"ຕັ້ງຄ່າການເຮັດວຽກເມື່ອມີການໂທຫາໝາຍເລກສຸກເສີນ"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"ສຳຮອງຂໍ້ມູນ"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"ເປີດ"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"ປິດ"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"ສຳຮອງຂໍ້ມູນ &amp; ດຶງຂໍ້ມູນຄືນ"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"ຂໍ້​ມູນ​ສ່ວນ​ໂຕ"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"ສຳຮອງຂໍ້ມູນຂອງຂ້ອຍ"</string>
@@ -2761,6 +2766,12 @@
       <item quantity="one">ກວດສອບໃບຮັບຮອງ</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"ຫຼາຍຜູ້ໃຊ້"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"ຜູ້ໃຊ້ ແລະ ໂປຣໄຟລ໌"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ເພີ່ມ​ຜູ່​ໃຊ້ ຫຼື​ໂປຣ​ໄຟລ໌"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"ເພີ່ມຜູ້ໃຊ້"</string>
@@ -2943,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ການນຳໃຊ້ຂໍ້ມູນ"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"ຮັອດສະປອດ"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"ອຸປະກອນທີ່ເຊື່ອມຕໍ່ແລ້ວ"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, ໂໝດຂັບລົດ, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, ໂໝດຂັບລົດ"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ແອັບ ແລະ ການແຈ້ງເຕືອນ"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ສິດອະນຸຍາດ, ແອັບເລີ່ມຕົ້ນ"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"ບັນຊີ"</string>
@@ -2967,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"ຕົວເປີດ, ຄ່າເລີ່ມຕົ້ນ, ແອັບ"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ສຳຜັດ, ໜ້າຈໍສຳພັດ"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"ຫຼຸດແສງໜ້າຈໍ, ໜ້າຈໍສຳຜັດ, ແບັດເຕີຣີ, ຄວາມສະຫວ່າງ"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"ໜ້າຈໍມືດລົງ, ໜ້າຈໍສຳຜັດ, ແບັດເຕີຣີ"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"ຫຼຸດແສງໜ້າຈໍ, ກາງຄືນ, ສີອ່ອນ, ກະກາງຄືນ, ຄວາມສະຫວ່າງ, ສີໜ້າຈໍ, ສີ, ສີສັນ"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"ພາບພື້ນຫຼັງ, ປັບໃຫ້ເປັນແບບສ່ວນຕົວ, ກຳນົດຈຳສະແດງຜົນເອງ"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ຂະ​ໜາດ​ໂຕ​ອັກ​ສອນ"</string>
@@ -3008,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"ເຄືອຂ່າຍ, ສະຖານະເຄືອຂ່າຍມືຖື, ສະຖານະບໍລິການ, ຄວາມແຮງສັນຍນານ, ປະເພດເຄືອຂ່າຍມືຖື, roaming, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"ໝາຍເລກຊີຣຽວ, ເວີຊັນຮາດແວ"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android security patch level, ເວີຊັນ baseband, ເວີຊັນ kernel"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"ການສະແດງຜົນຕາມແສງສະພາບແວດລ້ອມ, ໜ້າຈໍລັອກ"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"ລາຍນີ້ວມື"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"ໝຸນ, ກັບດ້ານ, ຮູບລວງຕັ້ງ, ຮູບລວງນອນ, ທິດທາງ, ລວງຕັ້ງ, ລວງນອນ"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"ອັບເກຣດ, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, ກຳນົດການ, ການແຈ້ງເຕືອນ, ບລັອກ, ງຽບ, ສັ່ນເຕືອນ, ຫຼັບ, ວຽກ, ໂຟກັສ, ສຽງ, ປິດສຽງ, ມື້, ມື້ທຳມະດາ, ມື້ພັກ, ຄືນທຳມະດາ, ເຫດການ"</string>
@@ -3092,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"ອະນຸຍາດສັນຍານພາບ"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"ເມື່ອເປີດໃຊ້ໂໝດຫ້າມລົບກວນ"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"ການແຈ້ງເຕືອນ"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"ສະແດງການແຈ້ງເຕືອນແບບບໍ່ມີສຽງ"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"ການແຈ້ງເຕືອນຈະຖືກປິດສຽງໄວ້"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"ບໍ່ມີສຽງຈາກການແຈ້ງເຕືອນ"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"ທ່ານຈະເຫັນການແຈ້ງເຕືອນຢູ່ໜ້າຈໍຂອງທ່ານ"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"ເມື່ອມີການແຈ້ງເຕືອນຂຶ້ນມາ, ໂທລະສັບຂອງທ່ານຈະບໍ່ສົ່ງສຽງ ຫຼື ສັ່ນເຕືອນ"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"ເຊື່ອງການແຈ້ງເຕືອນ"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"ທ່ານຈະບໍ່ເຫັນການແຈ້ງເຕືອນໃໝ່ ຫຼື ການແຈ້ງເຕືອນທີ່ມີຢູ່ກ່ອນແລ້ວ"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"ບໍ່ມີພາບ ຫຼື ສຽງຈາກການແຈ້ງເຕືອນ"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"ທ່ານຈະບໍ່ເຫັນ ຫຼື ໄດ້ຍິນສຽງການແຈ້ງເຕືອນ"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"ໂທລະສັບຂອງທ່ານຈະບໍ່ສະແດງການແຈ້ງເຕືອນໃໝ່ ຫຼື ການແຈ້ງເຕືອນທີ່ມີຢູ່ກ່ອນແລ້ວ ແລະ ຈະບໍ່ສົ່ງສຽງ ຫຼື ສັ່ນເຕືອນ. ການແຈ້ງເຕືອນຂອງທ່ານຈະບໍ່ປາກົດເມື່ອທ່ານປັດນິ້ວຈາກເທິງສຸດຂອງຈໍລົງມາ.\n\nກະລຸນາຮັບຊາບວ່າການແຈ້ງເຕືອນວິກິດສຳລັບການເຮັດວຽກ ແລະ ສະຖານະຂອງໂທລະສັບຈະຍັງຄົງປາກົດຢູ່."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"ກຳນົດເອງ"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"ເປີດການຕັ້ງຄ່າແບບກຳນົດເອງ"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"ລຶບການຕັ້ງຄ່າແບບກຳນົດເອງອອກ"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"ຈະປາກົດ"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"ບໍ່ມີສຽງຈາກການແຈ້ງເຕືອນ"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"ເຊື່ອງໄວ້ບາງສ່ວນ"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"ເຊື່ອງໄວ້"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"ບໍ່ມີພາບ ຫຼື ສຽງຈາກການແຈ້ງເຕືອນ"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"ການຈຳກັດແບບກຳນົດເອງ"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"ເມື່ອເປີດໜ້າຈໍ"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"ເມື່ອໜ້າຈໍປິດ"</string>
@@ -3162,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"ປິດສຽງ, ແຕ່ອະນຸຍາດ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> ແລະ <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"ຂໍ້ຄວາມ, ນັດໝາຍ ແລະ ການເຕືອນ"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"ເມື່ອເປີດໂໝດຫ້າມລົບກວນແລ້ວ, ຂໍ້ຄວາມ, ການເຕືອນ ແລະ ນັດໝາຍຕ່າງໆຈະຖືກປິດສຽງໄວ້, ຍົກເວັ້ນລາຍການທີ່ທ່ານອະນຸຍາດຂ້າງເທິງ. ທ່ານສາມາດປັບແຕ່ງການຕັ້ງຄ່າຂໍ້ຄວາມເພື່ອໃຫ້ໝູ່, ຄອບຄົວ ແລະ ລາຍຊື່ຜູ້ຕິດຕໍ່ຄົນອື່ນໆຂອງທ່ານສາມາດຕິດຕໍ່ຫາທ່ານໄດ້."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"ແລ້ວໆ"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"ການຕັ້ງຄ່າ"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"ບໍ່ມີພາບ ຫຼື ສຽງຈາກການແຈ້ງເຕືອນ"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"ບໍ່ມີສຽງຈາກການແຈ້ງເຕືອນ"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"ທ່ານຈະບໍ່ໄດ້ຍິນສຽງການແຈ້ງເຕືອນ. ແຕ່ອະນຸຍາດການໂທຈາກລາຍຊື່ຜູ້ຕິດຕໍ່ທີ່ຕິດດາວ ແລະ ຜູ້ທີ່ໂທຊ້ຳໆ."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(ການຕັ້ງຄ່າປັດຈຸບັນ)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"ປ່ຽນການຕັ້ງຄ່າການແຈ້ງເຕືອນຫ້າມລົບກວນບໍ?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"ສຽງໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"ໃຊ້ສຽງໂປຣໄຟລ໌ສ່ວນຕົວ"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"ສຽງແມ່ນຄືກັນສຳລັບໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ ແລະ ໂປຣໄຟລ໌ສ່ວນຕົວ"</string>
@@ -3346,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"ອະນຸຍາດການໂທ"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"ສາຍໂທເຂົ້າຈະຖືກບລັອກໄວ້ເມື່ອເປີດໃຊ້ໂໝດຫ້າມລົບກວນ. ທ່ານສາມາດປັບແຕ່ງການຕັ້ງຄ່າເພື່ອອະນຸຍາດໃຫ້ໝູ່, ຄອບຄົວ ແລະ ລາຍຊື່ຜູ້ຕິດຕໍ່ຄົນອື່ນໆສາມາດຕິດຕໍ່ຫາທ່ານໄດ້."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"ລາຍຊື່ຜູ້ຕິດຕໍ່ທີ່ຕິດດາວ"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">ແລະ ອີກ <xliff:g id="NUM_PEOPLE">%d</xliff:g> ຄົນ</item>
-      <item quantity="one">ແລະ ອີກ 1 ຄົນ</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"ຂໍ້​ຄວາມ"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"ອະນຸຍາດຂໍ້ຄວາມ"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"ຂໍ້ຄວາມ"</string>
@@ -3779,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"ອຸນຫະພູມສີເຢັນ"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ໃຊ້ສີຈໍສະແດງຜົນທີ່ເຢັນກວ່າ"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"ເພື່ອນຳໃຊ້ການປ່ຽນສີ, ໃຫ້ປິດໜ້າຈໍ"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor ຈະເກັບກຳບັນທຶກການເຮັດວຽກຕ່າງໆ ເມື່ອມັນກວດພົບບັນຫາການເຊື່ອມຕໍ່ ແລະ ຈະແຈ້ງເຕືອນໄປໃຫ້ຜູ້ໃຊ້ເພື່ອລາຍງານຂໍ້ຜິດພາດ"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"ເພື່ອນຳໃຊ້ການປ່ຽນແປງ connectivity change, ໃຫ້ປິດແລ້ວເປີດອຸປະກອນຄືນໃໝ່"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"ເຊັນເຊີເລເຊີກ້ອງ"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"ກ້ອງ Logical ເປັນຄ່າເລີ່ມຕົ້ນ"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ການອັບເດດລະບົບອັດຕະໂນມັດ"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"ອັບເດດເມື່ອອຸປະກອນຣີສະຕາດ"</string>
     <string name="usage" msgid="2977875522080448986">"ການໃຊ້"</string>
@@ -4092,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"ບໍລິການຕື່ມຂໍ້ມູນອັດຕະໂນມັດ"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"ອັດຕະໂນມັດ, ຕື່ມຂໍ້ມູນ, ຕື່ມຂໍ້ມູນອັດຕະໂນມັດ"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;ໃຫ້ກວດສອບວ່າທ່ານເຊື່ອແອັບນີ້&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; ຈະໃຊ້ສິ່ງທີ່ຢູ່ໃນໜ້າຈໍຂອງທ່ານເພື່ອກວດເບິ່ງວ່າຈະຕື່ມຂໍ້ມູນຫຍັງອັດຕະໂນມັດ."</string>
-    <string name="device_theme" msgid="4571803018917608588">"ຮູບແບບສີສັນອຸປະກອນ"</string>
+    <string name="color_theme" msgid="1535685696756738324">"ສີສັນໜ້າຕາ"</string>
     <string name="default_theme" msgid="7085644992078579076">"ຄ່າເລີ່ມຕົ້ນ"</string>
+    <string name="device_theme" msgid="4571803018917608588">"ຮູບແບບສີສັນອຸປະກອນ"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"ອັດຕະໂນມັດ (ອີງໃສ່ຮູບພື້ນຫຼັງ)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"ແຈ້ງ"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"ມືດ"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"ຊື່ເຄືອຂ່າຍ"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"ສະແດງຊື່ເຄືອຂ່າຍຢູ່ແຖບສະຖານະ"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Storage Manager: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4105,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"ຂໍ້ມູນການເປີດນຳໃຊ້ເຄືອຂ່າຍ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Carrier Provisioning"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"ອັບເດດໂໝດຫ້າມລົບກວນ"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"ເຊື່ອງການແຈ້ງເຕືອນເພື່ອເພີ່ມສະມາທິ"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"ຢຸດການແຈ້ງເຕືອນຊົ່ວຄາວເພື່ອໃຫ້ມີສະມາທິ"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"ມີຫຍັງໃໝ່ ແລະ ໜ້າຕື່ນເຕັ້ນ?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ລອງເບິ່ງໂທລະສັບໃໝ່ຂອງທ່ານ"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ລອງເບິ່ງແທັບເລັດໃໝ່ຂອງທ່ານ"</string>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 9436d17..5dc3d5e 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Visada įjungtas"</item>
     <item msgid="6385301106124765323">"Visada išjungtas"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 2964d73..89b8edd 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -175,6 +175,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Leiskite planšetiniam kompiuteriui užmegzti ryšį su netoliese esančiais „Bluetooth“ įrenginiais"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Leiskite įrenginiui užmegzti ryšį su netoliese esančiais „Bluetooth“ įrenginiais"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Leiskite telefonui užmegzti ryšį su netoliese esančiais „Bluetooth“ įrenginiais"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Išj. „Bluetooth“ A2DP apar. įr. iškelt."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Pal. įr. iš naujo?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Turite paleisti įr. iš naujo, kad gal. pakeisti šį nustat."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Pal. iš n."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Atšaukti"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Pasiekiamos laikmenos"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Pasiekiami skambinimo įrenginiai"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Šiuo metu prisijungta"</string>
@@ -184,6 +189,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Ryšio nuostatos"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Anksčiau prijungti įrenginiai"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Anksčiau susieti"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Data ir laikas"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Pasirinkite laiko juostą"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -209,11 +216,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Prievadas, kurį įvedėte, netinkamas."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP įgaliotąjį serverį naudoja naršyklė, bet jo negali naudoti kitos programos."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL pralaidumas (Kb/s):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL pralaidumas (Kb/s):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Mobiliojo ryšio vietovės informacija (nebenaudojama):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Gretimo mobiliojo ryšio informacija (nebenaudojama):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE fizinio kanalo konfigūracija:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Mobiliojo ryšio informacijos atnaujinimo dažnis:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Visų mobiliųjų ryšių įvertinimo informacija:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Realaus laiko duomenų ryšio informacija:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Duomenų paslauga:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Tarptinklinis ryšys:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1178,8 +1186,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatinis šviesumas"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Pakelti ir pažadinti"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Adaptyvusis vaizdas"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Visada įjungta / eikvojama daugiau akum. energijos"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nauji pranešimai"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kada rodyti"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nauji pranešimai"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Pažadinti ekraną, kai gaunamas pranešimas"</string>
@@ -1226,8 +1232,6 @@
       <item quantity="other">Netinkamas SIM kortelės PIN kodas. Liko <xliff:g id="NUMBER_1">%d</xliff:g> bandymų.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Nepavyko atlikti SIM kortelės PIN kodo operacijos."</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Planšetinio kompiuterio būsena"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefono būsena"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Sistemos naujiniai"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"„Android“ versija"</string>
@@ -2166,8 +2170,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Naudojimo fone negalima apriboti"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Apriboti veiklą fone?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Jei apribosite programos veiklą fone, ji gali netinkamai veikti"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Negalite apriboti progr., nes ji nenust. optimiz. akum. naud.\n\nJei norite apr. progr., pirmiausia įj. akum. naud. optimiz."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Ekrano naudojimas po paskutinio visiško įkrovimo"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Ekrano suvartojama energija"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobiliojo ryšio tinklo nuskaitymas"</string>
@@ -2501,6 +2504,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Kritinės padėties numerio rinkimo signalas"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Nustatyti elgesį, kai skambinama pagalbos numeriu"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Atsarginė kopija"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Įjungta"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Išjungta"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Kurti atsarginę kopiją ir atkurti"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Asmeniniai duomenys"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Kurti atsarginę duomenų kopiją"</string>
@@ -2835,6 +2840,12 @@
       <item quantity="other">Tikrinti sertifikatus</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Keli naudotojai"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Naudotojai ir profiliai"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Pridėti naudotoją ar profilį"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Pridėti naudotoją"</string>
@@ -3019,14 +3030,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"duomenų naudojimas"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"viešosios interneto prieigos taškas"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Prijungti įrenginiai"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"„Bluetooth“, vairavimo režimas, ALR"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"„Bluetooth“, vairavimo režimas"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"„Bluetooth“, ALR"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Programos ir pranešimai"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Leidimai, numatytosios programos"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Paskyros"</string>
@@ -3043,7 +3050,6 @@
     <string name="keywords_home" msgid="294182527446892659">"paleidimo priemonė, numatytoji, programos"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ekranas, jutiklinis ekranas"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"pritemdyti ekraną, jutiklinis ekranas, akumuliatorius, ryškus"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"pritemdyti ekraną, jutiklinis ekranas, akumuliatorius"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"pritemdyti ekraną, naktis, atspalvis, naktinis režimas, ryškumas, ekrano spalva, spalva, spalvos"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"fonas, suasmeninti, tinkinti ekraną"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"teksto dydis"</string>
@@ -3084,8 +3090,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"tinklas, mobiliojo ryšio tinklo būsena, paslaugos būsena, signalo stiprumas, mobiliojo ryšio tinklo tipas, tarptinklinis ryšys, ICCID"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"serijos numeris, aparatinės įrangos versija"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"„Android“ saugos pataisos lygis, nemoduliuotų signalų įrangos versija, branduolio versija"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Aplinkos ekranas, užrakinimo ekranas"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"kontrolinis kodas"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"pasukti, apversti, pasukimas, stačia, gulsčia, orientacija, vertikali, horizontali"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"atnaujinti, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, tvarkaraštis, pranešimai, blokuoti, tyla, vibruoti, miego būsena, darbas, fokusavimas, garsas, nutildyti, diena, savaitės diena, savaitgalis, savaitės naktis, renginys"</string>
@@ -3170,18 +3180,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Leisti vaizdinius signalus"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Kai įjungtas netrukdymo režimas"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Pranešimai"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Tyliai rodyti pranešimus"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Pranešimai bus nutildyti"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Neskambėti gavus pranešimų"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Matysite pranešimus ekrane"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Gavus pranešimą telefonas neskleis garso ir nevibruos."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Slėpti pranešimus"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Nematysite naujų ir esamų pranešimų"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Nieko nerodyti arba neskambėti gavus pranešimų"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Nematysite arba negirdėsite pranešimų"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Jūsų telefonas nerodys naujų ir esamų pranešimų, neskleis garso ir nevibruos. Pranešimai nebus rodomi perbraukus nuo ekrano viršaus.\n\nAtminkite, kad svarbūs pranešimai apie telefono veiklą ir būseną vis tiek bus rodomi."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Tinkinti"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Įgalinti tinkintą nustatymą"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Pašalinti tinkintą nustatymą"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Bus rodoma"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Neskambėti gavus pranešimų"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Iš dalies paslėpta"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Paslėpta"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Nieko nerodyti arba neskambėti gavus pranešimų"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Tinkinti apribojimai"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Kai ekranas įjungtas"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Kai ekranas išjungtas"</string>
@@ -3244,19 +3254,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Nutildyta, bet leisti <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> ir <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Pranešimai, įvykiai ir priminimai"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Įjungus netrukdymo režimą pranešimai, priminimai ir įvykiai bus nutildomi, išskyrus anksčiau nurodytus elementus, kuriuos leidžiate. Galite koreguoti nustatymus, kad jūsų šeimos nariai, draugai arba kiti kontaktai galėtų su jumis susisiekti."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Atlikta"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Nustatymai"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Nieko nerodyti arba neskambėti gavus pranešimų"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Neskambėti gavus pranešimų"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Nematysite arba negirdėsite pranešimų. Skambučiai nuo žvaigždute pažymėtų kontaktų ir pakartotinai skambinančiųjų leidžiami."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Dabartinis nustatymas)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Pakeisti netrukdymo režimo pranešimų nustatymus?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Darbo profilio garsai"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Naudoti asmen. profilio garsus"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Darbo ir asmeniniame profiliuose nustatyti tokius pat garsus"</string>
@@ -3436,12 +3440,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Leisti skambučius"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Kai įjungtas netrukdymo režimas, gaunamieji skambučiai blokuojami. Galite koreguoti nustatymus, kad jūsų šeimos nariai, draugai arba kiti kontaktai galėtų su jumis susisiekti."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Žvaigždute pažymėti kontaktai"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">ir dar <xliff:g id="NUM_PEOPLE">%d</xliff:g> kontaktas</item>
-      <item quantity="few">ir dar <xliff:g id="NUM_PEOPLE">%d</xliff:g> kontaktai</item>
-      <item quantity="many">ir dar <xliff:g id="NUM_PEOPLE">%d</xliff:g> kontakto</item>
-      <item quantity="other">ir dar <xliff:g id="NUM_PEOPLE">%d</xliff:g> kontaktų</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Pranešimai"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Leisti pranešimus"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Pranešimai"</string>
@@ -3897,10 +3896,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Šaltų spalvų temperatūra"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Naudoti šaltesnes ekrano spalvas"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Kad pritaikytumėte spalvos pakeitimą, išjunkite ekraną"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"„ConnectivityMonitor“ rinks žurnalus, kai aptiks ryšio problemą, ir naudotojui pateiks raginimą pranešti apie riktą"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Kad pritaikytumėte ryšio stebėjimo priemonės pakeitimą, paleiskite įrenginį iš naujo"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Fotoaparato lazerio jutiklis"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Loginis fotoaparatas kaip numatytasis"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatiniai sistemos naujiniai"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Atnaujinimai pritaikomi, kai įrenginys paleidžiamas iš naujo"</string>
     <string name="usage" msgid="2977875522080448986">"Naudojimas"</string>
@@ -4238,8 +4235,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Automatinio pildymo paslauga"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatinis, pildymas, automatinis pildymas"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Įsitikinkite, kad pasitikite šia programa&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=„Google“ automatinis pildymas&gt;%1$s&lt;/xliff:g&gt; naudodamas informaciją ekrane nustato, ką gali užpildyti automatiškai."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Įrenginio tema"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Spalvų tema"</string>
     <string name="default_theme" msgid="7085644992078579076">"Numatytoji"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Įrenginio tema"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automatinė (pagal ekrano foną)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Šviesi"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Tamsi"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Tinklo pavadinimas"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Rodyti tinklo pavadinimą būsenos juostoje"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Saugyklos tvarkytuvė: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4251,7 +4252,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operatoriaus aprūpinimo informacija"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktyviklio operatoriaus aprūpinimas"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Atnaujinti netrukdymo režimą"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Slėpti pranešimus, kad neblaškytų dėmesio"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pristabdyti pranešimus, kad neblaškytų dėmesio"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Kas nauja ir verta dėmesio?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Peržiūrėkite naujo telefono apžvalgą"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Peržiūrėkite naujo planšetinio kompiuterio apžvalgą"</string>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 5a7d157..12b796e 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Vienmēr ieslēgts"</item>
     <item msgid="6385301106124765323">"Vienmēr izslēgts"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 1106d0c..2fa4049 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -174,6 +174,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Ļaujiet planšetdatoram izveidot savienojumu ar tuvumā esošām Bluetooth ierīcēm."</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Ļaujiet ierīcei izveidot savienojumu ar tuvumā esošām Bluetooth ierīcēm."</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Ļaujiet tālrunim izveidot savienojumu ar tuvumā esošām Bluetooth ierīcēm."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Atspējot Bluetooth A2DP aparatūras izlādi"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Restartēt ierīci?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Lai mainītu šo iestatījumu, jums jārestartē ierīce."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Restartēt"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Atcelt"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Pieejamās multivides ierīces"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Pieejamās zvanīšanas ierīces"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Pašlaik pievienotās"</string>
@@ -183,6 +188,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Savienojuma preferences"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Ierīces, ar kurām savienojums tika izveidots iepriekš"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Ierīces, ar kurām savienojums tika izveidots iepriekš"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Datums un laiks"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Laika joslas izvēle"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -208,11 +215,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Ierakstītais porta numurs nav derīgs."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP starpniekserveris tiek izmantots pārlūkprogrammā, taču, iespējams, netiek izmantots citās lietotnēs."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL joslas platums (kb/s):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL joslas platums (kb/s):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Mobilā tālruņa atrašanās vietas informācija (novecojusi):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Informācija par blakus esošo mobilo tālruni (novecojusi):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE fiziskā kanāla konfigurācija:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Mobilā tīkla informācijas atsvaidzināšanas biežums:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Visa mobilā tīkla mērījumu informācija:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Reāllaika informācija par datu savienojumu:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Datu pakalpojums:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Viesabonēšana:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1162,8 +1170,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automātisks spilgtums"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Pacelt, lai ieslēgtu"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Gaidstāves ekrāns"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Vienmēr ieslēgts/palielināts akumulatora lietojums"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Jauni paziņojumi"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kad rādīt"</string>
     <string name="doze_title" msgid="2375510714460456687">"Jauni paziņojumi"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Aktivizēt ekrānu, kad tiek saņemts paziņojums"</string>
@@ -1209,8 +1215,6 @@
       <item quantity="other">Nepareizs SIM kartes PIN kods. Varat mēģināt vēl <xliff:g id="NUMBER_1">%d</xliff:g> reizes.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM kartes PIN koda ievadīšana neizdevās."</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Planšetdatora statuss"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Tālruņa statuss"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Sistēmas atjauninājumi"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android versija"</string>
@@ -2140,8 +2144,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Lietošanu fonā nevar ierobežot"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Vai ierobežot darbību fonā?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ierobežojot lietotnes darbību fonā, var rasties šīs lietotnes darbības traucējumi."</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Lietotnei nav iestatīta akumulatora optimizācija, tāpēc to nevar ierobežot.\n\nVispirms iestatiet akumulatora optimizāciju."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Ekrāna lietojums kopš pilnas uzlādes"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Ekrāna lietojuma patēriņš"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobilo tīklu meklēšana"</string>
@@ -2468,6 +2471,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Ārkārtas zvana signāls"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Iestatīt uzvedību, kad tiek veikts ārkārtas zvans"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Dublēšana"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Ieslēgts"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Izslēgts"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Dublēšana un atjaunošana"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personīgie dati"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Dublēt manus datus"</string>
@@ -2798,6 +2803,12 @@
       <item quantity="other">Pārbaudīt sertifikātus</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Vairāki lietotāji"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Lietotāji un profili"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Pievienot lietotāju vai profilu"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Pievienot lietotāju"</string>
@@ -2981,14 +2992,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"datu lietojums"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"tīklājs"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Pievienotās ierīces"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, braukšanas režīms, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, braukšanas režīms"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Lietotnes un paziņojumi"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Atļaujas, noklusējuma lietotnes"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Konti"</string>
@@ -3005,7 +3012,6 @@
     <string name="keywords_home" msgid="294182527446892659">"palaidējs, noklusējuma, lietotnes"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ekrāns, skārienekrāns"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"aptumšot ekrānu, skārienekrāns, akumulators, spilgts"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"aptumšot ekrānu, skārienekrāns, akumulators"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"aptumšot ekrānu, nakts, tonis, nakts taustiņš, spilgtums, ekrāna krāsa, krāsa, krāsas"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"fons, personalizēt, pielāgot displeju"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"teksta lielums"</string>
@@ -3046,8 +3052,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"tīkls, mobilā tīkla statuss, pakalpojuma statuss, signāla stiprums, mobilā tīkla veids, viesabonēšana, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"sērijas numurs, aparatūras versija"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android drošības ielāpa līmenis, pamatjoslas versija, kodola versija"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Gaidstāves ekrāns, bloķēšanas ekrāna attēlojums"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"pirksta nospiedums"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"pagriezt, apvērst, pagriešana, portrets, ainava, virziens, vertikāls, horizontāls"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"jaunināt, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, grafiks, paziņojumi, bloķēt, klusums, vibrēt, miega režīms, darbs, izcelt, skaņa, izslēgt skaņu, diena, nedēļas diena, nedēļas nogale, vakars, notikums"</string>
@@ -3131,18 +3141,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Vizuālu signālu atļaušana"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Kad aktivizēts režīms Netraucēt"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Paziņojumi"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Rādīt paziņojumus bez skaņas signāla"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Paziņojumi būs bez skaņas"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Nav skaņas signālu no paziņojumiem"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Jūs redzēsiet paziņojumus ekrānā."</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Saņemot paziņojumus, nebūs tālruņa skaņas signāla vai vibrācijas."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Slēpt paziņojumus"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Netiks rādīti jauni vai esoši paziņojumi"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Nav vizuālo vai skaņas signālu no paziņojumiem"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Jūs neredzēsiet vai nedzirdēsiet paziņojumus."</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Tālrunī netiks rādīti jauni vai esoši paziņojumi un nebūs skaņas signāla vai vibrācijas. Paziņojumi netiks rādīti, kad vilksiet lejup no tālruņa augšdaļas.\n\nŅemiet vērā, ka joprojām tiks rādīti kritiski paziņojumi par tālruņa darbību un statusu."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Pielāgoti"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Iespējot pielāgoto iestatījumu"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Noņemt pielāgoto iestatījumu"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Tiks rādīti"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Nav skaņas signālu no paziņojumiem"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Daļēji paslēpti"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Paslēpti"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Nav vizuālo vai skaņas signālu no paziņojumiem"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Pielāgoti ierobežojumi"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Kad ekrāns ir ieslēgts"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Kad ekrāns ir izslēgts"</string>
@@ -3203,19 +3213,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Izslēgta skaņa, bet atļaut: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> un <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Ziņojumi, pasākumi un atgādinājumi"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Esot ieslēgtam režīmam Netraucēt, netiks rādīti ziņojumi, atgādinājumi un paziņojumi, izņemot vienumus, ko atļāvāt. Varat pielāgot ziņojumu iestatījumus, lai draugi, ģimene vai citas kontaktpersonas varētu ar jums sazināties."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Gatavs"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Iestatījumi"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Nav vizuālo vai skaņas signālu no paziņojumiem"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Nav skaņas signālu no paziņojumiem"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Jūs neredzēsiet vai nedzirdēsiet paziņojumus. Ir atļauti zvani no kontaktpersonām, kas atzīmētas ar zvaigznīti, un no atkārtotiem zvanītājiem."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(pašreizējais iestatījums)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Vai mainīt režīma “Netraucēt” paziņojumu iestatījumus?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Darba profila signāli"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Personiskā profila signāli"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Darba profila signāli ir tādi paši kā personiskā profila signāli."</string>
@@ -3391,11 +3395,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Zvanu atļaušana"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Esot ieslēgtam režīmam Netraucēt, ienākošie zvani ir bloķēti. Varat pielāgot iestatījumus, lai draugi, ģimene vai citas kontaktpersonas varētu ar jums sazināties."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Ar zvaigznīti atzīmētas kontaktpersonas"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="zero">un <xliff:g id="NUM_PEOPLE">%d</xliff:g> citi</item>
-      <item quantity="one">un <xliff:g id="NUM_PEOPLE">%d</xliff:g> cits</item>
-      <item quantity="other">un <xliff:g id="NUM_PEOPLE">%d</xliff:g> citi</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Ziņojumi"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Ziņojumu atļaušana"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Ziņojumi"</string>
@@ -3838,10 +3838,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Vēsu krāsu temperatūra"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Izmantot vēsākas krāsas"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Lai mainītu krāsas, izslēdziet ekrānu"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Savienojamības pārraugs"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Ja tiks konstatēta savienojuma problēma, savienojamības pārraugs apkopos žurnālus un paziņojumā aicinās lietotāju reģistrēt kļūdu."</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Lai lietotu savienojamības pārrauga izmaiņas, atkārtoti palaidiet ierīci."</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameras lāzera sensors"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Loģiskā kamera kā noklusējums"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automātiski sistēmas atjauninājumi"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Lietot atjauninājumus pēc ierīces restartēšanas"</string>
     <string name="usage" msgid="2977875522080448986">"Lietojums"</string>
@@ -4165,8 +4163,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Automātiskā aizpilde"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automātiskā aizpilde"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Pārliecinieties, ka šī lietotne ir uzticama&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google automātiskā aizpilde&gt;%1$s&lt;/xliff:g&gt; izmanto ekrānā redzamo, lai noteiktu, kādu informāciju aizpildīt automātiski."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Ierīces motīvs"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Krāsu motīvs"</string>
     <string name="default_theme" msgid="7085644992078579076">"Noklusējums"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Ierīces motīvs"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automātisks (pamatojoties uz fona tapeti)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Gaišs"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Tumšs"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Tīkla nosaukums"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Statusa joslā rādīt tīkla nosaukumu"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Krātuves pārvaldnieks: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4178,7 +4180,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informācija par operatora nodrošināšanu"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktivizēt operatora nodrošināšanu"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Atjaunināt iestatījumu “Netraucēt”"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Paslēpt paziņojumus, lai ilglaicīgi koncentrētos"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pārtraukt paziņojumus, lai ilglaicīgi koncentrētos"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Kādi ir jaunumi?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Apskatiet savu jauno tālruni"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Apskatiet savu jauno planšetdatoru"</string>
diff --git a/res/values-mk/arrays.xml b/res/values-mk/arrays.xml
index 50e6664..d021169 100644
--- a/res/values-mk/arrays.xml
+++ b/res/values-mk/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Секогаш вклучен"</item>
     <item msgid="6385301106124765323">"Секогаш исклучен"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 45cf958..0f646bf 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Дозволете таблетот да комуницира со уредите со Bluetooth во близина"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Дозволете уредот да комуницира со уредите со Bluetooth во близина"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Дозволете телефонот да комуницира со уредите со Bluetooth во близина"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Оневоз. хард. ослоб. за Bluetooth A2DP"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Да се рестартира?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Треба да го рестартирате уредот за да ја смените поставкава."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Да"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Откажи"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Достапни уреди за аудиовизуелни содржини"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Достапни уреди за повикување"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Моментално поврзани"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Поставки за врски"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Претходно поврзани уреди"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Претходно поврзани"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Датум и време"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Избери временска зона"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Внесениот порт не е исправен."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP проксито го користи прелистувачот, но не може да го користат другите апликации."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Брзина на пренос при преземање (кбит/с):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Брзина на пренос при прикачување (кбит/с):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Информации за локација на мобилен (застарено):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Информации за соседен мобилен (застарено):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Конфигурација на физички канал на LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Стапка на освежување на информациите за мобилниот:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Сите информации за мерењата на мобилниот:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Информации во реално време за врската со податоците:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Услуга за податоци:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Роаминг:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматска осветленост"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Подигнете да се активира"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Амбиентален екран"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Секогаш вклучен/Зголемена употреба на батеријата"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Нови известувања"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Кога да се прикажува"</string>
     <string name="doze_title" msgid="2375510714460456687">"Нови известувања"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Разбуди го екранот кога ќе примам известувања"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="other">Погрешен PIN-код за SIM, имате уште <xliff:g id="NUMBER_1">%d</xliff:g> обиди.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Операцијата PIN на SIM картичка не успеа!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Статус на таблет"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Статус на телефон"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Ажурирања на системот"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Верзија на Android"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Користењето во заднина не може да се ограничи"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Да се ограничи активноста во заднина?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Апликацијата може да се однесува необично ако ја ограничите нејзината активност во заднина"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Апликацијава не е оптимизирана и не може да се ограничи.\n\nЗа да ја ограничите, прво вклучете оптимизација на батеријата."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Употреба на екранот по целосно полнење"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Потрошувачка на екранот"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Скенирање мобилна мрежа"</string>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Сигнал за итно бирање"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Постави однесување кога се прави итен повик"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Бекап"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Вклучено"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Исклучено"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Бекап и обнова"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Лични податоци"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Направи резервна копија на моите податоци"</string>
@@ -2761,6 +2766,12 @@
       <item quantity="other">Проверка на сертификати</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Повеќе корисници"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Корисници и профили"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Додајте корисник или профил"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Додајте корисник"</string>
@@ -2943,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"потрошен сообраќај"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"точка на пристап"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Поврзани уреди"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, режим на возење, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, режим на возење"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Апликации и известувања"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Дозволи, стандардни апликации"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Сметки"</string>
@@ -2967,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"стартер, стандарден, апликации"</string>
     <string name="keywords_display" msgid="8910345814565493016">"екран, екран на допир"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"затемнет екран, екран на допир, батерија, осветлено"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"затемни екран, екран на допир, батерија"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"затемнет екран, ноќ, нијанса, night shift, осветленост, боја на екранот, боја"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"заднина, персонализирај, приспособи екран"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"големина на текст"</string>
@@ -3008,8 +3014,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"мрежа, состојба на мобилна мрежа, состојба на услуга, јачина на сигнал, тип на мобилна мрежа, роаминг, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"сериски број, верзија на хардвер"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"ниво на безбедносна лепенка на Android, верзија на радиомодул, верзија на кернел"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Амбиентален екран, Екран за заклучување на екранот"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"отпечаток"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"затемнет екран, екран на допир, батерија, паметна осветленост, динамична осветленост"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"ротирај, преврти, ротација, портрет, пејзаж, ориентација, вертикална, хоризонтална"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"надгради, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, распоред, известувања, блокирај, стиши, вибрации, во мирување, работа, фокус, звук, изклучен звук, ден, работен ден, викенд, ноќ од викенд, настан"</string>
@@ -3092,18 +3101,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Дозволи визуелни сигнали"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Кога е вклучен режимот „Не вознемирувај“"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Известувања"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Тивко прикажувај ги известувањата"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Ќе се исклучи звукот на известувањата"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Без звук од известувањата"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Ќе гледате известувања на екранот"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Кога ќе пристигнат известувања, телефонот нема да испушта звук или да вибрира."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Сокриј ги известувањата"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Нема да гледате нови ниту постојни известувања"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Без визуелни вознемирувања или звук од известувањата"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Нема да гледате ниту да слушате известувања"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Телефонот нема да прикажува нови ниту постојни известувања и нема да испушта звук или да вибрира. Известувањата нема да се појавуваат кога повлекувате надолу од врвот на екранот.\n\nИмајте предвид дека критичните известувања за активноста и статусот на телефонот сѐ уште ќе се појавуваат."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Приспособени"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Овозможи ја приспособената поставка"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Отстрани ја приспособената поставка"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Ќе се појавуваат"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Без звук од известувањата"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Делумно сокриени"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Сокриени"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Без визуелни вознемирувања или звук од известувањата"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Приспособени ограничувања"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Кога екранот е вклучен"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Кога екранот е исклучен"</string>
@@ -3162,19 +3171,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Исклучи го звукот, но дозволи <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> и <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Пораки, настани и потсетници"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Кога е вклучен режимот „Не вознемирувај“, ќе се исклучи звукот на пораките, потсетниците и настаните, освен за ставките што ќе ги дозволите погоре. Може да ги приспособите поставките за да им дозволите на пријателите, семејството или другите контакти да ве добијат."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Готово"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Поставки"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Без визуелни вознемирувања или звук од известувањата"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Без звук од известувањата"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Нема да гледате ниту да слушате известувања. Повиците од контактите означени со ѕвезда и повторните повикувачи се дозволени."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Тековна поставка)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Да се променат поставките за известувања на режимот „Не вознемирувај“?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Звуци на работниот профил"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Користи звуци од личен профил"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Звуците се исти за работниот и личниот профил"</string>
@@ -3346,10 +3349,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Дозволи повици"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Кога е вклучен режимот „Не вознемирувај“, сите дојдовни повици се блокирани. Може да ги приспособите поставките за да им дозволите на пријателите, семејството или другите контакти да ве добијат."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Контакти означени со ѕвезда"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">и <xliff:g id="NUM_PEOPLE">%d</xliff:g> друг контакт</item>
-      <item quantity="other">и <xliff:g id="NUM_PEOPLE">%d</xliff:g> други контакти</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Пораки"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Дозволи пораки"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Пораки"</string>
@@ -3779,10 +3779,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Ладна боја за температура"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Користи поладни бои на екранот"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"За да се примени промената на бојата, исклучете го екранот"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Монитор за интернет-врска"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Мониторот за интернет-врска ќе води евиденција кога ќе открие проблем со врската и ќе го извести корисникот да пријави грешка"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"За да се примени промената на мониторот за интернет-врска, рестартирајте го уредот"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Ласерски сензор за камерата"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Логичката камера како стандардна"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматски ажурирања на системот"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Применувај ажурирања кога уредот се рестартира"</string>
     <string name="usage" msgid="2977875522080448986">"Користење"</string>
@@ -4092,8 +4090,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Автоматско пополнување"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"автоматско, пополнување, автоматско пополнување"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Проверете дали е ова апликација на која ѝ верувате&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=„Автоматско пополнување на Google“&gt;%1$s&lt;/xliff:g&gt; го користи она што е на екранот за да утврди што може автоматски да се пополни."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Тема на уредот"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Боја на тема"</string>
     <string name="default_theme" msgid="7085644992078579076">"Стандардно"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Тема на уредот"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Автоматска (според заднината)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Светла"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Темна"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Име на мрежата"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Прикажи го името на мрежата во статусната лента"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"„Управник со меморија“: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4105,7 +4107,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Информации за обезбедување оператор"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Активирајте обезбедување оператор"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Ажурирање на режимот „Не вознемирувај“"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Сокријте ги известувањата за да останете фокусирани"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Паузирајте ги известувањата за да останете фокусирани"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Што има ново и интересно?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Запознајте се со новиот телефон"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Запознајте се со новиот таблет"</string>
diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml
index a6abc50..8971b42 100644
--- a/res/values-ml/arrays.xml
+++ b/res/values-ml/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"എപ്പോഴും ഓണാക്കുക"</item>
     <item msgid="6385301106124765323">"എപ്പോഴും ഓഫാക്കുക"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 2468dcd..b651bdc 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"അടുത്തുള്ള Bluetooth ഉപകരണങ്ങളുമായി ആശയവിനിമയം നടത്താൻ നിങ്ങളുടെ ടാബ്‌ലെറ്റിനെ അനുവദിക്കുക"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"അടുത്തുള്ള Bluetooth ഉപകരണങ്ങളുമായി ആശയവിനിമയം നടത്താൻ നിങ്ങളുടെ ഉപകരണത്തെ അനുവദിക്കുക"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"അടുത്തുള്ള Bluetooth ഉപകരണങ്ങളുമായി ആശയവിനിമയം നടത്താൻ നിങ്ങളുടെ ഫോണിനെ അനുവദിക്കുക"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Bluetooth A2DP ഹാര്‍ഡ്‍വെയര്‍ ഓഫ്‌ലോഡ് പ്രവർത്തനരഹിതമാക്കുക"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"ഉപകരണം റീസ്‌റ്റാർട്ട് ചെയ്യണോ?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"ഈ ക്രമീകരണം മാറ്റാൻ നിങ്ങളുടെ ഉപകരണം റീസ്‌റ്റാർട്ട് ചെയ്യേണ്ടതുണ്ട്."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"റീസ്‌റ്റാർട്ട് ചെയ്യുക"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"റദ്ദാക്കുക"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"ലഭ്യമായ മീഡിയ ഉപകരണങ്ങൾ"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"ലഭ്യമായ കോൾ ഉപകരണങ്ങൾ"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"നിലവിൽ കണക്റ്റ് ചെയ്തു"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"കണക്ഷൻ മുൻഗണനകൾ"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"മുമ്പ് കണക്‌റ്റ് ചെയ്തിട്ടുള്ള ഉപകരണങ്ങൾ"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"മുമ്പേ കണക്‌റ്റ് ചെയ്‌തവ"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"തീയതിയും സമയവും"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"സമയ മേഖല തിരഞ്ഞെടുക്കുക"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"നിങ്ങൾ ടൈപ്പുചെയ്‌ത പോർട്ട് സാധുവായതല്ല."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"ബ്രൗസർ HTTP പ്രോക്‌സി ഉപയോഗിക്കുന്നുവെങ്കിലും മറ്റ് അപ്ലിക്കേഷനുകൾ ഉപയോഗിക്കാനിടയില്ല."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL ബാന്‍ഡ്‍വിത്ത് (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL ബാന്‍ഡ്‍വിത്ത് (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"സെൽ ലൊക്കേഷൻ വിവരങ്ങൾ (അവസാനിപ്പിച്ചു):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"ചുറ്റുവട്ട സെൽ വിവരങ്ങൾ (അവസാനിപ്പിച്ചു):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE ഫിസിക്കൽ ചാനൽ കോൺഫിഗറേഷൻ:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"സെൽ വിവരങ്ങൾ പുതുക്കിയെടുക്കൽ നിരക്ക്:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"എല്ലാ സെൽ അളവെടുക്കൽ വിവരങ്ങളും:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"ഡാറ്റ കണക്ഷൻ തത്സമയ വിവരങ്ങൾ:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"ഡാറ്റ സേവനം:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"റോമിംഗ്:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1007,16 +1015,11 @@
     <string name="emergency_address_title" msgid="932729250447887545">"അടിയന്തര വിലാസം"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"വൈഫൈ ഉപയോഗിച്ച് നിങ്ങളൊരു അടിയന്തര കോൾ ചെയ്യുമ്പോൾ, നിങ്ങളുടെ ലൊക്കേഷനായി ഉപയോഗിക്കപ്പെടും"</string>
     <string name="private_dns_help_message" msgid="3299567069152568958">"സ്വകാര്യ DNS ഫീച്ചറുകളെ കുറിച്ച് "<annotation id="url">"കൂടുതലറിയുക"</annotation></string>
-    <!-- no translation found for wifi_calling_pref_managed_by_carrier (6845711858866828986) -->
-    <skip />
-    <!-- no translation found for wifi_calling_settings_activation_instructions (7492509632478260955) -->
-    <skip />
-    <!-- no translation found for wifi_calling_turn_on (1171403510313983983) -->
-    <skip />
-    <!-- no translation found for wifi_calling_not_supported (7878640438907807754) -->
-    <skip />
-    <!-- no translation found for carrier (5264014738689761132) -->
-    <skip />
+    <string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"ക്രമീകരണം, കാരിയർ മാനേജ് ചെയ്യുന്നു"</string>
+    <string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"വൈഫൈ കോളിംഗ് സജീവമാക്കുക"</string>
+    <string name="wifi_calling_turn_on" msgid="1171403510313983983">"വൈഫൈ കോളിംഗ് ഓണാക്കുക"</string>
+    <string name="wifi_calling_not_supported" msgid="7878640438907807754">"%1$s-ൽ വൈഫൈ കോളിംഗ് പിന്തുണയ്ക്കുന്നില്ല"</string>
+    <string name="carrier" msgid="5264014738689761132">"കാരിയര്‍"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ഡിസ്പ്ലേ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ശബ്‌ദം"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"വോളിയം"</string>
@@ -1151,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"യാന്ത്രിക തെളിച്ചം"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"സജീവമാക്കാൻ ലിഫ്റ്റുചെയ്യുക"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"പാതിമയക്ക ഡിസ്‌പ്ലേ"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"എപ്പോഴും ഓണാണ് / ഉയർന്ന ബാറ്ററി ഉപയോഗം"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"പുതിയ അറിയിപ്പുകൾ"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"കാണിക്കേണ്ട സമയം"</string>
     <string name="doze_title" msgid="2375510714460456687">"പുതിയ അറിയിപ്പുകൾ"</string>
     <string name="doze_summary" msgid="3846219936142814032">"നിങ്ങൾക്ക് അറിയിപ്പുകൾ ലഭിക്കുന്ന സമയത്ത് സ്ക്രീൻ സജീവമാക്കുക"</string>
@@ -1197,8 +1198,6 @@
       <item quantity="one">SIM PIN കോഡ് തെറ്റാണ്, നിങ്ങളുടെ ഉപകരണം അൺലോക്കുചെയ്യാൻ കാരിയറെ ബന്ധപ്പെടേണ്ടതിന് മുമ്പായി <xliff:g id="NUMBER_0">%d</xliff:g> ശ്രമം കൂടി ശേഷിക്കുന്നു.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"സിം പിൻ പ്രവർത്തനം പരാജയപ്പെട്ടു!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"ടാബ്‌ലെറ്റ് നില"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"ഫോൺ നില"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"സി‌സ്‌റ്റം അപ്‌ഡേറ്റുകൾ"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android പതിപ്പ്"</string>
@@ -2119,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"പശ്ചാത്തലം ഉപയോഗം നിയന്ത്രിക്കാനാവില്ല"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"പശ്ചാത്തല പ്രവർത്തനം പരിമിതപ്പെടുത്തണോ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"നിങ്ങൾ ഒരു ആപ്പിനായി പശ്ചാത്തല പ്രവർത്തനം പരിമിതപ്പെടുത്തുകയാണെങ്കിൽ, അത് ശരിയായി പ്രവർത്തിക്കാനിടയില്ല."</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"ബാറ്ററി ഓപ്‌റ്റിമൈസ് ചെയ്യാൻ ഈ ആപ്പ് സജ്ജീകരിക്കാത്തതിനാൽ, നിങ്ങൾക്ക് ഇത് നിയന്ത്രിക്കാനാവില്ല.\n\nആപ്പ് നിയന്ത്രിക്കാൻ, ആദ്യം ബാറ്ററി ഓപ്‌റ്റിമൈസേഷൻ ഓണാക്കുക."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"പൂർണ്ണമായി ചാർജ്ജുചെയ്തത് മുതലുള്ള സ്‌ക്രീൻ ഉപയോഗം"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"സ്‌ക്രീൻ ഉപഭോഗം"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"മൊബൈൽ നെറ്റ്‌വർക്ക് സ്‌കാൻ ചെയ്യൽ"</string>
@@ -2173,8 +2171,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"ടാബ്‌ലെറ്റ്, സാധാരണയിൽ കൂടുതൽ ഉപയോഗിച്ചു"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"ഉപകരണം, സാധാരണയിൽ കൂടുതൽ ഉപയോഗിച്ചു"</string>
     <string name="battery_tip_high_usage_summary" msgid="6341311803303581798">"ബാറ്ററി ഉടൻ തീർന്നേക്കാം"</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="7001932078713215338">"നിങ്ങളുടെ ഫോൺ സാധാരണയിൽ കൂടുതൽ ബാറ്ററി ഉപയോഗിച്ചു. പ്രതീക്ഷിച്ചതിനെക്കാൾ വേഗത്തിൽ ബാറ്ററി ചാർജ് തീർന്നേക്കാം.\n\nഅവസാനം പൂർണ്ണമായി ചാർജ് ചെയ്‌ത ശേഷം നിങ്ങൾ ഏറ്റവും കൂടുതൽ ഉപയോഗിച്ച <xliff:g id="NUMBER">%1$d</xliff:g> ആപ്പുകൾ:"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="8482296786233647690">"നിങ്ങളുടെ ടാബ്‌ലെറ്റ് സാധാരണയിൽ കൂടുതൽ ബാറ്ററി ഉപയോഗിച്ചു. പ്രതീക്ഷിച്ചതിനെക്കാൾ വേഗത്തിൽ ബാറ്ററി ചാർജ് തീർന്നേക്കാം.\n\nഅവസാനം പൂർണ്ണമായി ചാർജ് ചെയ്‌ത ശേഷം നിങ്ങൾ ഏറ്റവും കൂടുതൽ ഉപയോഗിച്ച <xliff:g id="NUMBER">%1$d</xliff:g> ആപ്പുകൾ:"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="7001932078713215338">"നിങ്ങൾ ഫോൺ സാധാരണയിൽ കൂടുതൽ ഉപയോഗിച്ചു. പ്രതീക്ഷിച്ചതിനെക്കാൾ വേഗത്തിൽ ബാറ്ററി ചാർജ് തീർന്നേക്കാം.\n\nഅവസാനം പൂർണ്ണമായി ചാർജ് ചെയ്‌ത ശേഷം നിങ്ങൾ ഏറ്റവും കൂടുതൽ ഉപയോഗിച്ച <xliff:g id="NUMBER">%1$d</xliff:g> ആപ്പുകൾ:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="8482296786233647690">"നിങ്ങൾ ടാബ്‌ലെറ്റ് സാധാരണയിൽ കൂടുതൽ ഉപയോഗിച്ചു. പ്രതീക്ഷിച്ചതിനെക്കാൾ വേഗത്തിൽ ബാറ്ററി ചാർജ് തീർന്നേക്കാം.\n\nഅവസാനം പൂർണ്ണമായി ചാർജ് ചെയ്‌ത ശേഷം നിങ്ങൾ ഏറ്റവും കൂടുതൽ ഉപയോഗിച്ച <xliff:g id="NUMBER">%1$d</xliff:g> ആപ്പുകൾ:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2806861679225286129">"നിങ്ങളുടെ ഉപകരണം സാധാരണയിൽ കൂടുതൽ ബാറ്ററി ഉപയോഗിച്ചു. പ്രതീക്ഷിച്ചതിനെക്കാൾ വേഗത്തിൽ ബാറ്ററി ചാർജ് തീർന്നേക്കാം.\n\nഅവസാനം പൂർണ്ണമായി ചാർജ് ചെയ്‌ത ശേഷം നിങ്ങൾ ഏറ്റവും കൂടുതൽ ഉപയോഗിച്ച <xliff:g id="NUMBER">%1$d</xliff:g> ആപ്പുകൾ:"</string>
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="467228882789275512">
       <item quantity="other">%1$d ആപ്പുകളെ നിയന്ത്രിക്കുക</item>
@@ -2440,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"അടിയന്തര ഡയലിംഗ് സിഗ്നൽ"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"ഒരു അടിയന്തര കോൾ ലഭിക്കുന്ന സമയത്തെ പ്രവർത്തരീതി സജ്ജീകരിക്കുക"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"ബാക്കപ്പുചെയ്യുക"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"ഓണാണ്"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"ഓഫാണ്"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"ബാക്കപ്പുചെയ്യലും പുനഃസ്ഥാപിക്കലും"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"വ്യക്തിഗത ഡാറ്റ"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"ഡാറ്റ ബാക്കപ്പുചെയ്യൂ"</string>
@@ -2766,6 +2766,12 @@
       <item quantity="one">സർട്ടിഫിക്കറ്റ് പരിശോധിക്കുക</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"ഒന്നിലധികം ഉപയോക്താക്കൾ"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"ഉപയോക്താക്കളും പ്രൊഫൈലുകളും"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ഉപയോക്താവിനെയോ പ്രൊഫൈലോ ചേർക്കുക"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"ഉപയോക്താവിനെ ചേര്‍ക്കുക"</string>
@@ -2948,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ഡാറ്റ ഉപയോഗം"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"ഹോട്ട്‌സ്‌പോട്ട്"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"കണക്‌റ്റ് ചെയ്ത ഉപകരണങ്ങൾ"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, ഡ്രൈവിംഗ് മോഡ്, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, ഡ്രൈവിംഗ് മോഡ്"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ആപ്‌സും അറിയിപ്പുകളും"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"അനുമതികൾ, ‌ഡിഫോൾട്ട് ആപ്പുകൾ"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"അക്കൗണ്ടുകൾ"</string>
@@ -2972,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"ലോഞ്ചർ, ഡിഫോൾട്ട്, ആപ്പുകൾ"</string>
     <string name="keywords_display" msgid="8910345814565493016">"സ്ക്രീൻ, ടച്ച്സ്ക്രീൻ"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"മങ്ങിയ സ്‌ക്രീൻ, ടച്ച്‌സ്‌ക്രീൻ, ബാറ്ററി, തെളിച്ചം"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"മങ്ങിയ സ്‌ക്രീൻ, ടച്ച്‌സ്‌ക്രീൻ, ബാറ്ററി"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"മങ്ങിയ സ്‌ക്രീൻ, രാത്രി, ടിന്റ്, രാത്രികാല ഷിഫ്റ്റ്, തെളിച്ചം, സ്‌ക്രീൻ നിറം, വർണ്ണം, നിറം"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"പശ്ചാത്തലം, വ്യക്തിഗതമാക്കുക, ഡിസ്‌പ്ലേ ഇഷ്‌ടാനുസൃതമാക്കുക"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ടെക്‌സ്‌റ്റ് വലുപ്പം"</string>
@@ -3013,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"നെറ്റ്‌വർക്ക്, മൊബൈൽ നെറ്റ്‌വർക്ക് നില, സേവന നില, സിഗ്നൽ ശക്തി, മൊബൈൽ നെറ്റ്‌വർക്ക് നില, റോമിംഗ്, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"സീരിയൽ നമ്പർ, ഹാർഡ്‌വെയർ പതിപ്പ്"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android സുരക്ഷാ പാച്ച് നില, ബേസ്‌ബാൻഡ് പതിപ്പ്, കെർണൽ പതിപ്പ്"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"പാതിമയക്ക ഡിസ്‌പ്ലേ, ലോക്ക് സ്‌ക്രീൻ ഡിസ്‌പ്ലേ"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"ഫിംഗർപ്രിന്റ്"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"തിരിക്കുക, ഫ്ലിപ്പ്, തിരിക്കൽ, പോർ‌ട്രെയ്റ്റ്, ലാൻഡ്‌സ്കേപ്പ്, ഓറിയന്റേഷൻ, ലംബം, സമാന്തരം"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"അപ്‌ഗ്രേഡ്, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, ഷെഡ്യൂൾ, അറിയിപ്പുകൾ, തടയുക, നിശബ്‌ദത, വൈബ്രേറ്റ്, സ്ലീപ്പ്, ജോലി, ഫോക്കസ്, ശബ്‌ദം, മ്യൂട്ട്, ദിവസം, പ്രവർത്തി ദിവസം, വാരാന്ത്യം, പ്രവർത്തിദിന രാവ്, ഇവന്റ്"</string>
@@ -3097,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"ദൃശ്യ സിഗ്നലുകൾ അനുവദിക്കുക"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"ശല്ല്യപ്പെടുത്തരുത് എന്നത് ഓണാക്കുമ്പോൾ"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"അറിയിപ്പുകൾ"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"അറിയിപ്പുകൾ നിശ്ശബ്ദമായി കാണിക്കുക"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"അറിയിപ്പുകൾ മ്യൂട്ട് ചെയ്യപ്പെടും"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"അറിയിപ്പുകളിൽ നിന്ന് ശബ്‌ദമില്ല"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"നിങ്ങളുടെ സ്‌ക്രീനിൽ അറിയിപ്പുകൾ കാണും"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"അറിയിപ്പുകൾ വരുമ്പോൾ നിങ്ങളുടെ ഫോൺ ശബ്ദമുണ്ടാക്കുകയോ വൈബ്രേറ്റ് ചെയ്യുകയോ ഇല്ല."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"അറിയിപ്പുകൾ മറയ്ക്കുക"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"നിങ്ങൾ പുതിയതോ നിലവിലുള്ളതോ ആയ അറിയിപ്പുകൾ കാണില്ല"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"അറിയിപ്പുകളിൽ നിന്ന് വിഷ്വലുകളോ അല്ലെങ്കിൽ ശബ്‌ദമോ ഇല്ല"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"നിങ്ങൾ അറിയിപ്പുകൾ കാണുകയോ കേൾക്കുകയോ ഇല്ല"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"നിങ്ങളുടെ ഫോൺ പുതിയതോ നിലവിലുള്ളതോ ആയ അറിയിപ്പുകൾ കാണിക്കില്ല, ശബ്ദമുണ്ടാക്കുകയോ വൈബ്രേറ്റ് ചെയ്യുകയോ ഇല്ല. സ്ക്രീനിന്റെ മുകളിൽ നിന്ന് താഴേക്ക് സ്വൈപ്പ് ചെയ്യുമ്പോൾ, അറിയിപ്പുകൾ ദൃശ്യമാകില്ല.\n\nഫോൺ ആക്‌റ്റിവിറ്റിയും സ്റ്റാറ്റസും ആയി ബന്ധപ്പെട്ട സുപ്രധാന അറിയിപ്പുകൾ അപ്പോഴും ദൃശ്യമാകും എന്ന കാര്യം ശ്രദ്ധിക്കുക."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"ഇഷ്‌ടം"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"ഇഷ്‌ടാനുസൃത ക്രമീകരണം പ്രവർത്തനക്ഷമമാക്കുക"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"ഇഷ്‌ടാനുസൃത ക്രമീകരണം നീക്കം ചെയ്യുക"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"ദൃശ്യമാവും"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"അറിയിപ്പുകളിൽ നിന്ന് ശബ്‌ദമില്ല"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"ഭാഗികമായി അദൃശ്യമാക്കി"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"അദൃശ്യമാക്കി"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"അറിയിപ്പുകളിൽ നിന്ന് വിഷ്വലുകളോ അല്ലെങ്കിൽ ശബ്‌ദമോ ഇല്ല"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"ഇഷ്‌ടാനുസൃത നിയന്ത്രണങ്ങൾ"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"സ്‌ക്രീൻ ഓണായിരിക്കുമ്പോൾ"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"സ്‌ക്രീൻ ഓഫായിരിക്കുമ്പോൾ"</string>
@@ -3167,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"മ്യൂട്ട് ചെയ്തു, എന്നാൽ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>, <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> എന്നിവ അനുവദിക്കുന്നു"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"സന്ദേശങ്ങളും റിമൈൻഡറുകളും ഇവന്റുകളും"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"ശല്യപ്പെടുത്തരുത് ഓണായിരിക്കുമ്പോൾ, നിങ്ങൾ മുകളിൽ അനുവദിച്ചിട്ടുള്ള ഇനങ്ങൾ ഒഴികെയുള്ള, സന്ദേശങ്ങളും റിമൈൻഡറുകളും ഇവന്റുകളും മ്യൂട്ട് ചെയ്യപ്പെടും. നിങ്ങളെ വിളിക്കുന്നതിന് സുഹൃത്തുക്കളെയോ കുടുംബാംഗങ്ങളെയോ മറ്റ് കോൺടാക്‌റ്റുകളെയോ അനുവദിക്കാൻ നിങ്ങൾക്ക് ക്രമീകരണം ക്രമപ്പെടുത്താവുന്നതാണ്."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"പൂർത്തിയാക്കി"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"ക്രമീകരണം"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"അറിയിപ്പുകളിൽ നിന്ന് വിഷ്വലുകളോ അല്ലെങ്കിൽ ശബ്‌ദമോ ഇല്ല"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"അറിയിപ്പുകളിൽ നിന്ന് ശബ്‌ദമില്ല"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"നിങ്ങൾ അറിയിപ്പുകൾ കാണുകയോ കേൾക്കുകയോ ഇല്ല. നക്ഷത്രമിട്ടിട്ടുള്ള കോൺടാക്‌റ്റുകളിൽ നിന്നും ആവർത്തിച്ച് വിളിക്കുന്നവരിൽ നിന്നുമുള്ള കോളുകൾ അനുവദനീയം."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(നിലവിലെ ക്രമീകരണം)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"ശല്ല്യപ്പെടുത്തരുത് അറിയിപ്പ് ക്രമീകരണം മാറ്റണോ?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"ഔദ്യോഗിക പ്രൊഫൈൽ ശബ്ദങ്ങൾ"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"സ്വകാര്യ പ്രൊഫൈൽ ശബ്ദങ്ങൾ ഉപയോഗിക്കുക"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"ഔദ്യോഗിക പ്രൊഫൈലുകൾക്കും വ്യക്തിഗത പ്രൊഫൈലുകൾക്കുമുള്ള ശബ്ദങ്ങൾ ഒന്നുതന്നെ ആയിരിക്കും"</string>
@@ -3348,17 +3347,12 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> മുതൽ <xliff:g id="END">%2$s</xliff:g> വരെ"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"കോളുകൾ"</string>
-    <!-- no translation found for zen_mode_calls_title (623395033931747661) -->
-    <skip />
+    <string name="zen_mode_calls_title" msgid="623395033931747661">"കോളുകൾ അനുവദിക്കുക"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"ശല്യപ്പെടുത്തരുത് ഓണായിരിക്കുമ്പോൾ, ഇൻകമിംഗ് കോളുകൾ ബ്ലോക്ക് ചെയ്യപ്പെടുന്നു. നിങ്ങളെ വിളിക്കുന്നതിന് സുഹൃത്തുക്കളെയോ കുടുംബാംഗങ്ങളെയോ മറ്റ് കോൺടാക്‌റ്റുകളെയോ അനുവദിക്കാൻ നിങ്ങൾക്ക് ക്രമീകരണം ക്രമപ്പെടുത്താവുന്നതാണ്."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"നക്ഷത്രചിഹ്നമിട്ട കോൺടാക്‌റ്റുകൾ"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">കൂടാതെ മറ്റ് <xliff:g id="NUM_PEOPLE">%d</xliff:g> പേരും</item>
-      <item quantity="one">കൂടാതെ മറ്റൊരാളും</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"സന്ദേശങ്ങള്‍"</string>
-    <!-- no translation found for zen_mode_messages_title (7729380010396411129) -->
-    <skip />
+    <string name="zen_mode_messages_title" msgid="7729380010396411129">"സന്ദേശങ്ങൾ അനുവദിക്കുക"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"സന്ദേശങ്ങള്‍‌"</string>
     <string name="zen_mode_selected_messages" msgid="1047355526202106114">"ചില സന്ദേശങ്ങൾ"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"ആരിൽ നിന്നും"</string>
@@ -3372,19 +3366,15 @@
     <string name="zen_mode_media" msgid="8808264142134422380">"മീഡിയ"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"സ്‌പർശന ശബ്‌ദങ്ങൾ"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"റിമൈൻഡറുകൾ"</string>
-    <!-- no translation found for zen_mode_reminders_title (2345044406347406902) -->
-    <skip />
+    <string name="zen_mode_reminders_title" msgid="2345044406347406902">"റിമൈൻഡറുകൾ അനുവദിക്കുക"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ഇവന്റുകൾ"</string>
-    <!-- no translation found for zen_mode_events_title (5597241655883329085) -->
-    <skip />
+    <string name="zen_mode_events_title" msgid="5597241655883329085">"ഇവന്റുകൾ അനുവദിക്കുക"</string>
     <string name="zen_mode_all_callers" msgid="2378065871253871057">"ആര്‍ക്കും"</string>
     <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"കോണ്‍‌ടാക്റ്റുകള്‍"</string>
     <string name="zen_mode_starred_callers" msgid="1023167821338514140">"നക്ഷത്രചിഹ്നമിട്ട കോൺടാക്‌റ്റുകൾ"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ആവർത്തിച്ച് വിളിക്കുന്നവർ"</string>
-    <!-- no translation found for zen_mode_repeat_callers_title (8553876328249671783) -->
-    <skip />
-    <!-- no translation found for zen_mode_calls_summary_one (3972333792749874863) -->
-    <skip />
+    <string name="zen_mode_repeat_callers_title" msgid="8553876328249671783">"ആവർത്തിച്ച് വിളിക്കുന്നവരെ അനുവദിക്കുക"</string>
+    <string name="zen_mode_calls_summary_one" msgid="3972333792749874863">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> മുതൽ"</string>
     <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g>, <xliff:g id="CALLERT_TPYE">%2$s</xliff:g> എന്നീ വ്യക്തികളിൽ നിന്ന് മാത്രം"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"<xliff:g id="MINUTES">%d</xliff:g> മിനിറ്റ് കാലയളവിനുള്ളിൽ അതേ വ്യക്തി രണ്ടാമത്തെ തവണ വിളിക്കുകയാണെങ്കിൽ"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"ഇഷ്ടാനുസൃതം"</string>
@@ -3790,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"തണുത്ത വർണ്ണ താപനില"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"കൂടുതൽ തണുത്ത ഡിസ്പ്ലേ വർണ്ണങ്ങൾ ഉപയോഗിക്കുക"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"വർണ്ണ മാറ്റം ബാധകമാക്കാൻ, സ്ക്രീൻ ഓഫാക്കുക"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"കണക്റ്റിവിറ്റി മോണിറ്റർ"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"കണക്‌റ്റിവിറ്റി മോണിറ്റർ, ഒരു പ്രശ്‌നം കണ്ടെത്തുമ്പോൾ അതിന്‍റെ ലോഗുകൾ ശേഖരിക്കുകയും ബഗ് ഫയൽ ചെയ്യാൻ ഉപയോക്താവിന് അറിയിയിപ്പ് നൽകുകയും ചെയ്യും"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"കണക്‌റ്റിവിറ്റി മോണിറ്ററിലെ മാറ്റം പ്രാവര്‍ത്തികമാക്കാൻ ഉപകരണം റീബൂട്ട് ചെയ്യുക"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"ക്യാമറ ലേസർ സെൻസർ"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"ഡിഫോൾട്ടായി ലോജിക്കൽ ക്യാമറ"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"സ്വമേധയായുള്ള സിസ്റ്റം അപ്ഡേറ്റുകൾ"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"ഉപകരണം റീസ്‌റ്റാർട്ട് ചെയ്യുമ്പോൾ അപ്‌ഡേറ്റുകൾ ബാധകമാക്കുക"</string>
     <string name="usage" msgid="2977875522080448986">"ഉപയോഗം"</string>
@@ -4103,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"സ്വയം പൂരിപ്പിക്കൽ സേവനം"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"സ്വയമേവ, പൂരിപ്പിക്കൽ, സ്വയമേവ പൂരിപ്പിക്കൽ"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;ഈ ആപ്പിനെ നിങ്ങൾ വിശ്വസിക്കുന്നുണ്ടെന്ന് ഉറപ്പുവരുത്തുക&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; സ്വയമേവ പൂരിപ്പിക്കേണ്ടത് എന്താണെന്ന് നിർണ്ണയിക്കുന്നതിന് നിങ്ങളുടെ സ്‌ക്രീനിൽ ഉള്ളത് ഉപയോഗിക്കുന്നു."</string>
-    <string name="device_theme" msgid="4571803018917608588">"ഉപകരണത്തിന്റെ തീം"</string>
+    <string name="color_theme" msgid="1535685696756738324">"വർണ തീം"</string>
     <string name="default_theme" msgid="7085644992078579076">"ഡിഫോൾട്ട്"</string>
+    <string name="device_theme" msgid="4571803018917608588">"ഉപകരണത്തിന്റെ തീം"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"സ്വമേധയാ (വാൾപേപ്പറിനെ അടിസ്ഥാനമാക്കി)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"ഇളം"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"ഇരുണ്ട"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"നെറ്റ്‌വർക്കിന്‍റെ പേര്"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"സ്‌റ്റാറ്റസ് ബാറിൽ നെറ്റ്‍വര്‍ക്കിന്‍റെ പേര് പ്രദര്‍ശിപ്പിക്കുക"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"സ്റ്റോറേജ് മാനേജര്‍: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4116,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"കാരിയര്‍ പ്രൊവിഷനിംഗ് വിവരം"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"കാരിയർ പ്രൊവിഷനിംഗ് തുടങ്ങുക"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"\'ശല്യപ്പെടുത്തരുത്\' അപ്‌ഡേറ്റ് ചെയ്യുക"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"ഫോക്കസ് ചെയ്‌ത നിലയിൽ തുടരാൻ, അറിയിപ്പുകൾ അദൃശ്യമാക്കുക"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"ഫോക്കസ് ചെയ്‌ത നിലയിൽ തുടരാൻ, അറിയിപ്പുകൾ താൽക്കാലികമായി നിർത്തുക"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"പുതിയതും ആവേശമുണർത്തുന്നതുമായ കാര്യങ്ങൾ എന്തൊക്കെയാണ്?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"നിങ്ങളുടെ പുതിയ ഫോണിനെ അറിയുക‌"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"നിങ്ങളുടെ ‌പുതിയ ‌ടാബ്‌ലെറ്റിനെ അറിയുക‌"</string>
diff --git a/res/values-mn/arrays.xml b/res/values-mn/arrays.xml
index 9bf6e58..a8e0766 100644
--- a/res/values-mn/arrays.xml
+++ b/res/values-mn/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Байнга асаалттай"</item>
     <item msgid="6385301106124765323">"Байнга унтраалттай"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index ec907dd..d33a204 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Таблетдаа ойролцоох Bluetooth төхөөрөмжүүдэд холбогдохыг зөвшөөрөх"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Төхөөрөмждөө ойролцоох Bluetooth төхөөрөмжүүдэд холбогдохыг зөвшөөрөх"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Утсандаа ойролцоох Bluetooth төхөөрөмжүүдэд холбогдохыг зөвшөөрөх"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Bluetooth A2DP техник хангамжийн хурдасгуурыг идэвхгүй болгох"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Төхөөрөмжийг дахин эхлүүлэх үү?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Та энэ тохиргоог өөрчлөхийн тулд төхөөрөмжөө дахин эхлүүлэх шаардлагатай."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Дахин эхлүүлэх"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Цуцлах"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Боломжтой медиа төхөөрөмж"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Боломжтой дуудлагын төхөөрөмж"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Одоогоор холбогдсон"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Холболтын тохируулга"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Өмнө нь холбогдсон төхөөрөмж"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Өмнө нь холбогдсон"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Огноо &amp; цаг"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Цагийн бүсийг сонгоно уу"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Таны оруулсан порт буруу байна."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP проксиг хөтөч ашиглаж байгаа боловч бусад апп-ууд ашиглахгүй байж магадгүй."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL Зурвасын өргөн (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL Зурвасын өргөн (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Үүрэн байршлын мэдээлэл (зогсоосон):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Хөршийн үүрэн мэдээлэл (зогсоосон):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE Сувгийн бодит тохиргоо:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Үүрэн мэдээлэл сэргээх үнэлгээ:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Бүх үүрэн хэмжилтийн мэдээлэл:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Дата холболтын бодит цагийн мэдээлэл:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Дата үйлчилгээ:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Роуминг:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Автомат гэрэлтүүлэг"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Сэрээхийн тулд өргөх"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Идэвхгүй дэлгэц"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Байнга асаалттай / Батарей ашиглалтыг сайжруулсан"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Шинэ мэдэгдэл"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Хэзээ харуулах вэ"</string>
     <string name="doze_title" msgid="2375510714460456687">"Шинэ мэдэгдэл"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Дэлгэцийг мэдэгдэл авсан үедээ сэрээх"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">СИМ-ны ПИН код буруу байна. Танд мобайл оператортойгоо холбогдохгүйгээр төхөөрөмжийн түгжээг тайлахад <xliff:g id="NUMBER_0">%d</xliff:g> оролдлого хийх боломж үлдсэн байна.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"СИМ ПИН ажиллуулах амжилтгүй боллоо!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Таблетын статус"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Утасны статус"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Системийн шинэчлэлтүүд"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Андройд хувилбар"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Дэвсгэрийн хэрэглээг хязгаарлах боломжгүй"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Арын үйл ажиллагааг хязгаарлах уу?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Та арын үйл ажиллагааг аппад хязгаарласан тохиолдолд апп буруу ажиллаж болзошгүй"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Энэ аппыг батарейг оновчлохоор тохируулаагүй тул та үүнийг хязгаарлах боломжгүй.\n\nАппыг хязгаарлахын тулд эхлээд батарейны оновчлолыг асаана уу."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Бүрэн цэнэглэснээс хойшхи дэлгэц ашиглалт"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Дэлгэцийн хэрэглээ"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Мобайл сүлжээний скан"</string>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Яаралтай тусламжийн дуудлагын дохио"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Яаралтай дуудлага хийх үеийн үйлдлийг тохируулах"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Нөөцлөх"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Асаалттай"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Унтраалттай"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Нөөцлөх &amp; сэргээх"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Хувийн өгөгдөл"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Миний өгөгдлийг нөөшлөх"</string>
@@ -2761,6 +2766,12 @@
       <item quantity="one">Сертификат шалгах</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Олон хэрэглэгч"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Хэрэглэгчид &amp; профайлууд"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Хэрэглэгч буюу профайл нэмэх"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Хэрэглэгч нэмэх"</string>
@@ -2943,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"дата ашиглалт"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"сүлжээний цэг"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Холбогдсон төхөөрөмж"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, автомашин жолоодох горим, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, автомашин жолоодох горим"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Апп; мэдэгдэл"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Зөвшөөрөл, өгөгдмөл апп"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Бүртгэл"</string>
@@ -2967,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"эхлүүлэгч, өгөгдмөл, апп"</string>
     <string name="keywords_display" msgid="8910345814565493016">"дэлгэц, мэдрэгчтэй дэлгэц"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"бүдэг гэрэлтэй дэлгэц, мэдрэмтгий дэлгэц, батерей, гэгээлэг"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"бүдэг гэрэлтэй дэлгэц, мэдрэгчтэй дэлгэц, тэжээл"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"бүдэг гэрэлтэй дэлгэц, шөнө, уусгалт, шөнийн ээлж, гэрэлтүүлэг, дэлгэцийн өнгө, өнгө, өнгө"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"дэвсгэр, өөрчлөх, дэлгэцийг өөрчлөх"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"текстийн хэмжээ"</string>
@@ -3008,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"сүлжээ, мобайл сүлжээний төлөв, үйлчилгээний төлөв, дохионы хүч, мобайл сүлжээний төрөл, роуминг, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"серийн дугаар, техник хангамжийн хувилбар"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"андройдын аюулгүй байдлын patch-н түвшин, долгион баригчийн хувилбар, кернел хувилбар"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Орчинтой тохирсон дэлгэц, Түгжигдсэн дэлгэцийн дэлгэц"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"хурууны хээ"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"эргүүлэх, хөнтрөх, эргэлт, босоо, хөндлөн, чиглэл, босоо, хөндлөн"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"дэвшүүлэх, андройд"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"бүү саад бол, хуваарь, мэдэгдэл, блоклох, чимээгүй болгох, чичиргэх, унтах, ажил, төвлөрөх, дуу, дууг хаах, өдөр, ажлын өдөр, амралтын өдөр, энгийн үдэш, арга хэмжээ"</string>
@@ -3092,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Харагдаж буй дохиог зөвшөөрөх"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Бүү саад бол горим асаалттай үед"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Мэдэгдэл"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Мэдэгдлийг чимээгүй харуулах"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Мэдэгдлийг хаах болно"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Мэдэгдлийн дууг хаах"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Та мэдэгдлийг дэлгэцдээ харах болно"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Мэдэгдэл ирэх үед таны утас ямар нэгэн дуу гаргахгүй буюу эсвэл чичрэхгүй."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Мэдэгдлийг нуух"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Та шинэ эсвэл байгаа мэдэгдлийг харахгүй"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Мэдэгдэл харагдахгүй бөгөөд дуугарахгүй"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Та мэдэгдлийг харахгүй бөгөөд сонсохгүй"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Таны утас шинэ эсвэл байгаа мэдэгдлийг харуулахгүй бөгөөд дуу гаргахгүй буюу эсвэл чичрэхгүй. Мэдэгдэл таныг дэлгэцийнхээ дээд хэсгээс доош шудрахад харагдахгүй.\n\nУтасны үйл ажиллагаа болон төлөвийн талаар чухал мэдэгдлүүд харагдсан хэвээр байна гэдгийг санана уу."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Захиалгат"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Захиалгат тохиргоог идэвхжүүлэх"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Захиалгат тохиргоог устгах"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Харагдах болно"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Мэдэгдлийн дууг хаах"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Хэсэгчлэн нуусан"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Нуусан"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Мэдэгдэл харагдахгүй бөгөөд дуугарахгүй"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Захиалгат хязгаарлалт"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Дэлгэц асаалттай үед"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Дэлгэц унтраалттай үед"</string>
@@ -3162,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Дууг хаасан хэдий ч <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> болон <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>-г зөвшөөрдөг"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Зурвас, арга хэмжээ &amp; сануулагч"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Бүү саад бол горим асаалттай үед зурвас, сануулагч, үйл ажиллагааны дууг таны зөвшөөрснөөс бусад зүйлд хаах болно. Та найз нөхөд, гэр бүлийнхэн эсвэл бусад харилцагчдаа тантай холбоо барихыг зөвшөөрөхийн тулд зурвасын тохиргоог өөрчлөх боломжтой."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Дууссан"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Тохиргоо"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Мэдэгдэл харагдахгүй бөгөөд дуугарахгүй"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Мэдэгдлийн дуу алга"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Та мэдэгдэл харахгүй эсвэл сонгохгүй. Одоор тэмдэглэсэн харилцагч болон дахин дуудлага хийгчийн дуудлагыг зөвшөөрдөг."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Одоогийн тохиргоо)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Бүү саад бол горимын мэдэгдлийн тохиргоог өөрчлөх үү?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Ажлын профайлын дуу"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Хувийн профайлын дууг ашиглах"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Ажлын болон хувийн профайлын дуу ижил"</string>
@@ -3344,10 +3348,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Дуудлагыг зөвшөөрөх"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Бүү саад бол горим асаалттай үед ирсэн дуудлагыг блоклох болно. Та найз нөхөд, гэр бүлийнхэн эсвэл бусад харилцагчдаа тантай холбоо барихыг зөвшөөрөхийн тулд тохиргоогоо өөрчлөх боломжтой."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Одоор тэмдэглэсэн харилцагчид"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">болон бусад <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="one">болон бусад 1</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Зурвасууд"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Зурвасыг зөвшөөрөх"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Зурвас"</string>
@@ -3777,10 +3778,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Хүйтэн өнгөний температур"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Илүү хүйтэн дэлгэцийн өнгө ашиглах"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Өнгөний өөрчлөлтийг оруулахын тулд дэлгэцийг унтраана уу"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Холболтын хяналт"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor холболтын асуудал илэрсэн үед нэвтрэлтийг цуглуулж хэрэглэгчид алдааг засах мэдэгдэл илгээнэ"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Холболтын хяналтын өөрчлөлтийг хэрэгжүүлэх бол төхөөрөмжийг дахин асаана уу"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Камерын лазер мэдрэгч"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Логик камерыг өгөгдмөл болгох"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Системийн автомат шинэчлэлтүүд"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Төхөөрөмжийг дахин эхлүүлэх үед шинэчлэлтийг хэрэгжүүлэх"</string>
     <string name="usage" msgid="2977875522080448986">"Хэрэглээ"</string>
@@ -4090,8 +4089,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Автоматаар бөглөх үйлчилгээ"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"авто, бөглөх, автоматаар бөглөх"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Энэ апп-д итгэдэг эсэхээ шалгана уу&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google автоматаар бөглөх&gt;%1$s&lt;/xliff:g&gt; таны дэлгэцэд автоматаар бөглөх зүйлийг илрүүлэхийн тулд ашигладаг."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Төхөөрөмжийн загвар"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Өнгөний загвар"</string>
     <string name="default_theme" msgid="7085644992078579076">"Өгөгдмөл"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Төхөөрөмжийн загвар"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Автомат (ханын зурганд үндэслэн)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Цайвар"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Бараан"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Сүлжээний нэр"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Сүлжээний нэрийг статус самбарт харуулах"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Сангийн менежер: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4103,7 +4106,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Оператор компанийн хангалтын мэдээлэл"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Оператор компанийн хангалтыг асаах"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Бүү саад бол горимыг шинэчлэх"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Төвлөрсөн хэвээр байхын тулд мэдэгдлийг нуух"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Төвлөрсөн хэвэрэ байхын тулд мэдэгдлийг түр зогсоох"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Шинэ соргог зүйл юу байна?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Шинэ утастай танилцах"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Шинэ таблеттай танилцах"</string>
diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml
index 54f8165..cee98e0 100644
--- a/res/values-mr/arrays.xml
+++ b/res/values-mr/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -290,8 +296,8 @@
     <item msgid="5895843015407713543">"शरीर सेन्सर"</item>
     <item msgid="1436446526955010826">"सेल ब्रॉडकास्ट वाचा"</item>
     <item msgid="884172201575690484">"बनावट स्थान"</item>
-    <item msgid="3591971310048485247">"वाचण्‍याचा संचय"</item>
-    <item msgid="4041187808621866119">"लिहिण्‍याचा संचय"</item>
+    <item msgid="3591971310048485247">"वाचण्‍याचा स्टोरेज"</item>
+    <item msgid="4041187808621866119">"लिहिण्‍याचा स्टोरेज"</item>
     <item msgid="6628873315024166197">"स्क्रीन चालू करा"</item>
     <item msgid="3253368931113490863">"खाती मिळवा"</item>
     <item msgid="780392378084812901">"पार्श्वभूमीमध्ये चालवा"</item>
@@ -357,8 +363,8 @@
     <item msgid="7864822459293570891">"शरीर सेन्सर"</item>
     <item msgid="6798698496904810960">"सेल ब्रॉडकास्ट वाचा"</item>
     <item msgid="5242052845700875820">"बनावट स्थान"</item>
-    <item msgid="1246296877820358565">"वाचण्‍याचा संचय"</item>
-    <item msgid="2404067308793740341">"लिहिण्‍याचा संचय"</item>
+    <item msgid="1246296877820358565">"वाचण्‍याचा स्टोरेज"</item>
+    <item msgid="2404067308793740341">"लिहिण्‍याचा स्टोरेज"</item>
     <item msgid="5832543806893763620">"स्क्रीन चालू करा"</item>
     <item msgid="5258373962467495905">"खाती मिळवा"</item>
     <item msgid="334625385979270703">"पार्श्वभूमीमध्ये चालवा"</item>
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"नेहमी चालू"</item>
     <item msgid="6385301106124765323">"नेहमी बंद"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 9950aef..e044b40 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -136,22 +136,22 @@
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटूथ बंद करू इच्छितो"</string>
     <string name="bluetooth_ask_enablement_no_name" msgid="1644353686104482763">"अॅप ब्लूटूथ चालू करु इच्छित आहे"</string>
     <string name="bluetooth_ask_disablement_no_name" msgid="9218830122674868548">"अॅप ब्लूटूथ बंद करू इच्छितो"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4791779658660357386">"<xliff:g id="APP_NAME">%1$s</xliff:g> आपला टॅबलेट अन्य ब्लूटूथ डीव्हाइससाठी <xliff:g id="TIMEOUT">%2$d</xliff:g> सेकंदांसाठी दृश्यमान करू इच्छितो."</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="1308225382575535366">"<xliff:g id="APP_NAME">%1$s</xliff:g> आपला फोन अन्य ब्लूटूथ डीव्हाइससाठी <xliff:g id="TIMEOUT">%2$d</xliff:g> सेकंदांसाठी दृश्यमान करू इच्छितो."</string>
-    <string name="bluetooth_ask_discovery_no_name" product="tablet" msgid="225715443477752935">"अॅप आपला टॅबलेट अन्य ब्लूटूथ डीव्हाइससाठी <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंदांसाठी दृश्यमान करू इच्छितो."</string>
-    <string name="bluetooth_ask_discovery_no_name" product="default" msgid="4949152735544109994">"अॅप आपला फोन अन्य ब्लूटूथ डीव्हाइससाठी <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंदांसाठी दृश्यमान करू इच्छितो."</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8528329166577187961">"<xliff:g id="APP_NAME">%1$s</xliff:g> आपला टॅबलेट इतर ब्लूटूथ डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="4398738575307583138">"<xliff:g id="APP_NAME">%1$s</xliff:g> आपला फोन इतर ब्लूटूथ डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
-    <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="1702590641426207062">"अॅप आपला टॅबलेट इतर ब्लूटूथ डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
-    <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="8549952177383992238">"अॅप आपला फोन इतर ब्लूटूथ डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="1141843490422565755">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटूथ चालू करू इच्छितो आणि <xliff:g id="TIMEOUT">%2$d</xliff:g> सेकंदांसाठी आपला टॅबलेट अन्य डीव्हाइससाठी दृश्‍यमान करू इच्छितो."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="5195836980079191473">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटूथ चालू करू इच्छितो आणि <xliff:g id="TIMEOUT">%2$d</xliff:g> सेकंदांसाठी आपला फोन अन्य डीव्हाइससाठी दृश्‍यमान करू इच्छितो."</string>
-    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="7009338445281693765">"अॅप ब्लूटूथ चालू करु इच्छित आहे आणि इतर डीव्हाइससाठी <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंदांकरिता आपला टॅबलेट दृश्यमान बनवू इच्छित आहे."</string>
-    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default" msgid="8386904242279878734">"अॅप ब्लूटूथ चालू करु इच्छित आहे आणि इतर डीव्हाइससाठी <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंदांकरिता आपला फोन दृश्यमान बनवू इच्छित आहे."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="2279471426575892686">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटूथ चालू करु इच्छित आहे आणि आपला टॅबलेट इतर डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6961969825475461450">"<xliff:g id="APP_NAME">%1$s</xliff:g> अॅप ब्लूटूथ चालू करु इच्छित आहे आणि आपला फोन इतर डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="692477613671555006">"अॅप ब्लूटूथ चालू करु इच्छित आहे आणि आपला टॅबलेट इतर डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"अॅप ब्लूटूथ चालू करु इच्छित आहे आणि आपला फोन इतर डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="4791779658660357386">"<xliff:g id="APP_NAME">%1$s</xliff:g> तुमचा टॅबलेट अन्य ब्लूटूथ डीव्हाइससाठी <xliff:g id="TIMEOUT">%2$d</xliff:g> सेकंदांसाठी दृश्यमान करू इच्छितो."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="1308225382575535366">"<xliff:g id="APP_NAME">%1$s</xliff:g> तुमचा फोन अन्य ब्लूटूथ डीव्हाइससाठी <xliff:g id="TIMEOUT">%2$d</xliff:g> सेकंदांसाठी दृश्यमान करू इच्छितो."</string>
+    <string name="bluetooth_ask_discovery_no_name" product="tablet" msgid="225715443477752935">"अॅप तुमचा टॅबलेट अन्य ब्लूटूथ डीव्हाइससाठी <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंदांसाठी दृश्यमान करू इच्छितो."</string>
+    <string name="bluetooth_ask_discovery_no_name" product="default" msgid="4949152735544109994">"अॅप तुमचा फोन अन्य ब्लूटूथ डीव्हाइससाठी <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंदांसाठी दृश्यमान करू इच्छितो."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8528329166577187961">"<xliff:g id="APP_NAME">%1$s</xliff:g> तुमचा टॅबलेट इतर ब्लूटूथ डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="4398738575307583138">"<xliff:g id="APP_NAME">%1$s</xliff:g> तुमचा फोन इतर ब्लूटूथ डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
+    <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="1702590641426207062">"अॅप तुमचा टॅबलेट इतर ब्लूटूथ डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
+    <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="8549952177383992238">"अॅप तुमचा फोन इतर ब्लूटूथ डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="1141843490422565755">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटूथ चालू करू इच्छितो आणि <xliff:g id="TIMEOUT">%2$d</xliff:g> सेकंदांसाठी तुमचा टॅबलेट अन्य डीव्हाइससाठी दृश्‍यमान करू इच्छितो."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="5195836980079191473">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटूथ चालू करू इच्छितो आणि <xliff:g id="TIMEOUT">%2$d</xliff:g> सेकंदांसाठी तुमचा फोन अन्य डीव्हाइससाठी दृश्‍यमान करू इच्छितो."</string>
+    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="7009338445281693765">"अॅप ब्लूटूथ चालू करु इच्छित आहे आणि इतर डीव्हाइससाठी <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंदांकरिता तुमचा टॅबलेट दृश्यमान बनवू इच्छित आहे."</string>
+    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default" msgid="8386904242279878734">"अॅप ब्लूटूथ चालू करु इच्छित आहे आणि इतर डीव्हाइससाठी <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंदांकरिता तुमचा फोन दृश्यमान बनवू इच्छित आहे."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="2279471426575892686">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटूथ चालू करु इच्छित आहे आणि तुमचा टॅबलेट इतर डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6961969825475461450">"<xliff:g id="APP_NAME">%1$s</xliff:g> अॅप ब्लूटूथ चालू करु इच्छित आहे आणि तुमचा फोन इतर डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="692477613671555006">"अॅप ब्लूटूथ चालू करु इच्छित आहे आणि तुमचा टॅबलेट इतर डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"अॅप ब्लूटूथ चालू करु इच्छित आहे आणि तुमचा फोन इतर डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"ब्लूटूथ चालू करत आहे…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"ब्लूटूथ बंद करत आहे…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"स्वयं-कनेक्ट"</string>
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"तुमच्या टॅबलेटला जवळपासच्या ब्लूटूथ डिव्हाइसशी संवाद साधण्याची अनुमती द्या"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"तुमच्या डिव्हाइसला जवळपासच्या ब्लूटूथ डिव्हाइससह संवाद साधण्याची अनुमती द्या"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"तुमच्या फोनला जवळपासच्या ब्लूटूथ डिव्हाइसशी संवाद साधण्याची अनुमती द्या"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"ब्लूटूथ A2DP हार्डवेअर ऑफलोड बंद करा"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"डिव्हाइस रीस्टार्ट करायचे?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"हे सेटिंग बदलण्यासाठी तुम्ही तुमचे डिव्हाइस रीस्टार्ट करणे आवश्यक आहे."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"रीस्टार्ट"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"रद्द करा"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"उपलब्ध मीडिया डिव्हाइस"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"उपलब्ध कॉल डिव्हाइस"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"सध्या कनेक्ट केले आहे"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"कनेक्शन प्राधान्ये"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"याआधी कनेक्ट केलेली डिव्हाइस"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"याआधी कनेक्ट केलेले"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"तारीख आणि वेळ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"टाइम झोन निवडा"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"तुम्ही टाइप केलेला पोर्ट वैध नाही."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"ब्राउझरद्वारे HTTP प्रॉक्सी वापरले जाते परंतु अन्य अॅप्सद्वारे कदाचित वापरले जाणार नाही."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL बँडविड्थ (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL बँडविड्थ (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"सेल स्थान माहिती (बहिष्कृत):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"शेजारील सेल माहिती (बहिष्कृत):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE फिजिकल चॅनेल कॉन्फिगरेशन:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"सेल माहिती रिफ्रेश रेट:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"सर्व सेल परिमाण माहिती:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"डेटा कनेक्शन रीअल-टाइम माहिती:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"डेटा सेवा:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"रोमिंग:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -397,7 +405,7 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"फिंगरप्रिंटने अनलॉक करा"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"तुमचे फिंगरप्रिंट वापरा"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"आपला फोन अनलॉक करण्यासाठी, खरेदी अधिकृत करण्‍यासाठी किंवा अॅप्समध्ये साइन इन करण्‍यासाठी फक्त फिंगरप्रिंट सेन्सरला स्पर्श करा. तुम्ही ज्यांचे फिंगरप्रिंट जोडता त्याविषयी सावधगिरी बाळगा. जोडलेला एक प्रिंट देखील यापैकी कोणतीही गोष्ट करू शकतो. \n\n टीप: तुमचे फिंगरप्रिंट क्लिष्ट पॅटर्न किंवा पिन पेक्षा कमी सुरक्षित असू शकतात."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"तुमचा फोन अनलॉक करण्यासाठी, खरेदी अधिकृत करण्‍यासाठी किंवा अॅप्समध्ये साइन इन करण्‍यासाठी फक्त फिंगरप्रिंट सेन्सरला स्पर्श करा. तुम्ही ज्यांचे फिंगरप्रिंट जोडता त्याविषयी सावधगिरी बाळगा. जोडलेला एक प्रिंट देखील यापैकी कोणतीही गोष्ट करू शकतो. \n\n टीप: तुमचे फिंगरप्रिंट क्लिष्ट पॅटर्न किंवा पिन पेक्षा कमी सुरक्षित असू शकतात."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"फोन अनलॉक करण्यासाठी किंवा खरेदींना मंजूरी देण्यासाठी तुमचे फिंगरप्रिंट वापरा.\n\nटीप: तुम्ही हे डिव्हाइस अनलॉक करण्यासाठी तुम्‍ही तुमचे फिंगरप्रिंट वापरू शकत नाही. अधिक माहितीसाठी संस्थेच्या प्रशासकाशी संपर्क साधा."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"फोन अनलॉक करण्यासाठी किंवा खरेदीला मंजुरी देण्यासाठी तुमचे फिंगरप्रिंट वापरा.\n\nटीप: सक्षम पॅटर्न किंवा पिनच्या तुलनेत तुमचे फिंगरप्रिंट ही कमी सुरक्षित असू शकते."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"रद्द करा"</string>
@@ -429,7 +437,7 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8970048776120548976">"तुम्हाला हा आयकन दिसल्यावर, ओळख पडताळणीसाठी किंवा खरेदी मंजूर करण्यासाठी तुमचे फिंगरप्रिंट वापरा"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"हे नंतर करा"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"फिंगरप्रिंट सेटअप वगळायचे?"</string>
-    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"तुम्ही आपला फोन अनलॉक करण्याची एक पद्धत म्हणून तुम्ही तुमचे फिंगरप्रिंट वापरणे निवडले. आता तुम्ही वगळल्यास, आपल्याला हे नंतर सेट करण्याची आवश्यकता असेल. सेटअपला केवळ एक मिनिट लागेल."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"तुम्ही तुमचा फोन अनलॉक करण्याची एक पद्धत म्हणून तुम्ही तुमचे फिंगरप्रिंट वापरणे निवडले. आता तुम्ही वगळल्यास, आपल्याला हे नंतर सेट करण्याची आवश्यकता असेल. सेटअपला केवळ एक मिनिट लागेल."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"स्क्रीन लॉक सेट करा"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"पूर्ण झाले"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"अरेरे, तो सेन्सर नाही"</string>
@@ -439,7 +447,7 @@
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"फिंगरप्रिंट नोंदणीने कार्य केले नाही. पुन्हा प्रयत्न करा किंवा भिन्न बोट वापरून पहा."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"आणखी एक जोडा"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"पुढील"</string>
-    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"आपला फोन अनलॉक करण्‍याव्यतिरिक्त, तुम्ही आपल्या फिंगरप्रिंटचा वापर खरेदी आणि अ‍ॅप प्रवेश प्रमाणित करण्‍यासाठी देखील करू शकता. "<annotation id="url">"अधिक जाणून घ्‍या"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"तुमचा फोन अनलॉक करण्‍याव्यतिरिक्त, तुम्ही आपल्या फिंगरप्रिंटचा वापर खरेदी आणि अ‍ॅप प्रवेश प्रमाणित करण्‍यासाठी देखील करू शकता. "<annotation id="url">"अधिक जाणून घ्‍या"</annotation></string>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" स्क्रीन लॉक पर्याय अक्षम केला आहे. अधिक जाणून घेण्यासाठी, आपल्या संस्थेच्या प्रशासकाशी संपर्क साधा. "<annotation id="admin_details">"अधिक तपशील"</annotation>\n\n"आपण अजूनही खरेद्या आणि अ‍ॅप प्रवेश अधिकृत करण्यासाठी तुमचे फिंगरप्रिंट वापरू शकता. "<annotation id="url">"अधिक जाणून घ्या"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"बोट उचला, नंतर पुन्हा सेन्सरला स्पर्श करा"</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"तुम्ही <xliff:g id="COUNT">%d</xliff:g> पर्यंत फिंगरप्रिंट जोडू शकता"</string>
@@ -448,7 +456,7 @@
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"सर्व फिंगरप्रिंट काढायचे?"</string>
     <string name="fingerprint_delete_title" msgid="1368196182612202898">"\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' काढा"</string>
     <string name="fingerprint_delete_message" msgid="8597787803567398131">"तुम्हाला ही फिंगरप्रिंट हटवायची आहे का?"</string>
-    <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"तुम्ही तुमचे फिंगरप्रिंट आपला फोन अनलॉक करण्‍यासाठी, खरेद्या प्रमाणित करण्‍यासाठी किंवा त्यांच्यासह अॅप्समध्‍ये साइन इन करण्‍यासाठी वापरू शकणार नाही"</string>
+    <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"तुम्ही तुमचे फिंगरप्रिंट तुमचा फोन अनलॉक करण्‍यासाठी, खरेद्या प्रमाणित करण्‍यासाठी किंवा त्यांच्यासह अॅप्समध्‍ये साइन इन करण्‍यासाठी वापरू शकणार नाही"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"तुम्ही तुमचे फिंगरप्रिंट तुमचे कार्य प्रोफाइल अनलॉक करण्‍यासाठी, खरेद्या प्रमाणित करण्‍यासाठी किंवा कार्य अॅप्समध्‍ये साइन इन करण्‍यासाठी वापरू शकणार नाही"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"होय, काढा"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"सुरु ठेवण्‍यासाठी आपल्‍या फिंगरप्रिंटचा वापर करा."</string>
@@ -456,32 +464,32 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"टॅबलेट एंक्रिप्ट करा"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"फोन एंक्रिप्ट करा"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"एंक्रिप्ट केले"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"तुम्ही तुमची खाती, सेटिंग्ज, डाउनलोड केलेले अ‍ॅप्स आणि त्यांचा डेटा, मीडिया आणि इतर फायली एंक्रिप्ट करू शकता. तुम्ही आपला टॅब्लेट एंक्रिप्ट केल्यानंतर, तुम्ही स्क्रीन लॉक (म्हणजे, एक पॅटर्न किंवा अंकीय पिन किंवा पासवर्ड) सेट केला आहे हे गृहित धरून, प्रत्येकवेळी तुम्ही टॅब्लेट चालू करता तेव्हा त्याचे एंक्रिप्ट करण्‍यासाठी आपल्‍याला स्क्रीन अनलॉक करण्‍याची आवश्यकता असेल. एंक्रिप्ट करण्‍याचा अन्य एकमेव मार्ग आपला सर्व डेटा मिटवून, फॅक्‍टरी डेटा रीसेट करणे हा होय.\n\nएंक्रिप्शनला एक तास किंवा अधिक वेळ लागू शकतो. तुम्ही संपूर्ण प्रक्रियेत चार्ज केलेल्या बॅटरीसह प्रारंभ करणे आणि आपला टॅब्लेट प्लग इन केलेला ठेवणे आवश्यक आहे. तुम्ही त्यात व्यत्यय आणल्यास, तुम्ही आपला काही किंवा सर्व डेटा गमवाल."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"तुम्ही तुमची खाती, सेटिंग्ज, डाउनलोड केलेली अ‍ॅप्स आणि त्यांचा डेटा, मीडिया आणि इतर फायली एंक्रिप्ट करू शकता. तुम्ही आपला फोन एंक्रिप्ट केल्यानंतर, तुम्ही स्क्रीन लॉक (म्हणजे, एक पॅटर्न किंवा अंकीय पिन किंवा पासवर्ड) सेट केला आहे हे गृहित धरून, प्रत्येकवेळी तुम्ही फोन चालू करता तेव्हा त्याचे एंक्रिप्ट करण्‍यासाठी आपल्‍याला स्क्रीन अनलॉक करण्‍याची आवश्यकता असेल. एंक्रिप्ट करण्‍याचा अन्य एकमेव मार्ग आपला सर्व डेटा मिटवून, फॅक्‍टरी डेटा रीसेट करणे हा होय.\n\nएंक्रिप्टीकरणास एक तास किंवा अधिक वेळ लागू शकतो. तुम्ही संपूर्ण प्रक्रियेत चार्ज केलेल्या बॅटरीसह प्रारंभ करणे आणि आपला फोन प्लग इन केलेला ठेवणे आवश्यक आहे. तुम्ही त्यात व्यत्यय आणल्यास, तुम्ही आपला काही किंवा सर्व डेटा गमवाल."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"तुम्ही तुमची खाती, सेटिंग्ज, डाउनलोड केलेले अ‍ॅप्स आणि त्यांचा डेटा, मीडिया आणि इतर फायली एंक्रिप्ट करू शकता. तुम्ही तुमचा टॅब्लेट एंक्रिप्ट केल्यानंतर, तुम्ही स्क्रीन लॉक (म्हणजे, एक पॅटर्न किंवा अंकीय पिन किंवा पासवर्ड) सेट केला आहे हे गृहित धरून, प्रत्येकवेळी तुम्ही टॅब्लेट चालू करता तेव्हा त्याचे एंक्रिप्ट करण्‍यासाठी आपल्‍याला स्क्रीन अनलॉक करण्‍याची आवश्यकता असेल. एंक्रिप्ट करण्‍याचा अन्य एकमेव मार्ग तुमचा सर्व डेटा मिटवून, फॅक्‍टरी डेटा रीसेट करणे हा होय.\n\nएंक्रिप्शनला एक तास किंवा अधिक वेळ लागू शकतो. तुम्ही संपूर्ण प्रक्रियेत चार्ज केलेल्या बॅटरीसह प्रारंभ करणे आणि तुमचा टॅब्लेट प्लग इन केलेला ठेवणे आवश्यक आहे. तुम्ही त्यात व्यत्यय आणल्यास, तुम्ही तुमचा काही किंवा सर्व डेटा गमवाल."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"तुम्ही तुमची खाती, सेटिंग्ज, डाउनलोड केलेली अ‍ॅप्स आणि त्यांचा डेटा, मीडिया आणि इतर फायली एंक्रिप्ट करू शकता. तुम्ही तुमचा फोन एंक्रिप्ट केल्यानंतर, तुम्ही स्क्रीन लॉक (म्हणजे, एक पॅटर्न किंवा अंकीय पिन किंवा पासवर्ड) सेट केला आहे हे गृहित धरून, प्रत्येकवेळी तुम्ही फोन चालू करता तेव्हा त्याचे एंक्रिप्ट करण्‍यासाठी आपल्‍याला स्क्रीन अनलॉक करण्‍याची आवश्यकता असेल. एंक्रिप्ट करण्‍याचा अन्य एकमेव मार्ग तुमचा सर्व डेटा मिटवून, फॅक्‍टरी डेटा रीसेट करणे हा होय.\n\nएंक्रिप्टीकरणास एक तास किंवा अधिक वेळ लागू शकतो. तुम्ही संपूर्ण प्रक्रियेत चार्ज केलेल्या बॅटरीसह प्रारंभ करणे आणि तुमचा फोन प्लग इन केलेला ठेवणे आवश्यक आहे. तुम्ही त्यात व्यत्यय आणल्यास, तुम्ही तुमचा काही किंवा सर्व डेटा गमवाल."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"टॅबलेट एंक्रिप्ट करा"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"फोन एंक्रिप्ट करा"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"आपली बॅटरी चार्ज करा आणि पुन्हा प्रयत्न करा."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"आपला चार्जर प्लग इन करा आणि पुन्हा प्रयत्न करा."</string>
+    <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"तुमची बॅटरी चार्ज करा आणि पुन्हा प्रयत्न करा."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"तुमचा चार्जर प्लग इन करा आणि पुन्हा प्रयत्न करा."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"कोणताही लॉक स्क्रीन पिन किंवा पासवर्ड नाही"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"तुम्ही एनक्रिप्शन सुरु करण्यापूर्वी आपल्याला एक लॉक स्क्रीन पिन ‍किंवा पासवर्ड सेट करण्याची आवश्यकता आहे."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"एंक्रिप्ट करायचे?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"एंक्रिप्शन कार्य परत न करता येणारे आहे आणि तुम्ही त्यात व्यत्यय आणल्यास, आपला डेटा गमावेल. एंक्रिप्शनला एखादा तास किंवा जास्त वेळ लागतो, यादरम्यान टॅबलेट कित्येक वेळा रीस्टार्ट होईल."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"एंक्रिप्शन कार्य परत न करता येणारे आहे आणि तुम्ही त्यात व्यत्यय आणल्यास, आपला डेटा गमावेल. एंक्रिप्शनला एखादा तास किंवा जास्त वेळ लागतो, यादरम्यान फोन कित्येक वेळा रीस्टार्ट होईल."</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"एंक्रिप्शन कार्य परत न करता येणारे आहे आणि तुम्ही त्यात व्यत्यय आणल्यास, तुमचा डेटा गमावेल. एंक्रिप्शनला एखादा तास किंवा जास्त वेळ लागतो, यादरम्यान टॅबलेट कित्येक वेळा रीस्टार्ट होईल."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"एंक्रिप्शन कार्य परत न करता येणारे आहे आणि तुम्ही त्यात व्यत्यय आणल्यास, तुमचा डेटा गमावेल. एंक्रिप्शनला एखादा तास किंवा जास्त वेळ लागतो, यादरम्यान फोन कित्येक वेळा रीस्टार्ट होईल."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"एंक्रिप्ट करत आहे"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"आपला टॅब्लेट एंक्रिप्ट केला जात असताना प्रतीक्षा करा. <xliff:g id="PERCENT">^1</xliff:g>% पूर्ण."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"आपला फोन एंक्रिप्ट केला जात असताना प्रतीक्षा करा. <xliff:g id="PERCENT">^1</xliff:g>% पूर्ण."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"आपला टॅब्लेट एंक्रिप्ट केला जात असताना प्रतीक्षा करा. शिल्लक वेळ: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"आपला फोन एंक्रिप्ट केला जात असताना प्रतीक्षा करा. शिल्लक वेळ: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"आपला टॅबलेट अनलॉक करण्‍यासाठी, तो बंद करा आणि नंतर चालू करा."</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"आपला फोन अनलॉक करण्‍यासाठी, तो बंद करा आणि नंतर चालू करा."</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"तुमचा टॅब्लेट एंक्रिप्ट केला जात असताना प्रतीक्षा करा. <xliff:g id="PERCENT">^1</xliff:g>% पूर्ण."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"तुमचा फोन एंक्रिप्ट केला जात असताना प्रतीक्षा करा. <xliff:g id="PERCENT">^1</xliff:g>% पूर्ण."</string>
+    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"तुमचा टॅब्लेट एंक्रिप्ट केला जात असताना प्रतीक्षा करा. शिल्लक वेळ: <xliff:g id="DURATION">^1</xliff:g>"</string>
+    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"तुमचा फोन एंक्रिप्ट केला जात असताना प्रतीक्षा करा. शिल्लक वेळ: <xliff:g id="DURATION">^1</xliff:g>"</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"तुमचा टॅबलेट अनलॉक करण्‍यासाठी, तो बंद करा आणि नंतर चालू करा."</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"तुमचा फोन अनलॉक करण्‍यासाठी, तो बंद करा आणि नंतर चालू करा."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"चेतावणी: अनलॉक करण्‍याच्या आणखी <xliff:g id="COUNT">^1</xliff:g> अयशस्‍वी प्रयत्नांनंतर तुमचे डिव्हाइस पुसले जाईल."</string>
-    <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"आपला पासवर्ड टाइप करा"</string>
+    <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"तुमचा पासवर्ड टाइप करा"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"एंक्रिप्शन अयशस्वी"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"कूटबद्धीकरणात व्यत्यय आला आणि हे पूर्ण होऊ शकत नाही. परिणामस्वरूप, आपल्या टॅबलेटवरील डेटा यापुढे प्रवेशयोग्य राहणार नाही. \n\n आपला टॅबलेट वापरून पुन्हा सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करण्याची आवश्यकता आहे. रीसेट केल्यानंतर तुम्ही आपला टॅबलेट सेट करता, तेव्हा आपल्याकडे आपल्या Google खात्यावर बॅकअप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"कूटबद्धीकरणात व्यत्यय आला आणि पूर्ण होऊ शकत नाही. परिणामस्वरूप, आपल्या फोनवरील डेटा यापुढे प्रवेशयोग्य नाही.\n\nआपला फोन वापरणे पुन्हा सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करण्याची आवश्यकता आहे. रीसेट केल्यानंतर जेव्हा तुम्ही आपला फोन सेट करता, तेव्हा आपल्याकडे आपल्या Google खात्यावर बॅकअप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"कूटबद्धीकरणात व्यत्यय आला आणि हे पूर्ण होऊ शकत नाही. परिणामस्वरूप, आपल्या टॅबलेटवरील डेटा यापुढे प्रवेशयोग्य राहणार नाही. \n\n तुमचा टॅबलेट वापरून पुन्हा सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करण्याची आवश्यकता आहे. रीसेट केल्यानंतर तुम्ही तुमचा टॅबलेट सेट करता, तेव्हा आपल्याकडे आपल्या Google खात्यावर बॅकअप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"कूटबद्धीकरणात व्यत्यय आला आणि पूर्ण होऊ शकत नाही. परिणामस्वरूप, आपल्या फोनवरील डेटा यापुढे प्रवेशयोग्य नाही.\n\nतुमचा फोन वापरणे पुन्हा सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करण्याची आवश्यकता आहे. रीसेट केल्यानंतर जेव्हा तुम्ही तुमचा फोन सेट करता, तेव्हा आपल्याकडे आपल्या Google खात्यावर बॅकअप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"विकूटन अयशस्वी"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"तुम्ही एंटर केलेला पासवर्ड चुकीचा आहे, परंतु दुर्दैवाने आपला डेटा दूषित आहे. \n\nआपला टॅबलेट वापरणे पुनः सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करणे आवश्यक आहे. रीसेट केल्यानंतर तुम्ही आपला टॅबलेट सेट करता, तेव्हा आपल्याला आपल्या Google खात्यावर बॅक अप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"तुम्ही एंटर केलेला पासवर्ड बरोबर आहे, परंतु दुर्दैवाने आपला डेटा दूषित आहे. \n\nआपला फोन वापरणे पुनः सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करणे आवश्यक आहे. रीसेट केल्यानंतर तुम्ही आपला फोन सेट करता, तेव्हा आपल्याला आपल्या Google खात्यावर बॅक अप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"तुम्ही एंटर केलेला पासवर्ड चुकीचा आहे, परंतु दुर्दैवाने तुमचा डेटा दूषित आहे. \n\nतुमचा टॅबलेट वापरणे पुनः सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करणे आवश्यक आहे. रीसेट केल्यानंतर तुम्ही तुमचा टॅबलेट सेट करता, तेव्हा आपल्याला आपल्या Google खात्यावर बॅक अप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"तुम्ही एंटर केलेला पासवर्ड बरोबर आहे, परंतु दुर्दैवाने तुमचा डेटा दूषित आहे. \n\nतुमचा फोन वापरणे पुनः सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करणे आवश्यक आहे. रीसेट केल्यानंतर तुम्ही तुमचा फोन सेट करता, तेव्हा आपल्याला आपल्या Google खात्यावर बॅक अप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"इनपुट पद्धत स्विच करा"</string>
     <string name="suggested_lock_settings_title" msgid="8498743819223200961">"तुमचा फोन सुरक्षित ठेवा"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="2296800316150748710">"टॅबलेटचे संरक्षण करण्‍यासाठी स्‍क्रीन लॉक सेट करा"</string>
@@ -493,14 +501,14 @@
     <string name="suggested_fingerprint_lock_settings_summary" product="default" msgid="5738274583658668124"></string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"स्क्रीन लॉक निवडा"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"कार्य लॉक निवडा"</string>
-    <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"आपला टॅबलेट संरक्षित करा"</string>
+    <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"तुमचा टॅबलेट संरक्षित करा"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"तुमचे डिव्हाइस संरक्षित करा"</string>
-    <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"आपला फोन संरक्षित करा"</string>
+    <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"तुमचा फोन संरक्षित करा"</string>
     <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5008939545428518367">"अतिरिक्त सुरक्षिततेसाठी, बॅकअप स्क्रीन लॉक सेट करा"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"डिव्हाइस संरक्षण वैशिष्ट्ये अॅक्टिव्हेट करून तुमच्या परवानगीशिवाय हा टॅब्लेट वापरण्यापासून इतरांना प्रतिबंधित करा. तुम्ही वापरू इच्छित असलेले स्क्रीन लॉक निवडा."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"डिव्हाइस संरक्षण वैशिष्ट्ये अॅक्टिव्हेट करून तुमच्या परवानगीशिवाय हे डिव्हाइस वापरण्यापासून इतरांना प्रतिबंधित करा. तुम्ही वापरू इच्छित असलेले स्क्रीन लॉक निवडा."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"डिव्हाइस संरक्षण वैशिष्ट्ये अॅक्टिव्हेट करून तुमच्या परवानगीशिवाय हा फोन वापरण्यापासून इतरांना प्रतिबंधित करा. तुम्ही वापरू इच्छित असलेले स्क्रीन लॉक निवडा."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"आपली बॅक अप स्क्रीन लॉक पद्धत निवडा"</string>
+    <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"तुमची बॅक अप स्क्रीन लॉक पद्धत निवडा"</string>
     <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"स्क्रीन लॉक पर्याय"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"स्क्रीन लॉक पर्याय"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"स्क्रीन लॉक"</string>
@@ -526,7 +534,7 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"फिंगरप्रिंट + पिन"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"फिंगरप्रिंट + पासवर्ड"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="1441077909803666681">"फिंगरप्रिंट न वापरता सुरु ठेवा"</string>
-    <string name="fingerprint_unlock_title" msgid="2826226740306003991">"तुम्ही आपल्या फिंगरप्रिंटचा वापर करून आपला फोन अनलॉक करू शकता. सुरक्षिततेसाठी, या पर्यायाकरिता एक बॅक अप स्क्रीन लॉक आवश्यक आहे."</string>
+    <string name="fingerprint_unlock_title" msgid="2826226740306003991">"तुम्ही आपल्या फिंगरप्रिंटचा वापर करून तुमचा फोन अनलॉक करू शकता. सुरक्षिततेसाठी, या पर्यायाकरिता एक बॅक अप स्क्रीन लॉक आवश्यक आहे."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"प्रशासक, कूटबद्धीकरण धोरण किंवा क्रेडेन्शियल संचयनाद्वारे अक्षम केलेले"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"काहीही नाही"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"स्‍वाइप करा"</string>
@@ -822,7 +830,7 @@
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC टॅग वर लिहा"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"उपलब्ध नेटवर्क पाहण्यासाठी, वाय-फाय चालू करा."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"वाय-फाय नेटवर्क शोधत आहे…"</string>
-    <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"तुमच्याला वाय-फाय नेटवर्क बदलण्याची परवानगी नाही."</string>
+    <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"तुम्हाला वाय-फाय नेटवर्क बदलण्याची परवानगी नाही."</string>
     <string name="wifi_more" msgid="3195296805089107950">"अधिक"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"स्वयंचलित सेटअप (WPS)"</string>
     <string name="wifi_settings_scanning_required_title" msgid="3815269816331500375">"वाय-फाय स्कॅनिंग सुरू करायचे का?"</string>
@@ -874,7 +882,7 @@
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"एक डोमेन निर्दिष्ट करणे आवश्यक आहे."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS उपलब्ध"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS उपलब्ध)"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"आपला नेटवर्क पासवर्ड एंटर करा"</string>
+    <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"तुमचा नेटवर्क पासवर्ड एंटर करा"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"वाहक वाय-फाय नेटवर्क"</string>
     <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> ने कनेक्ट करा"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"स्थान अचूकता सुधारण्यासाठी आणि इतर हेतूंसाठी, <xliff:g id="APP_NAME">%1$s</xliff:g> ला नेटवर्क स्कॅनिंग चालू करण्याची आवश्यकता आहे, वाय-फाय बंद असताना देखील.\n\nस्कॅन करू इच्छित सर्व अॅप्सना अनुमती द्यायची?"</string>
@@ -1002,21 +1010,16 @@
     <item msgid="2339246858001475047">"2"</item>
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
-    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"वाय-फाय कॉलिंग चालू असताना, आपला फोन तुमच्या प्राधान्यावर आणि कोणता सिग्नल मजबूत आहे याच्या आधारावर, वाय-फाय नेटवर्क किंवा तुमच्या वाहकाच्या नेटवर्कद्वारे कॉल राउट करू शकतो. हे वैशिष्ट्य चालू करण्यापूर्वी, फी आणि इतर तपशीलांच्या संबंधात तुमच्या वाहकास विचारा."</string>
+    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"वाय-फाय कॉलिंग चालू असताना, तुमचा फोन तुमच्या प्राधान्यावर आणि कोणता सिग्नल मजबूत आहे याच्या आधारावर, वाय-फाय नेटवर्क किंवा तुमच्या वाहकाच्या नेटवर्कद्वारे कॉल राउट करू शकतो. हे वैशिष्ट्य चालू करण्यापूर्वी, फी आणि इतर तपशीलांच्या संबंधात तुमच्या वाहकास विचारा."</string>
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"संकटकालीन पत्ता"</string>
-    <string name="emergency_address_summary" msgid="7751971156196115129">"तुम्ही Wi-Fi वरून आणीबाणी कॉल केल्यावर हे तुमचे स्थान असल्याचे दाखवले जाते"</string>
+    <string name="emergency_address_summary" msgid="7751971156196115129">"तुम्ही वाय-फाय वरून आणीबाणी कॉल केल्यावर हे तुमचे स्थान असल्याचे दाखवले जाते"</string>
     <string name="private_dns_help_message" msgid="3299567069152568958">"खाजगी DNS वैशिष्ट्यांबद्दल "<annotation id="url">"अधिक जाणून घ्या"</annotation></string>
-    <!-- no translation found for wifi_calling_pref_managed_by_carrier (6845711858866828986) -->
-    <skip />
-    <!-- no translation found for wifi_calling_settings_activation_instructions (7492509632478260955) -->
-    <skip />
-    <!-- no translation found for wifi_calling_turn_on (1171403510313983983) -->
-    <skip />
-    <!-- no translation found for wifi_calling_not_supported (7878640438907807754) -->
-    <skip />
-    <!-- no translation found for carrier (5264014738689761132) -->
-    <skip />
+    <string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"सेटिंग वाहकाद्वारे व्यवस्थापित केले आहे"</string>
+    <string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"वाय-फाय कॉलिंग सुरू करा"</string>
+    <string name="wifi_calling_turn_on" msgid="1171403510313983983">"वाय-फाय कॉलिंग सुरू करा"</string>
+    <string name="wifi_calling_not_supported" msgid="7878640438907807754">"%1$s साठी वाय-फाय कॉलिंगला सपोर्ट नाही"</string>
+    <string name="carrier" msgid="5264014738689761132">"वाहक"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"डिस्प्ले"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ध्वनी"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"आवाज"</string>
@@ -1042,10 +1045,10 @@
     <string name="volume_ring_description" msgid="5936851631698298989">"रिंगटोन आणि सूचना"</string>
     <string name="volume_notification_description" msgid="5810902320215328321">"सूचना"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"अलार्म"</string>
-    <string name="volume_ring_mute" msgid="3018992671608737202">"रिंगटोन आणि सूचना म्युट"</string>
-    <string name="volume_media_mute" msgid="3399059928695998166">"संगीत आणि इतर मीडिया म्युट करा"</string>
-    <string name="volume_notification_mute" msgid="7955193480006444159">"सूचना म्युट करा"</string>
-    <string name="volume_alarm_mute" msgid="4452239420351035936">"अलार्म म्युट करा"</string>
+    <string name="volume_ring_mute" msgid="3018992671608737202">"रिंगटोन आणि सूचना म्यूट"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"संगीत आणि इतर मीडिया म्यूट करा"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"सूचना म्यूट करा"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"अलार्म म्यूट करा"</string>
     <string name="dock_settings" msgid="1820107306693002541">"डॉक"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"डॉक सेटिंग्ज"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"ऑडिओ"</string>
@@ -1134,7 +1137,7 @@
     <string name="wallpaper_settings_summary_default" msgid="3395741565658711416">"डीफॉल्ट"</string>
     <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"कस्टम"</string>
     <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"वॉलपेपर बदला"</string>
-    <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"आपली स्क्रीन वैयक्तीकृत करा"</string>
+    <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"तुमची स्क्रीन वैयक्तीकृत करा"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"यातून वॉलपेपर निवडा"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"स्क्रीन सेव्हर"</string>
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"चार्ज होत असताना किंवा डॉक केलेले असताना"</string>
@@ -1151,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"स्वयंचलित चकाकी"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"सक्रिय करण्‍यासाठी लिफ्‍ट"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"अँबियन्ट डिसप्ले"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"नेहमी चालू / बॅटरीचा वाढलेला वापर"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"नवीन सूचना"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"कधी दाखवायचे"</string>
     <string name="doze_title" msgid="2375510714460456687">"नवीन सूचना"</string>
     <string name="doze_summary" msgid="3846219936142814032">"सूचना प्राप्त केल्यावर स्क्रीन सक्रिय करा"</string>
@@ -1197,8 +1198,6 @@
       <item quantity="other">चुकीचा सिम पिन कोड, तुमच्याकडे <xliff:g id="NUMBER_1">%d</xliff:g> प्रयत्न शिल्लक आहेत.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"सिम पिन ऑपरेशन अयशस्वी!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"टॅबलेट स्थिती"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"फोन स्थिती"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"सिस्टम अपडेट"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android आवृत्ती"</string>
@@ -1218,7 +1217,7 @@
     <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"बॅटरी, नेटवर्कची स्थिती आणि अन्य माहिती"</string>
     <string name="device_status_summary" product="default" msgid="2599162787451519618">"फोन नंबर, सिग्नल इ."</string>
     <string name="storage_settings" msgid="4211799979832404953">"संचयन"</string>
-    <string name="storage_usb_settings" msgid="7293054033137078060">"संचय"</string>
+    <string name="storage_usb_settings" msgid="7293054033137078060">"स्टोरेज"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"संचयन सेटिंग्ज"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"USB स्टोरेज अनमाउंट करा, उपलब्ध स्टोरेज पहा"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SD कार्ड अनमाउंट करा, उपलब्ध संचयन पहा"</string>
@@ -1305,7 +1304,7 @@
     <string name="storage_menu_set_up" msgid="4263294929451685366">"सेट करा"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"एक्सप्लोर करा"</string>
     <string name="storage_menu_free" msgid="6386070442027135427">"जागा मोकळी करा"</string>
-    <string name="storage_menu_manage" msgid="5914482953856430780">"संचय व्यवस्थापित करा"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"स्टोरेज व्यवस्थापित करा"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB कॉंप्युटर कनेक्शन"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"म्हणून कनेक्ट करा"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"मीडिया डिव्हाइस (MTP)"</string>
@@ -1332,10 +1331,10 @@
     <string name="storage_dialog_unmountable" msgid="3732209361668282254">"हे <xliff:g id="NAME_0">^1</xliff:g> दूषित झाले आहे. \n\n हे <xliff:g id="NAME_1">^1</xliff:g> वापरण्‍यासाठी, आपल्‍याला प्रथम ते सेट करणे आव्‍ाश्यक आहे."</string>
     <string name="storage_dialog_unsupported" msgid="4503128224360482228">"हे डिव्हाइस या <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="4018647158382548820">"फॉर्मेट झाल्यानंतर, तुम्ही हे <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="3582802571684490057"><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_unmount_details" msgid="3582802571684490057"><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="9028875424669047327">"अॅप्स, फोटो किंवा या <xliff:g id="NAME">^1</xliff:g> मध्ये असलेला डेटा वापरण्यासाठी, तो पुन्हा घाला. \n\nपर्यायीपणे, डिव्हाइस उपलब्ध नसल्यास तुम्ही हे स्टोरेज विसरणे निवडू शकता. \n\nतुम्ही विसरणे निवडल्यास, डिव्हाइस मध्ये असलेला सर्व डेटा नेहमीसाठी गमावला जाईल. \n\nतुम्ही नंतर अॅप्स पुन्हा इंस्टॉल करू शकता, परंतु या डिव्हाइस वर स्टोअर केलेला त्यांचा डेटा गमावला जाईल."</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"<xliff:g id="NAME">^1</xliff:g> ला विसरला?"</string>
-    <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"या <xliff:g id="NAME">^1</xliff:g> वर संचयित केलेले सर्व अ‍ॅप्स, फोटो आणि डेटा कायमचा गमावला जाईल."</string>
+    <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"या <xliff:g id="NAME">^1</xliff:g> वर स्टोअर केलेले सर्व अ‍ॅप्स, फोटो आणि डेटा कायमचा गमावला जाईल."</string>
     <string name="storage_detail_apps" msgid="6141154016753507490">"अॅप्स"</string>
     <string name="storage_detail_images" msgid="6950678857740634769">"इमेज"</string>
     <string name="storage_detail_videos" msgid="2919743464827110953">"व्हिडिओ"</string>
@@ -1346,16 +1345,16 @@
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> एक्सप्लोर करा"</string>
     <string name="storage_detail_dialog_other" msgid="8845766044697204852">"इतर गोष्टींमध्ये अ‍ॅप्सवरून सेव्ह करून शेअर केलेल्या फायली, इंटरनेट किंवा ब्लूटूथ वरून डाउनलोड केलेल्या फायली, Android फायली आणि इत्यादीचा समावेश असतो. \n\n<xliff:g id="NAME">^1</xliff:g> चा दिसणाराा अाशय पाहण्यासाठी, एक्सप्लोर करा वर टॅप करा."</string>
     <string name="storage_detail_dialog_system" msgid="862835644848361569">"सिस्टममध्ये अशा फायली आहेत ज्यांचा वापर Android आवृत्ती <xliff:g id="VERSION">%s</xliff:g> चालवण्यासाठी केला जातो"</string>
-    <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> कडे <xliff:g id="SIZE">^2</xliff:g> संचय वापरणारे, सेव्ह केलेले फोटो, संगीत, अॅप्स किंवा इतर डेटा असू शकतो. \n\nतपशील पाहण्यासाठी, <xliff:g id="USER_1">^1</xliff:g> वर स्विच करा."</string>
+    <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> कडे <xliff:g id="SIZE">^2</xliff:g> स्टोरेज वापरणारे, सेव्ह केलेले फोटो, संगीत, अॅप्स किंवा इतर डेटा असू शकतो. \n\nतपशील पाहण्यासाठी, <xliff:g id="USER_1">^1</xliff:g> वर स्विच करा."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"तुमचे <xliff:g id="NAME">^1</xliff:g> सेट करा"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"पोर्टेबल संचयन म्हणून वापरा"</string>
     <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"डिव्‍हाइसेस मध्‍ये फोटो आणि इतर मीडिया हलविण्‍यासाठी."</string>
     <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"अंतर्गत स्टोरेज म्हणून वापरा"</string>
-    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"केवळ या डिव्‍हाइसवर अ‍ॅप्स आणि फोटोंसह काहीही संचयित करण्‍यासाठी, त्या फॉर्मेटची आवश्‍यकता असते जे यास इतर डिव्‍हाइसेसह कार्य करण्यास प्रतिबंधित करते."</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"केवळ या डिव्‍हाइसवर अ‍ॅप्स आणि फोटोंसह काहीही स्टोअर करण्‍यासाठी, त्या फॉर्मेटची आवश्‍यकता असते जे यास इतर डिव्‍हाइसेसह कार्य करण्यास प्रतिबंधित करते."</string>
     <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"अंतर्गत स्टोरेज म्हणून फॉरमॅट करा"</string>
-    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"हे सुरक्षित करण्‍यासाठी यास <xliff:g id="NAME_0">^1</xliff:g> फॉर्मेट करणे आवश्यक आहे. \n\nफॉर्मेट केल्‍यानंतर, हे <xliff:g id="NAME_1">^1</xliff:g> केवळ या डिव्‍हाइसमध्‍ये कार्य करेल. \n\n"<b>"फॉर्मेट करण्‍यामुळे <xliff:g id="NAME_2">^1</xliff:g> वर सध्‍या संचयित केलेला सर्व डेटा मिटविला जातो."</b>" डेटा गमावला जाणे, टाळण्‍यासाठी त्याचा बॅकअप घेण्‍याचा विचार करा."</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"हे सुरक्षित करण्‍यासाठी यास <xliff:g id="NAME_0">^1</xliff:g> फॉर्मेट करणे आवश्यक आहे. \n\nफॉर्मेट केल्‍यानंतर, हे <xliff:g id="NAME_1">^1</xliff:g> केवळ या डिव्‍हाइसमध्‍ये कार्य करेल. \n\n"<b>"फॉर्मेट करण्‍यामुळे <xliff:g id="NAME_2">^1</xliff:g> वर सध्‍या स्टोअर केलेला सर्व डेटा मिटविला जातो."</b>" डेटा गमावला जाणे, टाळण्‍यासाठी त्याचा बॅकअप घेण्‍याचा विचार करा."</string>
     <string name="storage_wizard_format_confirm_public_title" msgid="4905690038882041566">"पोर्टेबल संचयन म्हणून फॉर्मेट करा"</string>
-    <string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"यास <xliff:g id="NAME_0">^1</xliff:g> फॉर्मेट करणे आवश्यक आहे. \n\n"<b>"फॉर्मेट केल्यामुळे <xliff:g id="NAME_1">^1</xliff:g> वर सध्या संचयित केलेला सर्व डेटा मिटविला जातो."</b>" डेटा गमावला जाणे टाळण्यासाठी, त्याचा बॅकअप घेण्याचा विचार करा."</string>
+    <string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"यास <xliff:g id="NAME_0">^1</xliff:g> फॉर्मेट करणे आवश्यक आहे. \n\n"<b>"फॉर्मेट केल्यामुळे <xliff:g id="NAME_1">^1</xliff:g> वर सध्या स्टोअर केलेला सर्व डेटा मिटविला जातो."</b>" डेटा गमावला जाणे टाळण्यासाठी, त्याचा बॅकअप घेण्याचा विचार करा."</string>
     <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"मिटवा आणि फॉर्मेट करा"</string>
     <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> फॉर्मेट करत आहे…"</string>
     <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"फॉरमॅट होत असताना <xliff:g id="NAME">^1</xliff:g> काढू टाकू नका."</string>
@@ -1486,11 +1485,11 @@
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"अंतर्गत USB संचयनावरील सर्व डेटा मिटवा, जसे की संगीत किंवा फोटो"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD कार्डवरील सर्व डेटा मिटवा, जसे की संगीत किंवा फोटो"</string>
     <string name="erase_esim_storage" msgid="5684858600215441932">"eSIM मिटवा"</string>
-    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"फोनवरील सर्व eSIM मिटवा. यामुळे आपला मोबाइल सेवा प्लॅन रद्द होणार नाही."</string>
-    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"टॅबलेटवरील सर्व eSIM मिटवा. यामुळे आपला मोबाइल सेवा प्लॅन रद्द होणार नाही."</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"फोनवरील सर्व eSIM मिटवा. यामुळे तुमचा मोबाइल सेवा प्लॅन रद्द होणार नाही."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"टॅबलेटवरील सर्व eSIM मिटवा. यामुळे तुमचा मोबाइल सेवा प्लॅन रद्द होणार नाही."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"टॅबलेट रीसेट करा"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"फोन रीसेट करा"</string>
-    <string name="master_clear_final_desc" msgid="7318683914280403086">"आपली सर्व वैयक्तिक माहिती आणि डाउनलोड केलेले अॅप्स मिटवायचे? तुम्ही ही क्रिया पूर्ववत करू शकत नाही!"</string>
+    <string name="master_clear_final_desc" msgid="7318683914280403086">"तुमची सर्व वैयक्तिक माहिती आणि डाउनलोड केलेले अॅप्स मिटवायचे? तुम्ही ही क्रिया पूर्ववत करू शकत नाही!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"प्रत्येकगोष्ट मिटवा"</string>
     <string name="master_clear_failed" msgid="2503230016394586353">"सिस्टम साफ करा सेवा उपलब्ध नसल्यामुळे कोणतेही रीसेट केले नाही."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"रीसेट करायचे?"</string>
@@ -1529,8 +1528,8 @@
     <string name="network_scorer_picker_title" msgid="6383879578279046456">"नेटवर्क रेटिंग प्रदाता"</string>
     <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"काहीही नाही"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"वाय-फाय साहाय्यक बदलायचा?"</string>
-    <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"आपली नेटवर्क कनेक्शन व्यवस्थापित करण्यासाठी <xliff:g id="CURRENT_APP">%2$s</xliff:g> ऐवजी <xliff:g id="NEW_APP">%1$s</xliff:g> वापरायचा?"</string>
-    <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"आपली नेटवर्क कनेक्शन व्यवस्थापित करण्यासाठी <xliff:g id="NEW_APP">%s</xliff:g> वापरायचा?"</string>
+    <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"तुमची नेटवर्क कनेक्शन व्यवस्थापित करण्यासाठी <xliff:g id="CURRENT_APP">%2$s</xliff:g> ऐवजी <xliff:g id="NEW_APP">%1$s</xliff:g> वापरायचा?"</string>
+    <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"तुमची नेटवर्क कनेक्शन व्यवस्थापित करण्यासाठी <xliff:g id="NEW_APP">%s</xliff:g> वापरायचा?"</string>
     <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"अज्ञात सिम ऑपरेटर"</string>
     <string name="mobile_no_provisioning_url" msgid="9053814051811634125">"<xliff:g id="OPERATOR">%1$s</xliff:g> मध्ये कोणतीही ज्ञात तरतूद वेबसाइट नाही"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"कृपया सिम कार्ड घाला आणि रीस्टार्ट करा"</string>
@@ -1561,7 +1560,7 @@
     <string name="use_location_title" msgid="5206937465504979977">"स्थान आणि Google शोध"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Google ला शोध परिणाम आणि अन्य सेवा सुधारण्यासाठी तुमचे स्थान वापरू द्या"</string>
     <string name="location_access_title" msgid="7064108942964081243">"माझी स्थाने अॅक्सेस करा"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"आपली परवानगी विचारणार्‍या अॅप्सना आपली स्थान माहिती वापरु द्या"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"तुमची परवानगी विचारणार्‍या अॅप्सना तुमची स्थान माहिती वापरु द्या"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"स्थान स्रोत"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"टॅबलेट विषयी"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"फोन विषयी"</string>
@@ -1609,8 +1608,8 @@
     <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"सुरु ठेवण्यासाठी तुमचे डिव्हाइस पिन एंटर करा"</string>
     <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"सुरु ठेवण्यासाठी तुमचे डिव्हाइस पासवर्ड एंटर करा"</string>
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"सुरु ठेवण्यासाठी आपल्या कार्य नमुन्याचा वापर करा"</string>
-    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"सुरु ठेवण्यासाठी आपला कार्य पिन एंटर करा"</string>
-    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"सुरु ठेवण्यासाठी आपला कार्य पासवर्ड एंटर करा"</string>
+    <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"सुरु ठेवण्यासाठी तुमचा कार्य पिन एंटर करा"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"सुरु ठेवण्यासाठी तुमचा कार्य पासवर्ड एंटर करा"</string>
     <string name="lockpassword_strong_auth_required_device_pattern" msgid="530802132223800623">"वाढीव सुरक्षिततेसाठी, तुमच्या डीव्हाइसचा पॅटर्न वापरा"</string>
     <string name="lockpassword_strong_auth_required_device_pin" msgid="7829294830078036417">"वाढीव सुरक्षिततेसाठी, तुमच्या डिव्हाइसचा पिन टाका"</string>
     <string name="lockpassword_strong_auth_required_device_password" msgid="3552644641574796973">"वाढीव सुरक्षिततेसाठी, तुमच्या डिव्हाइसचा पासवर्ड टाका"</string>
@@ -1635,7 +1634,7 @@
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"कमीत कमी <xliff:g id="NUMBER">%d</xliff:g> बिंदू कनेक्ट करा. पुन्हा प्रयत्न करा."</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"पॅटर्न रेकॉर्ड झाला"</string>
     <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"पुष्टी करण्यासाठी पुन्हा नमूना रेखांकित करा"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"आपला नवीन अनलॉक पॅटर्न"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"तुमचा नवीन अनलॉक पॅटर्न"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"पुष्टी करा"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"पुन्हा रेखाटा"</string>
     <string name="lockpattern_retry_button_text" msgid="3480423193273588166">"साफ करा"</string>
@@ -1673,7 +1672,7 @@
     <string name="recent_app_category_title" msgid="6673071268966003928">"अलीकडे उघडलेले अ‍ॅप्स"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"सगळे <xliff:g id="COUNT">%1$d</xliff:g> अ‍ॅप्स पहा"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"तुमचे टॅबलेट आणि वैयक्तिक डेटा अज्ञात अनुप्रयोगांद्वारे आक्रमणांपासून अधिक असुरक्षित असतात. या स्रोताकडील अ‍ॅप्स इंस्टॉल करून, तुम्ही सहमत आहात की त्यांच्या वापराच्या परिणामी होणार्‍या आपल्या टॅबलेटच्या कोणत्याही नुकसानासाठी किंवा डेटाच्या हानीसाठी तुम्ही जबाबदार आहात."</string>
-    <string name="install_all_warning" product="default" msgid="1952257127370115988">"आपला फोन आणि वैयक्तिक डेटा अज्ञात अनुप्रयोगांद्वारे आक्रमणांपासून अधिक असुरक्षित असतात. या स्रोताकडील अ‍ॅप्स इंस्टॉल करून, तुम्ही सहमत आहात की त्यांच्या वापराच्या परिणामी होणार्‍या आपल्या फोनच्या कोणत्याही नुकसानासाठी किंवा डेटाच्या हानीसाठी तुम्ही जबाबदार आहात."</string>
+    <string name="install_all_warning" product="default" msgid="1952257127370115988">"तुमचा फोन आणि वैयक्तिक डेटा अज्ञात अनुप्रयोगांद्वारे आक्रमणांपासून अधिक असुरक्षित असतात. या स्रोताकडील अ‍ॅप्स इंस्टॉल करून, तुम्ही सहमत आहात की त्यांच्या वापराच्या परिणामी होणार्‍या आपल्या फोनच्या कोणत्याही नुकसानासाठी किंवा डेटाच्या हानीसाठी तुम्ही जबाबदार आहात."</string>
     <string name="install_all_warning" product="device" msgid="3648003301476423145">"तुमचे डिव्हाइस आणि वैयक्तिक डेटा अज्ञात अ‍ॅप्सच्या आक्रमणांपासून जास्त असुरक्षित असतात. या स्रोताकडील अ‍ॅप्स इंस्टॉल करून, तुम्ही सहमत आहात की त्यांच्या वापरामुळे तुमच्या डिव्हाइसला होऊ शकणार्‍या कोणत्याही नुकसानासाठी किंवा डेटाच्या हानीसाठी तुम्ही जबाबदार आहात."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"प्रगत सेटिंग्ज"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"अधिक सेटिंग्ज पर्याय सुरू करा"</string>
@@ -1784,7 +1783,7 @@
     <string name="app_disable_dlg_positive" msgid="7375627244201714263">"अॅप अक्षम करा"</string>
     <string name="app_disable_dlg_text" msgid="5632072173181990531">"तुम्ही हा अॅप अक्षम केल्यास, Android आणि अन्य अॅप्सना ज्या हेतूने कार्य करायचे आहे कदाचित त्यानुसार ते यापुढे कार्य करू शकणार नाहीत."</string>
     <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"डेटा हटवायचा आणि अॅप अक्षम करायचा?"</string>
-    <string name="app_special_disable_dlg_text" msgid="5832078825810635913">"तुम्ही हा अॅप अक्षम केल्यास, Android आणि अन्य अॅप्सना ज्या हेतूने कार्य करायचे आहे कदाचित त्यानुसार ते यापुढे कार्य करू शकणार नाहीत. आपला डेटा हटवला देखील जाईल."</string>
+    <string name="app_special_disable_dlg_text" msgid="5832078825810635913">"तुम्ही हा अॅप अक्षम केल्यास, Android आणि अन्य अॅप्सना ज्या हेतूने कार्य करायचे आहे कदाचित त्यानुसार ते यापुढे कार्य करू शकणार नाहीत. तुमचा डेटा हटवला देखील जाईल."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"सूचना बंद करायच्या?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"तुम्ही या अॅपसाठी सूचना बंद केल्यास, तुम्ही महत्वाच्या सूचना आणि अपडेट गमावू शकता."</string>
     <string name="app_install_details_group_title" msgid="7084623031296083574">"स्टोअर"</string>
@@ -2120,8 +2119,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"बॅकग्राउंड वापर मर्यादित केला जाऊ शकत नाही"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"बॅकग्राउंड अॅक्टिव्हिटी मर्यादित ठेवायची?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"तुम्‍ही एखाद्या अॅपसाठी बॅकग्राउंड अॅक्टिव्हिटी मर्यादित ठेवल्‍यास, ते व्‍यवस्थित न चालण्‍याची शक्‍यता आहे"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"हे अ‍ॅप बॅटरी ऑप्टिमाइझ करण्यासाठी सेट केलेले नसल्याने, तुम्ही ते प्रतिबंधित करू शकत नाही.\n\nअॅप प्रतिबंधित करण्यासाठी, प्रथम बॅटरी ऑप्टिमायझेशन सुरू करा"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"पूर्ण चार्ज झाल्यानंतर स्क्रीन वापर"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"स्क्रीन उपयोग"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"मोबाइल नेटवर्क स्कॅनिंग"</string>
@@ -2441,6 +2439,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"आणीबाणी डायलिंग सिग्नल"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"आणीबाणी कॉल केला जातो तेव्हा वर्तन सेट करा"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"बॅकअप"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"सुरू"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"बंद"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"बॅकअप घ्या आणि पुनर्संचयित करा"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"वैयक्तिक डेटा"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"माझ्या डेटाचा बॅकअप घ्या"</string>
@@ -2554,8 +2554,8 @@
     <string name="remove_account_failed" msgid="3901397272647112455">"या बदलाला आपल्या प्रशासकाद्वारे अनुमती नाही"</string>
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"व्यक्तिचलितपणे सिंक करू शकत नाही"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"या आयटमसाठी सध्या सिंक अक्षम केले आहे. हे सेटिंग बदलण्यासाठी, पार्श्वभूमीवरील डेटा आणि आपोआप होणारे सिंक तात्पुरते चालू करा."</string>
-    <string name="enter_password" msgid="8035706727471334122">"Android प्रारंभ करण्‍यासाठी, आपला पासवर्ड प्रविष्‍ट करा"</string>
-    <string name="enter_pin" msgid="5305333588093263790">"Android प्रारंभ करण्‍यासाठी, आपला पिन प्रविष्‍ट करा"</string>
+    <string name="enter_password" msgid="8035706727471334122">"Android प्रारंभ करण्‍यासाठी, तुमचा पासवर्ड प्रविष्‍ट करा"</string>
+    <string name="enter_pin" msgid="5305333588093263790">"Android प्रारंभ करण्‍यासाठी, तुमचा पिन प्रविष्‍ट करा"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android प्रारंभ करण्‍यासाठी, आपल्या नमुन्याची रेखाटणी करा"</string>
     <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"चुकीचा पॅटर्न"</string>
     <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"चुकीचा पासवर्ड"</string>
@@ -2634,8 +2634,8 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"डेटा वापर चेतावणी सेट करा"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"डेटा वापर मर्यादा सेट करा"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"डेटा वापर मर्यादित करत आहे"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"आपल्या टॅबलेटने तुम्ही सेट केलेली मर्यादा गाठताच तो मोबाइल डेटा बंद करेल.\n\nआपल्या टॅबलेटद्वारे डेटा वापर मोजला जात असल्याने आणि आपला वाहक वापराची गणना वेगळ्या प्रकारे करू शकत असल्याने, कमी मर्यादा सेट करणे विचारात घ्या."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"आपल्या फोनने तुम्ही सेट केलेली मर्यादा गाठताच तो मोबाइल डेटा बंद करेल.\n\nआपल्या फोनद्वारे डेटा वापर मोजला जात असल्याने आणि आपला वाहक वापराची गणना वेगळ्या प्रकारे करू शकत असल्याने, कमी मर्यादा सेट करणे विचारात घ्या."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"आपल्या टॅबलेटने तुम्ही सेट केलेली मर्यादा गाठताच तो मोबाइल डेटा बंद करेल.\n\nआपल्या टॅबलेटद्वारे डेटा वापर मोजला जात असल्याने आणि तुमचा वाहक वापराची गणना वेगळ्या प्रकारे करू शकत असल्याने, कमी मर्यादा सेट करणे विचारात घ्या."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"आपल्या फोनने तुम्ही सेट केलेली मर्यादा गाठताच तो मोबाइल डेटा बंद करेल.\n\nआपल्या फोनद्वारे डेटा वापर मोजला जात असल्याने आणि तुमचा वाहक वापराची गणना वेगळ्या प्रकारे करू शकत असल्याने, कमी मर्यादा सेट करणे विचारात घ्या."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"पार्श्वभूमीवरील डेटा प्रतिबंधित करायचा?"</string>
     <string name="data_usage_restrict_background" msgid="434093644726734586">"तुम्ही पार्श्वभूमी मोबाइल डेटा प्रतिबंधित केल्यास, तुम्ही वाय-फाय शी कनेक्ट असल्याशिवाय काही अॅप्स आणि सेवा काम करणार नाहीत."</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"तुम्ही पार्श्वभूमी मोबाइल डेटा प्रतिबंधित केल्यास, तुम्ही वाय-फाय शी कनेक्ट असल्याशिवाय काही अॅप्स आणि सेवा काम करणार नाहीत.\n\nहे सेटिंग या टॅबलेटवरील सर्व वापरकर्त्यांवर परिणाम करते."</string>
@@ -2741,9 +2741,9 @@
     <string name="user_credential_removed" msgid="6514189495799401838">"क्रेडेंशियल काढले: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
     <string name="user_credential_none_installed" msgid="3729607560420971841">"कोणतेही वापरकर्ता क्रेडेंशियल इंस्टॉल केलेले नाहीत"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"शब्दलेखन तपासक"</string>
-    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"येथे आपला वर्तमान पूर्ण बॅकअप पासवर्ड टाइप करा"</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"येथे तुमचा वर्तमान पूर्ण बॅकअप पासवर्ड टाइप करा"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"येथे पूर्ण बॅकअप साठी एक नवीन पासवर्ड टाइप करा"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"येथे आपला नवीन पूर्ण बॅकअप पासवर्ड परत टाइप करा"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"येथे तुमचा नवीन पूर्ण बॅकअप पासवर्ड परत टाइप करा"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"बॅकअप पासवर्ड सेट करा"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"रद्द करा"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"अतिरिक्त सिस्टम अपडेट"</string>
@@ -2767,6 +2767,12 @@
       <item quantity="other">प्रमाणपत्रे तपासा</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"एकाहून अधिक वापरकर्ते"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"वापरकर्ते आणि प्रोफाईल्स"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"वापरकर्ता किंवा प्रोफाइल जोडा"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"वापरकर्ता जोडा"</string>
@@ -2890,7 +2896,7 @@
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"टॅबलेट दुसर्‍या डिव्हाइसला स्पर्श करतो तेव्हा डेटा अदलाबदलीस अनुमती द्या"</string>
     <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"फोन दुसर्‍या डिव्हाइसला स्पर्श करतो तेव्हा डेटा अदलाबदलीस अनुमती द्या"</string>
     <string name="restriction_location_enable_title" msgid="5020268888245775164">"स्थान"</string>
-    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"अॅप्सना आपली स्थान माहिती वापरु द्या"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"अॅप्सना तुमची स्थान माहिती वापरु द्या"</string>
     <string name="wizard_back" msgid="5567007959434765743">"परत"</string>
     <string name="wizard_next" msgid="3606212602795100640">"पुढील"</string>
     <string name="wizard_finish" msgid="3286109692700083252">"समाप्‍त"</string>
@@ -2949,14 +2955,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"डेटा वापर"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"हॉटस्पॉट"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"कनेक्‍ट केलेले डिव्‍हाइसेस"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"ब्लूटूथ, ड्रायव्हिंग मोड, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"ब्लूटूथ, ड्रायव्हिंग मोड"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"ब्लूटूथ, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"ब्लूटूथ"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"अॅप्स आणि सूचना"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"परवानग्या, डीफॉल्ट अ‍ॅप्स"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"खाती"</string>
@@ -2973,7 +2975,6 @@
     <string name="keywords_home" msgid="294182527446892659">"लाँचर, डीफॉल्ट, अॅप्स"</string>
     <string name="keywords_display" msgid="8910345814565493016">"स्क्रीन, टचस्क्रीन"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"मंद स्क्रीन, टचस्क्रीन, बॅटरी, तेजस्वी"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"मंद स्क्रीन, टचस्क्रीन, बॅटरी"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"अंधुक स्क्रीन, रात्र, रंगछटा, रात्रीचे शिफ्ट, ब्राइटनेस, स्क्रीनचा रंग, रंग, रंग"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"पार्श्वभूमी, वैयक्तीकृत करा, कस्टम डिस्प्ले"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"मजकूर आकार"</string>
@@ -3014,11 +3015,15 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"नेटवर्क, मोबाइल नेटवर्क स्थिती, सेवा स्थिती, सिग्नल तीव्रता, मोबाइल नेटवर्क प्रकार, रोमिंग, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"सीरीअल नंबर, हार्डवेअर आवृत्ती"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"Android सुरक्षितता पॅच पातळी, बेसबँड आवृत्ती, कर्नल आवृत्ती"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"अँबियन्ट डिस्‍प्‍ले, लॉक स्‍क्रीन डिस्‍प्‍ले"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"फिंगरप्रिंट"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"फिरवा, फ्लिप करा, रोटेशन, पोर्ट्रेट, लँडस्केप, ओरिएंटेशन, उभे, आडवे"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"अपग्रेड करा, Android"</string>
-    <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"डीएनडी, शेड्यूल, सूचना, ब्लॉक, शांतता, व्हायब्रेट, झोप, काम, फोकस, ध्वनी, म्युट, दिवस, कार्य दिवस, शनिवार व रविवार, आठवड्याची शेवटची रात्र, इव्हेंट"</string>
+    <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"डीएनडी, शेड्यूल, सूचना, ब्लॉक, शांतता, व्हायब्रेट, झोप, काम, फोकस, ध्वनी, म्यूट, दिवस, कार्य दिवस, शनिवार व रविवार, आठवड्याची शेवटची रात्र, इव्हेंट"</string>
     <string name="keywords_screen_timeout" msgid="8161370660970309476">"स्क्रीन, लॉक टाइम, कालबाह्य, लॉकस्क्रीन"</string>
     <string name="keywords_storage_settings" msgid="1642340184392317296">"मेमरी, डेटा, हटवा, साफ, मोकळी, जागा"</string>
     <string name="keywords_bluetooth_settings" msgid="6804844062789439858">"कनेक्ट केलेले, डिव्हाइस, हेडफोन, हेडसेट, स्पीकर, वायरलेस, पेअर, इयरबड, संगीत, मीडिया"</string>
@@ -3098,18 +3103,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"व्हिज्युअल सिग्नलना अनुमती द्या"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"जेव्हा व्यत्यय आणू नका सुरू असते"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"सूचना"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"सूचना शांतपणे दाखवा"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"सूचना म्यूट होतील"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"सूचना आल्यावर आवाज नाही"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"तुम्हाला तुमच्या स्क्रीनवर सूचना दिसतील"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"जेव्हा सूचना येतात, तुमचा फोन आवाज करणार नाही किंवा व्हायब्रेट होणार नाही"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"सूचना लपवा"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"तुम्हाला नवीन किंवा अस्तित्वात असलेल्या सूचना दिसणार नाहीत"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"सूचना आल्यावर व्हिज्युअल किंवा आवाज नाही"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"तुम्हाला सूचना दिसणार नाहीत किंवा ऐकू येणार नाहीत"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"तुमचा फोन कोणत्याही नवीन किंवा अस्तित्वात असलेल्या सूचना दाखवणार नाही आणि फोनचा कोणताही आवाज किंवा कंपन होणार नाही. तुमच्या स्क्रीनच्या सर्वात वरून तुम्ही खाली स्वाइप केल्यास सूचना दिसणार नाहीत .\n\nलक्षात ठेवा, फोन अॅक्टिव्हिटी आणि स्थितीसाठी महत्त्वाच्या सूचना तरीही दिसतील."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"कस्टम"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"कस्टम सेटिंग सुरू करा"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"कस्टम सेटिंग काढून टाका"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"दिसेल"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"सूचना आल्यावर आवाज नाही"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"अंशतः लपवलेले"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"लपवलेले"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"सूचना आल्यावर व्हिज्युअल किंवा आवाज नाही"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"कस्टम प्रतिबंध"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"स्क्रीन चालू असताना"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"स्क्रीन बंद असताना"</string>
@@ -3168,19 +3173,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"म्यूट केले आहे पण <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> आणि <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> ला अनुमती द्या"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"मेसेज, इव्हेंट आणि रिमाइंडर"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"जेव्हा व्यत्यय आणू नका सुरू असते तेव्हा मेसेज, रिमाइंडर आणि इव्हेंट म्यूट असतील, तुम्ही वरती अनुमती दिलेल्या आयटम व्यतिरिक्त. तुम्ही सेटिंग्ज मध्ये बदल करून तुमच्या मित्रमैत्रिणींना, कुटुंबियांना आणि इतर संपर्कांना तुमच्यापर्यंत पोहोचण्याची अनुमती देऊ शकता."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"झाले"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"सेटिंग्ज"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"सूचना आल्यावर व्हिज्युअल किंवा आवाज नाही"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"सूचना आल्यावर आवाज नाही"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"तुम्हाला सूचना दिसणार नाहीत किंवा ऐकू येणार नाहीत. तारांकित संपर्कांकडून आलेले कॉल आणि नियमित कॉलरना अनुमती आहे."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(वर्तमान सेटिंग)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"व्यत्यय आणू नका सूचना सेटिंग्ज बदलायच्या?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"कार्य प्रोफाइल ध्वनी"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"वैयक्तिक प्रोफाइल ध्वनी वापरा"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"कार्य आणि वैयक्तिक प्रोफाइलसाठी ध्वनी सारखे आहेत"</string>
@@ -3349,17 +3348,12 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> ते <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"कॉल"</string>
-    <!-- no translation found for zen_mode_calls_title (623395033931747661) -->
-    <skip />
+    <string name="zen_mode_calls_title" msgid="623395033931747661">"कॉलची अनुमती द्या"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"ज्या वेळी व्यत्यय आणू नका सुरू असते, तेव्हा येणारे कॉल ब्लॉक होतात. तुम्ही सेटिंग्ज मध्ये बदल करून तुमच्या मित्रमैत्रिणींना, कुटुंबियांना आणि इतर संपर्कांना तुमच्यापर्यंत पोहोचण्याची अनुमती देऊ शकता."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"तारांकित संपर्क"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">आणि <xliff:g id="NUM_PEOPLE">%d</xliff:g> इतर</item>
-      <item quantity="other">आणि <xliff:g id="NUM_PEOPLE">%d</xliff:g> इतर</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"मेसेज"</string>
-    <!-- no translation found for zen_mode_messages_title (7729380010396411129) -->
-    <skip />
+    <string name="zen_mode_messages_title" msgid="7729380010396411129">"मेसेजची अनुमती द्या"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"मेसेज"</string>
     <string name="zen_mode_selected_messages" msgid="1047355526202106114">"काही मेसेज"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"कोणाहीकडून"</string>
@@ -3373,19 +3367,15 @@
     <string name="zen_mode_media" msgid="8808264142134422380">"मीडिया"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"स्पर्श ध्वनी"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"स्मरणपत्रे"</string>
-    <!-- no translation found for zen_mode_reminders_title (2345044406347406902) -->
-    <skip />
+    <string name="zen_mode_reminders_title" msgid="2345044406347406902">"रिमाइंडरची अनुमती द्या"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"इव्हेंट"</string>
-    <!-- no translation found for zen_mode_events_title (5597241655883329085) -->
-    <skip />
+    <string name="zen_mode_events_title" msgid="5597241655883329085">"इव्हेंटची अनुमती द्या"</string>
     <string name="zen_mode_all_callers" msgid="2378065871253871057">"कोणीही"</string>
     <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"संपर्क"</string>
     <string name="zen_mode_starred_callers" msgid="1023167821338514140">"तारांकित केलेले संपर्क"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"नियमित कॉलर"</string>
-    <!-- no translation found for zen_mode_repeat_callers_title (8553876328249671783) -->
-    <skip />
-    <!-- no translation found for zen_mode_calls_summary_one (3972333792749874863) -->
-    <skip />
+    <string name="zen_mode_repeat_callers_title" msgid="8553876328249671783">"पुन्हा कॉल करणाऱ्यांची अनुमती द्या"</string>
+    <string name="zen_mode_calls_summary_one" msgid="3972333792749874863">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> कडून"</string>
     <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> आणि <xliff:g id="CALLERT_TPYE">%2$s</xliff:g> कडून"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"एकाच व्यक्तीने <xliff:g id="MINUTES">%d</xliff:g> मिनिटांच्या आत दुसर्‍या वेळी कॉल केल्यास"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"कस्टम"</string>
@@ -3442,10 +3432,10 @@
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"पिन आवश्यक?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"पॅटर्न आवश्यक?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"पासवर्ड आवश्यक?"</string>
-    <string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"या डिव्हाइसचा प्रारंभ करण्यासाठी तुम्ही आपला पिन एंटर करता, तेव्हा <xliff:g id="SERVICE">%1$s</xliff:g> सारख्या सेवांची प्रवेशयोग्यता उपलब्धता असणार नाही."</string>
+    <string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"या डिव्हाइसचा प्रारंभ करण्यासाठी तुम्ही तुमचा पिन एंटर करता, तेव्हा <xliff:g id="SERVICE">%1$s</xliff:g> सारख्या सेवांची प्रवेशयोग्यता उपलब्धता असणार नाही."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"हे डिव्हाइस सुरू करण्यासाठी तुम्ही तुमचा पॅटर्न एंटर करता, तेव्हा <xliff:g id="SERVICE">%1$s</xliff:g> सारख्या सेवांची प्रवेशयोग्यता उपलब्ध असणार नाही."</string>
-    <string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"या डिव्हाइसचा प्रारंभ करण्यासाठी तुम्ही आपला पासवर्ड एंटर करता, तेव्हा <xliff:g id="SERVICE">%1$s</xliff:g> सारख्या सेवांची प्रवेशयोग्यता उपलब्ध असणार नाही."</string>
-    <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"टीप: रीबूट केल्यानंतर, तुम्ही आपला फोन अनलॉक करे पर्यंत हे अॅप सुरू होऊ शकत नाही"</string>
+    <string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"या डिव्हाइसचा प्रारंभ करण्यासाठी तुम्ही तुमचा पासवर्ड एंटर करता, तेव्हा <xliff:g id="SERVICE">%1$s</xliff:g> सारख्या सेवांची प्रवेशयोग्यता उपलब्ध असणार नाही."</string>
+    <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"टीप: रीबूट केल्यानंतर, तुम्ही तुमचा फोन अनलॉक करे पर्यंत हे अॅप सुरू होऊ शकत नाही"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI माहिती"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"IMEI सापेक्ष माहिती"</string>
     <string name="slot_number" msgid="3762676044904653577">"(स्लॉट<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3528,7 +3518,7 @@
     <string name="default_for_work" msgid="9152194239366247932">"कार्यासाठी डीफॉल्ट"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"सहाय्य आणि व्हॉइस इनपुट"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"साहाय्य अ‍ॅप"</string>
-    <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> ला आपला साहाय्यक बनवायचे?"</string>
+    <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> ला तुमचा साहाय्यक बनवायचे?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"आपल्‍या स्क्रीनवर दृश्‍यमान असलेली किंवा अॅप्समध्‍ये प्रवेश करण्‍यायोग्य माहितीसह, आपल्‍या सिस्टम वरील वापरात असलेल्या अॅप्सविषयी माहिती वाचण्‍यात साहाय्यक सक्षम असेल."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"सहमत आहे"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"सहमत नाही"</string>
@@ -3573,7 +3563,7 @@
     <string name="high_power_on" msgid="6216293998227583810">"ऑप्टिमाइझ न केलेले"</string>
     <string name="high_power_off" msgid="3393904131961263278">"बॅटरी वापर ऑप्टिमाइझ करत आहे"</string>
     <string name="high_power_system" msgid="7362862974428225301">"बॅटरी ऑप्टिमायझेशन उपलब्ध नाही"</string>
-    <string name="high_power_desc" msgid="6283926163708585760">"बॅटरी ऑप्टिमायझेशन वापरू नका. आपली बॅटरी अधिक द्रुतपणे संपवू शकते."</string>
+    <string name="high_power_desc" msgid="6283926163708585760">"बॅटरी ऑप्टिमायझेशन वापरू नका. तुमची बॅटरी अधिक द्रुतपणे संपवू शकते."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"अॅप नेहमी पार्श्वभूमीत चालू द्यायचे?"</string>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"<xliff:g id="APP_NAME">%1$s</xliff:g> नेहमी पार्श्वभूमीमध्ये चालू दिल्याने बॅटरीचे आयुर्मान कमी होऊ शकते. \n\nतुम्ही हे नंतर सेटिंग्ज &gt; अ‍ॅप्स आणि सूचना मधून बदलू शकता."</string>
     <string name="battery_summary" msgid="8044042095190688654">"शेवटच्या पूर्ण चार्जनंतर <xliff:g id="PERCENTAGE">%1$s</xliff:g> वापर"</string>
@@ -3691,7 +3681,7 @@
     <string name="camera_gesture_title" msgid="1075838577642393011">"कॅमेर्‍यासाठी दोनदा वळवा"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"तुमचे मनगट दोनदा वळवून कॅमेरा अॅप उघडा"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"कॅमेर्‍यासाठी पॉवर बटण दोनदा दाबा"</string>
-    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"आपली स्क्रीन अनलॉक न करता कॅमेरा द्रुतपणे उघडा"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"तुमची स्क्रीन अनलॉक न करता कॅमेरा द्रुतपणे उघडा"</string>
     <string name="screen_zoom_title" msgid="5233515303733473927">"डिस्प्ले आकार"</string>
     <string name="screen_zoom_short_summary" msgid="7291960817349834688">"स्क्रीन वरील आयटम आणखी मोठे किंवा आणखी लहान करा"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"डिस्प्ले घनता, स्क्रीन झूम, मापन, मापन करत आहे"</string>
@@ -3791,10 +3781,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"छान रंगाचे तापमान"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"आणखी छान डिस्प्ले रंग वापरा"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"रंग बदल लागू करण्यासाठी, स्क्रीन बंद करा"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"कनेक्टिव्हिटी मॉनिटर"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"कनेक्टिव्हिटी समस्‍या आल्‍यावर कनेक्टिव्हिटी मॉनिटर लॉग गोळा करेल आणि वापरकर्त्‍याला बग फाइल करण्‍यासाठी सूचनेचे संकेत देईल"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"कनेक्टिव्हिटी मॉनिटर बदल लागू करण्‍यासाठी, डिव्हाइस रीबूट करा"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"कॅमेरा लेझर सेंसर"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"डीफॉल्ट म्हणून लॉजिकल कॅमेरा"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"स्वयंचलित सिस्टम अपडेट"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"डिव्हाइस रीस्टार्ट झाल्यानंतर अपडेट लागू करा"</string>
     <string name="usage" msgid="2977875522080448986">"वापर"</string>
@@ -3952,16 +3940,16 @@
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> सेकंद</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> सेकंद</item>
     </plurals>
-    <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"संचय व्यवस्थापित करा"</string>
+    <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"स्टोरेज व्यवस्थापित करा"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"स्टोरेज स्थान मोकळे करण्यात मदत करण्यासाठी, स्टोरेज व्यवस्थापक तुमच्या डिव्हाइस वरून बॅक अप घेतलेले फोटो आणि व्हिडिओ काढतो."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"फोटो आणि व्हिडिओ काढा"</string>
-    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"संचय व्यवस्थापक"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"स्टोरेज व्यवस्थापक"</string>
     <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"स्टोरेज व्यवस्थापक वापरा"</string>
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"स्वयंचलित"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"व्यक्तिचलित"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"आता स्थान मोकळे करा"</string>
     <string name="gesture_preference_title" msgid="5280023307132819052">"जेश्चर"</string>
-    <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"आपला फोन नियंत्रित करण्यासाठी जलद जेश्चर"</string>
+    <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"तुमचा फोन नियंत्रित करण्यासाठी जलद जेश्चर"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"तुमचे टॅबलेट नियंत्रित करण्यासाठी जलद जेश्चर"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"तुमचे डिव्हाइस नियंत्रित करण्यासाठी जलद जेश्चर"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"कॅमेर्‍यावर जा"</string>
@@ -4003,7 +3991,7 @@
     <string name="web_action_section_title" msgid="7364647086538399136">"इन्स्टंट अ‍ॅप्स"</string>
     <string name="instant_apps_settings" msgid="8827777916518348213">"इंस्टंट अ‍ॅप्स प्राधान्ये"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"इंस्टॉल केलेले अॅप्स"</string>
-    <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"आपला संचय आता संचय व्यवस्थापक व्यवस्थापित करत आहे"</string>
+    <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"तुमचा स्टोरेज आता स्टोरेज व्यवस्थापक व्यवस्थापित करत आहे"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> साठी खाती"</string>
     <string name="configure_section_header" msgid="7391183586410814450">"कॉन्फिगर करा"</string>
     <string name="auto_sync_account_title" msgid="898796354710116383">"डेटा आपोआप सिंक करा"</string>
@@ -4017,10 +4005,10 @@
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"व्यवस्थापित डिव्हाइस माहिती"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"आपल्‍या संस्‍थेद्वारे व्‍यवस्‍थापित बदल आणि सेटिंग्‍ज"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> द्वारे व्‍यवस्‍थापित बदल आणि सेटिंग्‍ज"</string>
-    <string name="enterprise_privacy_header" msgid="7402406406883832509">"आपल्या कार्य डेटामध्ये प्रवेश प्रदान करण्यासाठी, आपली संस्था सेटिंग्जमध्ये बदल करून आपल्या डिव्हाइसवर सॉफ्टवेअर इंस्टॉल करू शकते.\n\nअधिक तपशीलांसाठी, आपल्या संस्थेच्या प्रशासकाशी संपर्क साधा."</string>
-    <string name="enterprise_privacy_exposure_category" msgid="7313392680107938517">"आपली संस्था पाहू शकत असलेल्या माहितीचे प्रकार"</string>
+    <string name="enterprise_privacy_header" msgid="7402406406883832509">"आपल्या कार्य डेटामध्ये प्रवेश प्रदान करण्यासाठी, तुमची संस्था सेटिंग्जमध्ये बदल करून आपल्या डिव्हाइसवर सॉफ्टवेअर इंस्टॉल करू शकते.\n\nअधिक तपशीलांसाठी, आपल्या संस्थेच्या प्रशासकाशी संपर्क साधा."</string>
+    <string name="enterprise_privacy_exposure_category" msgid="7313392680107938517">"तुमची संस्था पाहू शकत असलेल्या माहितीचे प्रकार"</string>
     <string name="enterprise_privacy_exposure_changes_category" msgid="9079283547182933771">"आपल्या संस्थेच्या प्रशासकाने केलेले बदल"</string>
-    <string name="enterprise_privacy_device_access_category" msgid="5423434164248819058">"आपला या डिव्हाइसमधील प्रवेश"</string>
+    <string name="enterprise_privacy_device_access_category" msgid="5423434164248819058">"तुमचा या डिव्हाइसमधील प्रवेश"</string>
     <string name="enterprise_privacy_enterprise_data" msgid="2773968662865848413">"आपल्या कार्य खात्यासह संबद्ध असलेला डेटा़ जसे की, ईमेल आणि कॅलेंडर"</string>
     <string name="enterprise_privacy_installed_packages" msgid="2313698828178764590">"आपल्या डिव्हाइसवरील अ‍ॅप्सची सूची"</string>
     <string name="enterprise_privacy_usage_stats" msgid="4398411405572759370">"प्रत्येक अ‍ॅपमध्ये वापरलेला वेळ आणि डेटा यांचे प्रमाण"</string>
@@ -4104,20 +4092,24 @@
     <string name="autofill_app" msgid="7338387238377914374">"स्वयं-भरण सेवा"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"स्वयं, भरा, स्वयंभरण"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;तुमचा या अॅपवर विश्वास असल्याचे निश्चित करा&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; ऑटोफिल काय होऊ शकते हे ठरवण्यासाठी तुमच्या स्क्रीनवर काय आहे याचा वापर करते."</string>
-    <string name="device_theme" msgid="4571803018917608588">"डिव्हाइस थीम"</string>
+    <string name="color_theme" msgid="1535685696756738324">"रंगांची थीम"</string>
     <string name="default_theme" msgid="7085644992078579076">"डीफॉल्ट"</string>
+    <string name="device_theme" msgid="4571803018917608588">"डिव्हाइस थीम"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"आपोआप (वॉलपेपरवर आधारित)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"फिकी"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"गडद"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"नेटवर्कचे नाव"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"स्टेटस बारमध्ये नेटवर्क नाव प्रदर्शित करा"</string>
-    <string name="storage_manager_indicator" msgid="1516810749625915020">"संचय व्यवस्थापक: <xliff:g id="STATUS">^1</xliff:g>"</string>
+    <string name="storage_manager_indicator" msgid="1516810749625915020">"स्टोरेज व्यवस्थापक: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"बंद"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"चालू"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"इन्सटंट अॅप"</string>
-    <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"संचय व्यवस्थापक बंद करायचा?"</string>
+    <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"स्टोरेज व्यवस्थापक बंद करायचा?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"चित्रपट आणि टीव्ही अॅप्स"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"वाहक तरतूद माहिती"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"वाहक तरतूद ट्रिगर करा"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"व्यत्यय आणू नका अपडेट करा"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"लक्ष केंद्रित केलेले राहण्यासाठी सूचना लपवा"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"लक्ष केंद्रित केलेले राहण्यासाठी सूचना थांंबवा"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"नवीन आणि रोमांचक असे काय आहे?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"तुमच्या नवीन फोनबद्दल माहिती देणार्‍या सफरीवर चला"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"तुमच्या नवीन टॅबलेटबद्दल माहिती देणार्‍या सफरीवर चला"</string>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index c6e944b..f6a3cf7 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Sentiasa hidup"</item>
     <item msgid="6385301106124765323">"Sentiasa mati"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 98a2429..81ed2f6 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Benarkan tablet anda berkomunikasi dengan peranti Bluetooth yang berdekatan"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Benarkan peranti anda berkomunikasi dengan peranti Bluetooth yang berdekatan"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Benarkan telefon anda berkomunikasi dengan peranti Bluetooth yang berdekatan"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Lmphkn lps mtn perkakasan A2DP Bluetooth"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Mulakan Sml Peranti?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Mulakan semula peranti untuk menukar tetapan ini."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Mulakn sml"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Batal"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Peranti media yang tersedia"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Peranti panggilan yang tersedia"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Tersambung pada masa ini"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Pilihan sambungan"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Peranti yang tersambung sebelum ini"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Disambungkan sebelum ini"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Tarikh &amp; masa"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Pilih zon masa"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Port yang anda taipkan tidak sah."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proksi HTTP digunakan oleh penyemak imbas tetapi tidak boleh digunakan oleh aplikasi lain."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"URL PAC: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Lebar Jalur DL (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Lebar Jalur UL (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Maklumat Lokasi Selular (ditamatkan):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Maklumat Selular Jiran (ditamatkan):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Konfigurasi Saluran Fizikal LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Kadar Muat Semula Maklumat Selular:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Semua Maklumat Ukuran Selular:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Maklumat Masa Nyata Sambungan Data:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Perkhidmatan Data:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Perayauan:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan automatik"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Angkat untuk bangunkan"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Paparan ambien"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Sentiasa hidup/Penggunaan bateri bertambah"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Pemberitahuan baharu"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Waktu untuk tunjukkan"</string>
     <string name="doze_title" msgid="2375510714460456687">"Pemberitahuan baharu"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Aktifkan skrin apabila anda menerima pemberitahuan"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">Kod PIN SIM tidak betul. Anda ada <xliff:g id="NUMBER_0">%d</xliff:g> cubaan lagi sebelum anda harus menghubungi pembawa anda untuk membuka kunci peranti.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Operasi PIN SIM gagal!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status tablet"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Status telefon"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Kemas kini sistem"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versi Android"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Penggunaan latar belakang tidak boleh dihadkan"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Hadkan aktiviti latar belakang?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Jika anda mengehadkan aktiviti latar belakang untuk apl, fungsi apl itu mungkin terganggu"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Apl ini tidak boleh dihadkan kerana tidak ditetapkan untuk mengoptimumkan bateri.\n\nHidupkan pengoptimuman bateri dahulu."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Penggunaan skrin sejak cas penuh"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Penggunaan skrin"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Pengimbasan rangkaian mudah alih"</string>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Isyarat dail kecemasan"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Tetapkan tingkah laku semasa membuat panggilan kecemasan"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Sandaran"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Hidup"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Mati"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Sandarkan &amp; pulihkan"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Data peribadi"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Sandarkan data saya"</string>
@@ -2761,6 +2766,12 @@
       <item quantity="one">Semak sijil</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Berbilang pengguna"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Pengguna &amp; profil"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Tambah pengguna atau profil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Tambah pengguna"</string>
@@ -2943,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"penggunaan data"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"tempat liputan"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Peranti yang disambungkan"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, mod memandu, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, mod memandu"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apl &amp; pemberitahuan"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Kebenaran, apl lalai"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Akaun"</string>
@@ -2967,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"pelancar, lalai, apl"</string>
     <string name="keywords_display" msgid="8910345814565493016">"skrin, skrin sentuh"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"malapkan skrin, skrin sentuh, bateri, cerah"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"malapkan skrin, skrin sentuh, bateri"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"malapkan skrin, malam, seri warna, peralihan malam, kecerahan, warna skrin, warna"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"latar belakang, peribadikan, sesuaikan paparan"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"saiz teks"</string>
@@ -3008,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"rangkaian, keadaan rangkaian mudah alih, keadaan perkhidmatan, kekuatan isyarat, jenis rangkaian mudah alih, perayauan, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"nombor siri, versi perkakasan"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"tahap tampung keselamatan android, versi jalur dasar, versi inti"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Paparan ambien, Paparan skrin kunci"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"cap jari"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"putar, balikkan, putaran, potret, landskap, orientasi, menegak, mendatar"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"tingkatkan, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, jadual, pemberitahuan, sekat, kesenyapan, getar, tidur, kerja, fokus, bunyi, redam, hari, hari dalam minggu, hujung minggu, malam minggu, acara"</string>
@@ -3092,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Benarkan isyarat visual"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Apabila Jangan Ganggu dihidupkan"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Pemberitahuan"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Tunjukkan pemberitahuan secara senyap"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Pemberitahuan akan diredamkan"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Tiada bunyi daripada pemberitahuan"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Anda akan melihat pemberitahuan pada skrin"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Apabila pemberitahuan diterima, telefon anda tidak akan berbunyi atau bergetar."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Sembunyikan pemberitahuan"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Anda tidak akan melihat pemberitahuan baharu atau sedia ada"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Tiada visual atau bunyi daripada pemberitahuan"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Anda tidak akan melihat atau mendengar pemberitahuan"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Telefon anda tidak akan menunjukkan pemberitahuan baharu atau sedia ada dan tidak akan berbunyi atau bergetar. Pemberitahuan tidak akan muncul apabila anda meleret ke bawah dari bahagian atas skrin anda.\n\nJangan lupa, pemberitahuan kritikal untuk aktiviti dan status telefon masih dipaparkan."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Tersuai"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Dayakan tetapan tersuai"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Alih keluar tetapan tersuai"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Akan dipaparkan"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Tiada bunyi daripada pemberitahuan"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Disembunyikan sebahagiannya"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Disembunyikan"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Tiada visual atau bunyi daripada pemberitahuan"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Sekatan tersuai"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Apabila skrin dihidupkan"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Apabila skrin dimatikan"</string>
@@ -3162,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Diredamkan, tetapi benarkan <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> dan <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mesej, acara &amp; peringatan"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Apabila Jangan Ganggu Dihidupkan, mesej, peringatan dan acara akan diredamkan, kecuali item yang anda benarkan di atas. Anda boleh melaraskan tetapan mesej untuk membenarkan rakan, keluarga atau kenalan lain menghubungi anda."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Selesai"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Tetapan"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Tiada visual atau bunyi daripada pemberitahuan"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Tiada bunyi daripada pemberitahuan"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Anda tidak akan melihat atau mendengar pemberitahuan. Panggilan daripada kenalan yang dibintangi dan pemanggil berulang dibenarkan."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Tetapan semasa)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Tukar tetapan pemberitahuan Jangan Ganggu?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Bunyi profil kerja"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Gunakan bunyi profil peribadi"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Bunyi yang digunakan sama untuk profil kerja dan peribadi"</string>
@@ -3346,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Benarkan panggilan"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Apabila Jangan Ganggu dihidupkan, panggilan masuk disekat. Anda boleh melaraskan tetapan untuk membenarkan rakan, keluarga atau kenalan lain menghubungi anda."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Kenalan dibintangi"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">dan <xliff:g id="NUM_PEOPLE">%d</xliff:g> yang lain</item>
-      <item quantity="one">dan seorang lagi</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mesej"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Benarkan mesej"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Mesej"</string>
@@ -3779,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Suhu warna sejuk"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gunakan warna paparan yang lebih sejuk"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Untuk mengenakan perubahan warna, matikan skrin"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor akan mengumpulkan log apabila mengesan masalah kesambungan dan memaparkan pemberitahuan kepada pengguna untuk memfailkan pepijat."</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Untuk menggunakan perubahan connectivity monitor, but semula peranti"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Penderia Laser Kamera"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Kamera Logik Sebagai Lalai"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Kemas kini sistem automatik"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Gunakan kemas kini apabila peranti dimulakan semula"</string>
     <string name="usage" msgid="2977875522080448986">"Penggunaan"</string>
@@ -4092,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Perkhidmatan autolengkap"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"auto, lengkap, autolengkap"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Pastikan anda mempercayai apl ini&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; menggunakan item yang terdapat pada skrin anda untuk menentukan perkara yang boleh dilengkapkan secara automatik."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Tema peranti"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Tema warna"</string>
     <string name="default_theme" msgid="7085644992078579076">"Lalai"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Tema peranti"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automatik (berdasarkan kertas dinding)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Cerah"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Gelap"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Nama rangkaian"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Paparkan nama rangkaian dalam bar status"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Pengurus Storan: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4105,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Maklumat Peruntukan Pembawa"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Cetus Peruntukan Pembawa"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Kemas Kini Jangan Ganggu"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Sembunyikan pemberitahuan untuk mengekalkan tumpuan"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Jeda pemberitahuan untuk mengekalkan tumpuan"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Apakah yang baharu dan menarik?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Teroka telefon baharu anda"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Teroka tablet baharu anda"</string>
diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml
index b0eea8d..2033e7d 100644
--- a/res/values-my/arrays.xml
+++ b/res/values-my/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"အမြဲတမ်း ဖွင့်ထားခြင်း"</item>
     <item msgid="6385301106124765323">"အမြဲပိတ်ခြင်း"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index f9dc6a3..81e16fc 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"သင့်တက်ဘလက်အား အနီးအနားရှိ \'ဘလူးတုသ်\' စက်ပစ္စည်းများနှင့် ချိတ်ဆက်ခွင့်ပေးသည်"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"သင့်စက်ပစ္စည်းအား အနီးအနားရှိ \'ဘလူးတုသ်\' စက်ပစ္စည်းများနှင့် ချိတ်ဆက်ခွင့်ပေးသည်"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"သင့်ဖုန်းအား အနီးအနားရှိ \'ဘလူးတုသ်\' စက်ပစ္စည်းများနှင့် ချိတ်ဆက်ခွင့်ပေးသည်"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"ဘလူးတုသ် A2DP ဟာ့ဒ်ဝဲဖြုတ်ခြင်း ပိတ်ရန်"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"စက်ပြန်စတင်မလား။"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"ဤဆက်တင်ကိုပြောင်းရန် သင့်စက်ကို ပြန်စတင်ရပါမည်။"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"ပြန်စရန်"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"မလုပ်တော့"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"ရနိုင်သည့် မီဒီယာစက်များ"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"ရနိုင်သည့် ခေါ်ဆိုရန်စက်များ"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"လောလောဆယ် ချိတ်ဆက်ထားခြင်း"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"ချိတ်ဆက်မှု ဦးစားပေးများ"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"ယခင်က ချိတ်ဆက်ထားသော စက်များ"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"ယခင်က ချိတ်ဆက်ထားသော"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"ရက်စွဲနှင့် အချိန်"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"အချိန်ဇုန်အား ရွေးချယ်ခြင်း"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"သင်ရိုက်ထည့်သော ပို့ နံပါတ် မှာ မဆီလျော်ပါ"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP ပရောက်စီကို ဘရောင်ဇာက အသုံးပြုသော်လည်း တခြားအက်ပ်များက အသုံးပြု၍မရနိုင်ပါ။"</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL မြန်နှုန်း (kbps)−"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL မြန်နှုန်း (kbps)−"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"ဆဲလ်လူလာတည်နေရာ အချက်အလက် (ကန့်ကွက်ထားသည်) −"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"အနီးတဝိုက်ရှိ ဆဲလ်လူလာအချက်အလက် (ကန့်ကွက်ထားသည်) −"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE ရုပ်ပိုင်းဆိုင်ရာ ချန်နယ်စီစဉ်သတ်မှတ်မှု−"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"ဆဲလ်လူလာ အချက်အလက် ရယူမှုနှုန်း −"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"ဆဲလ်လူလာတိုင်းတာမှု အချက်အလက် အားလုံး −"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"ဒေတာချိတ်ဆက်မှု အချိန်နှင့်တစ်ပြေးညီ အချက်အလက် −"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"ဒေတာ ဝန်ဆောင်မှု −"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"ပြင်ပကွန်ရက်နှင့် ချိတ်ဆက်ခြင်း"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"အလိုအလျောက်အလင်းချိန်ခြင်း။"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"နှိုးပေးဖို့ မ’ယူရန်"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"ဝန်းကျင်ပြသမှု"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"အမြဲဖွင့်ထားရန် / ဘက်ထရီအသုံးပြုမှု တိုးလာသည်"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"အကြောင်းကြားချက်အသစ်များ"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ပြသရမည့်အချိန်"</string>
     <string name="doze_title" msgid="2375510714460456687">"အကြောင်းကြားချက်အသစ်များ"</string>
     <string name="doze_summary" msgid="3846219936142814032">"အကြောင်းကြားချက်များ လက်ခံရရှိချိန်တွင် ဖန်သားပြင်ကို နှိုးပါ"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">ဆင်းမ်ကဒ်၏ ပင်နံပါတ် မှားနေပါသည်၊ သင့်ကိရိယာကို ဖွင့်ရန်  မိုဘိုင်းဖုန်းဆက်သွယ်ရေးဝန်ဆောင်မှုဌာနသို့ မဆက်သွယ်မီ သင့်တွင် <xliff:g id="NUMBER_0">%d</xliff:g>  ခါ ကြိုးစားခွင့် ကျန်ပါသေးသည်။</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"ဆင်းမ်ကဒ် ပင်လုပ်ငန်းဆောင်ရွက်မှု မအောင်မြင်ပါ!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"တက်ဘလက်အခြေအနေ"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"ဖုန်းအခြေအနေ"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"စနစ်အားတိုးမြင့်ခြင်း"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android ဗားရှင်း"</string>
@@ -2434,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"အရေးပေါ် ဖုန်းခေါ်ခြင်း လိုင်းအား"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"အရေးပေါ်ခေါ်ဆိုမှုအတွက် လုပ်ဆောင်ပုံကို သတ်မှတ်ရန်"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"မိတ္တူကူးရန်"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"ဖွင့်ထားသည်"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"ပိတ်ထားသည်"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"အရန်ပြုလုပ်ခြင်းနှင့် ပြန်လည်ရယူခြင်း"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"ကိုယ်ရေးအချက်အလက်"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"ကျွန်ုပ်ဒေတာများကို အရန်ထားခြင်း"</string>
@@ -2760,6 +2766,12 @@
       <item quantity="one">အသိအမှတ်ပြုလက်မှတ်ကို စစ်ဆေးပါ</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"အသုံးပြုသူများစွာ"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"သုံးစွဲသူများ &amp;ကိုယ်ရေးအချက်အလက်များ"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"သုံးစွဲသူ သို့မဟုတ် ပရိုဖိုင်ကို ထည့်ရန်"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"အသုံးပြုသူကို ထည့်ရန်"</string>
@@ -2942,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"‌‌ဒေတာသုံးစွဲမှု"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"ဟော့စပေါ့"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"ချိတ်ဆက် စက်များ"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"ဘလူးတုသ်၊ ကားမောင်းနေသည်၊ NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"ဘလူးတုသ်၊ ကားမောင်းနေသည်"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"ဘလူးတုသ်၊ NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"ဘလူးတုသ်"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"အက်ပ်နှင့်အကြောင်းကြားချက်"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ခွင့်ပြုချက်များ၊ မူရင်းအက်ပ်များ"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"အကောင့်များ"</string>
@@ -2966,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"launcher၊ မူရင်း၊ အက်ပ်များ"</string>
     <string name="keywords_display" msgid="8910345814565493016">"မျက်နှာပြင်၊ ထိတွေ့မှုမျက်နှာပြင်"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"မှိန်သောမျက်နှာပြင်၊ ထိတွေ့မှုမျက်နှာပြင်၊ ဘက်ထရီ၊ တောက်ပသည်"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"မှိန်သောမျက်နှာပြင်၊ ထိတွေ့မှုမျက်နှာပြင်၊ ဘက်ထရီ"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"မှိန်သောမျက်နှာပြင်၊ ည၊ အရောင်သန်းခြင်း၊ ညဆိုင်း၊ တောက်ပမှု၊ မျက်နှာပြင်အရောင်၊ အရောင်၊ အရောင်"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"နောက်ခံ၊ မိမိစိတ်ကြိုက်၊ ပြုပြင်ထားသော မြင်ကွင်း"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"စာလုံးအရွယ်အစား"</string>
@@ -3007,8 +3014,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"ကွန်ရက်၊ မိုဘိုင်း ကွန်ရက်၊ ဝန်ဆောင်မှု အခြေအနေ၊ ထုတ်လွှင့်မှု အချက်ပြ၊ မိုဘိုင်း ကွန်ရက် အမျိုးအစား၊ ရိုမင်း၊ iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"အမှတ်စဉ်၊ ဟာ့ဒ်ဝဲ ဗားရှင်း"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android လုံခြုံရေး ပက်ချ် အဆင့်၊ baseband ဗားရှင်း၊ kernel ဗားရှင်း"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"ဝန်းကျင်ကို ပြကွက်၊ လော့ခ်ချထားချိန် မျက်နှာပြင်"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"လက်ဗွေ"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"မျက်နှာပြင် အမှိန်၊ တို့ထိမျက်နှာပြင်၊ ဘက်ထရီ၊ အဆင့်မြင့် တောက်ပမှု၊ အားကောင်းသောတောက်ပမှု"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"လှည့်သည်၊ လှန်ခြင်း၊ လှည့်ခြင်း၊ ထောင်လိုက်၊ အလျားလိုက်၊ အနေအထား၊ ထောင်လိုက်၊ ရေပြင်ညီ"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"အဆင့်မြှင့်တင်ရန်၊ android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd၊ အစီအစဉ်၊ အကြောင်းကြားချက်များ၊ အသံတိတ်၊ တုန်ခါခြင်း၊ နားခြင်း၊ အလုပ်၊ ပြတ်သားအောင် ချိန်ခြင်း၊ အသံ၊ အသံတိတ်ရန်၊ နေ့၊ ကြားရက်၊ စနေတနင်္ဂနွေ၊ ကြားရက်ည၊ အစီအစဉ်"</string>
@@ -3091,18 +3101,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"ပြသမှုများကို ခွင့်ပြုရန်"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"\'မနှောင့်ယှက်ရ\' ကို ဖွင့်ထားသည့်အခါ"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"အကြောင်းကြားချက်များ"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"အကြောင်းကြားချက်များကို တိတ်ဆိတ်စွာပြပါ"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"အကြောင်းကြားချက်များကို ပိတ်ထားပါမည်"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"အကြောင်းကြားချက်များအတွက် အသံ မဖွင့်ရန်"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"အကြောင်းကြားချက်များကို သင်၏ မျက်နှာပြင်ပေါ်တွင် မြင်ရပါမည်"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"အကြောင်းကြားချက်များ လာသည့်အခါ သင့်ဖုန်း အသံထွက်ခြင်း သို့မဟုတ် တုန်ခါခြင်း လုပ်မည်မဟုတ်ပါ"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"အကြောင်းကြားများကို ဖျောက်ထားရန်"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"အသစ် သို့မဟုတ် ရှိနှင့်ပြီး အကြောင်းကြားချက်များကို မြင်ရမည်မဟုတ်ပါ"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"အကြောင်းကြားချက်များအတွက် ရုပ်ပုံ သို့မဟုတ် အသံ မဖွင့်ရန်"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"အကြောင်းကြားချက်များကို မြင်ရ သို့မဟုတ် ကြားရမည် မဟုတ်ပါ"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"သင့်ဖုန်းသည် အသစ် သို့မဟုတ် ရှိနှင့်ပြီး အကြောင်းကြားချက်များကို ပြသမည်မဟုတ်ပါ။ ထို့ပြင် အသံ သို့မဟုတ် တုန်ခါမှုလည်း ပြုလုပ်မည်မဟုတ်ပါ။ မျက်နှာပြင်၏ ထိပ်မှ ပွတ်ဆွဲချသည့်အခါ အကြောင်းကြားချက်များ ပေါ်လာမည်မဟုတ်ပါ။\n\nဖုန်းလုပ်ဆောင်ချက်နှင့် အခြေအနေအတွက် အရေးကြီး အကြောင်းကြားချက်များ ဆက်လက်၍ပေါ်နေမည်ကို သတိပြုပါ။"</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"စိတ်ကြိုက်"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"စိတ်ကြိုက် ဆက်တင်ကို ဖွင့်ရန်"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"စိတ်ကြိုက်ဆက်တင်ကို ဖယ်ရှားရန်"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"ပေါ်လာမည်"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"အကြောင်းကြားချက်များအတွက် အသံ မဖွင့်ရန်"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"တစ်စိတ်တစ်ပိုင်း ဖျောက်ထားသည်"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"ဖျောက်ထားသည်"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"အကြောင်းကြားချက်များအတွက် ရုပ်ပုံ သို့မဟုတ် အသံ မဖွင့်ရန်"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"စိတ်ကြိုက် ကန့်သတ်ချက်များ"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"မျက်နှာပြင် ဖွင့်ထားချိန်"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"မျက်နှာပြင် ပိတ်ထားချိန်"</string>
@@ -3161,19 +3171,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"ပိတ်ထားသော်လည်း <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>၊ <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> နှင့် <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> ကို ခွင့်ပြုသည်"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"မက်ဆေ့ဂျ်၊ အစီအစဉ်နှင့် သတိပေးချက်များ"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"\'မနှောင့်ယှက်ရ\' ဖွင့်ထားသည့်အခါ မက်ဆေ့ဂျ်၊ သတိပေးချက်နှင့် အစီအစဉ်များကို ပိတ်ထားပါမည်။ သင့်မိတ်ဆွေများ၊ မိသားစု သို့မဟုတ် အခြားအဆက်အသွယ်များက သင့်ကိုဆက်သွယ်နိုင်စေရန် မက်ဆေ့ဂျ်ဆက်တင်များကို ပြင်ဆင်နိုင်သည်။"</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"ပြီးပါပြီ"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"ဆက်တင်များ"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"အကြောင်းကြားချက်များအတွက် ရုပ်ပုံ သို့မဟုတ် အသံ မဖွင့်ရန်"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"အကြောင်းကြားချက်များမှ အသံ ကြားရမည် မဟုတ်ပါ"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"အကြောင်းကြားချက်များကို မြင်ရ သို့မဟုတ် ကြားရမည် မဟုတ်ပါ။ ကြယ်ပွင့်ပြထားသော အဆက်အသွယ်များနှင့် အကြိမ်ကြိမ် ခေါ်ဆိုသူများ၏ ဖုန်းခေါ်ဆိုမှုများကိုသာ ခွင့်ပြုပါမည်။"</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(လက်ရှိ ဆက်တင်)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"\'မနှောင့်ယှက်ရ\' အကြောင်းကြားချက် ဆက်တင်များ ပြောင်းမလား။"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"အလုပ်ပရိုဖိုင်ဆိုင်ရာ အသံများ"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"ကိုယ်ရေးပရိုဖိုင်အသံကို သုံးပါ"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"အသံများသည် အလုပ်နှင့် ကိုယ်ပိုင်ပရိုဖိုင်များအတွက် အတူတူပင် ဖြစ်သည်"</string>
@@ -3345,10 +3349,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"ခေါ်ဆိုမှုများကို ခွင့်ပြုပါ"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"\'မနှောင့်ယှက်ရ\' ဖွင့်ထားသည့်အခါ အဝင်ခေါ်ဆိုမှုများကို ပိတ်ထားပါသည်။ သင့်မိတ်ဆွေများ၊ မိသားစု သို့မဟုတ် အခြားအဆက်အသွယ်များက သင့်ကိုဆက်သွယ်နိုင်စေရန် ဆက်တင်များကို ပြင်ဆင်နိုင်သည်။"</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"ကြယ်ပွင့်ပြထားသော အဆက်အသွယ်များ"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">နှင့် အခြား <xliff:g id="NUM_PEOPLE">%d</xliff:g> ဦး</item>
-      <item quantity="one">နှင့် အခြား ၁ ဦး</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"မက်ဆေ့ဂျ်များ"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"မက်ဆေ့ဂျ်များကို ခွင့်ပြုပါ"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"မက်ဆေ့ဂျ်များ"</string>
@@ -3778,10 +3779,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"အေးသည့် အရောင်အပူချိန်"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ပိုအေးသည့် မျက်နှာပြင် အရောင်များကိုအသုံးပြုရန်"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"အရောင်ပြောင်းလဲမှု ပြုလုပ်ရန်၊ မျက်နှာပြင်ကိုပိတ်ပါ"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"ချိတ်ဆက်မှုကို စောင့်ကြည့်ခြင်း"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ချိတ်ဆက်မှုတွင် ပြဿနာရှိနေလျှင် ချိတ်ဆက်မှုကို စောင့်ကြည့်ခြင်းစနစ်က မှတ်တမ်းကို စုဆောင်းပြီး ချွတ်ယွင်းချက်ကို အကြောင်းကြားရန် အသုံးပြုသူအား အသိပေးပါမည်။"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"ချိတ်ဆက်မှုအခြေအနေကို စောင့်ကြပ်ကြည့်ရှုခြင်းစနစ်အား အပြောင်းအလဲ ပြုလုပ်ရန် စက်ပစ္စည်းကို ပြန်လည်စတင်ပါ"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Camera လေဆာ အာရုံခံကိရိယာ"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Logical Camera ကို မူရင်းအဖြစ် သတ်မှတ်ခြင်း"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"အလိုအလျောက် စနစ်အပ်ဒိတ်များ"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"စက်ပစ္စည်းပြန်လည်စတင်သည့်အခါ အပ်ဒိတ်များကို ထည့်သွင်းပါ"</string>
     <string name="usage" msgid="2977875522080448986">"အသုံးပြုမှု"</string>
@@ -4091,8 +4090,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"အော်တိုဖြည့် ဝန်ဆောင်မှု"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"အလိုအလျောက်၊ ဖြည့်စွက်ခြင်း၊ အလိုအလျောက် ဖြည့်စွက်ခြင်း"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;သင်သည် ဤအက်ပ်ကို ယုံကြည်စိတ်ချရပါကြောင်း သေချာပါစေ&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; သည် သင်၏မျက်နှာပြင်ပေါ်ရှိ အရာများကို အသုံးပြု၍ မည်သည့်အရာများကို အော်တိုဖြည့်နိုင်ကြောင်း ဆုံးဖြတ်သည်။"</string>
-    <string name="device_theme" msgid="4571803018917608588">"စက်ပစ္စည်း အပြင်အဆင်"</string>
+    <string name="color_theme" msgid="1535685696756738324">"အရောင် အပြင်အဆင်"</string>
     <string name="default_theme" msgid="7085644992078579076">"မူရင်း"</string>
+    <string name="device_theme" msgid="4571803018917608588">"စက်ပစ္စည်း အပြင်အဆင်"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"အလိုအလျောက် (နောက်ခံပုံကို အခြေခံပြီး)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"အလင်း"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"အမှောင်"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"ကွန်ရက် အမည်"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"ကွန်ရက် အမည်ကို အခြေအနေပြနေရာတွင် ပြပါ"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"သိုလှောင်ခန်း စီမံခန့်ခွဲမှုစနစ်− <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4104,7 +4107,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"ဝန်ဆောင်မှုပေးသူက ပေးထားသည့် အချက်အလက်များ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Carrier Provisioning"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"\'မနှောင့်ယှက်ရ\' ကို အပ်ဒိတ်လုပ်ခြင်း"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"အာရုံစူးစိုက်နိုင်စေရန် အကြောင်းကြားချက်များ ဖျောက်ထားသည်"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"အာရုံစူးစိုက်နိုင်ရန် အကြောင်းကြားချက်များကို ခေတ္တရပ်ထားပါ"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"စိတ်လှုပ်ရှားဖွယ်ရာ အသစ်အဆန်း ရှိပါသလား။"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"သင်၏ဖုန်းအသစ်ကို လေ့လာကြည့်ရှုပါ"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"သင်၏တက်ဘလက်အသစ်ကို လေ့လာကြည့်ရှုပါ"</string>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index e14b60c..d9d91b2 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Alltid på"</item>
     <item msgid="6385301106124765323">"Alltid av"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index c086b53..d9d0e06 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Tillat at nettbrettet ditt kommuniserer med Bluetooth-enheter i nærheten"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Tillat at enheten din kommuniserer med Bluetooth-enheter i nærheten"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Tillat at telefonen din kommuniserer med Bluetooth-enheter i nærheten"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Slå av Bluetooth-A2DP-maskinvareavlasting"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Start enhet på nytt?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Du må starte enheten din på nytt for å endre innstillingen."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Start på nytt"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Avbryt"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Tilgjengelige medieenheter"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Tilgjengelige ringeenheter"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Tilkoblet nå"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Tilkoblingsinnstillinger"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Enheter som har vært tilkoblet tidligere"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Tidligere tilkoblet"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Dato og klokkeslett"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Velg tidssone"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Angitt port er ikke gyldig."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP-proxy-tjeneren brukes av nettleseren, men kan ikke brukes av andre apper."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC-nettadresse: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Båndbredde for nedlasting (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Båndbredde for opplasting (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Informasjon om celleposisjonen (avviklet):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Informasjon om nabocelle (avviklet):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Konfigurering av fysisk LTE-kanal:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Innlastingsfrekvens for cellleinformasjon:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"All informasjon for cellemåling:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Informasjon om datatilkobling i sanntid:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Datatjeneste:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Aktiver enheten med løftebevegelser"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Passiv skjerm"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Alltid på / økt batteribruk"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nye varsler"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Når den skal vises"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nye varsler"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Skjermen vekkes når du mottar varsler"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">Feil PIN-kode for SIM-kortet. Du har <xliff:g id="NUMBER_0">%d</xliff:g> forsøk igjen før du må kontakte operatøren din for å låse opp enheten.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"PIN-koden for SIM-kortet ble avvist."</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status for nettbrettet"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefonstatus"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Systemoppdateringer"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android-versjon"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Bruk i bakgrunnen kan ikke begrenses"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Vil du begrense bakgrunnsaktivitet?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Hvis du begrenser bakgrunnsaktivitet for en app, kan det oppstå problemer"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Du kan ikke begrense appen siden den ikke er satt til å optimalisere batteriet.\n\nFor å begrense appen, slå på batterioptimalisering."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Skjermbruk siden batteriet var fulladet"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Strømforbruk fra skjermen"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Skanning etter mobilnettverk"</string>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Ringesignal for nødssituasjoner"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Velg oppførsel når en nødsamtale opprettes"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Sikkerhetskopiering"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"På"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Av"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Sikkerhetskopier og gjenopprett"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personlige data"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Sikkerhetskopiér data"</string>
@@ -2761,6 +2766,12 @@
       <item quantity="one">Sjekk sertifikatet</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Flere brukere"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Brukere og profiler"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Legg til en bruker eller profil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Legg til bruker"</string>
@@ -2943,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"databruk"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"Wi-Fi-sone"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Tilkoblede enheter"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, kjøremodus, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, kjøremodus"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apper og varsler"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Tillatelser, standardapper"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Kontoer"</string>
@@ -2967,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"appoversikt, standard, apper"</string>
     <string name="keywords_display" msgid="8910345814565493016">"skjerm, berøringsskjerm"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"dim skjermen, berøringsskjerm, batteri, lys"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"dim skjermen, berøringsskjerm, batteri"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"dim skjermen, natt, fargetone, natteendring, lysstyrke, skjermfarge, farge"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"bakgrunn, gi personlig preg, tilpass skjermen"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tekststørrelse"</string>
@@ -3008,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"nettverk, status for mobilnettverk, servicestatus, signalstyrke, mobilnettverkstype, roaming, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"serienummer, maskinvareversjon"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"nivå av sikkerhetsoppdatering i Android, basisbåndversjon, kjerneversjon"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Passiv skjerm, låseskjerm"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"fingeravtrykk"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"rotér, vend, rotasjon, stående, liggende, retning, vertikal, horisontal"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"oppgrader, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"ikke forstyrr, oversikt, varsler, blokkér, demp, vibrer, hvilemodus, jobb, fokuser, lyd, kutt lyden, dag, ukedag, helg, hverdagskveld, aktivitet"</string>
@@ -3092,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Tillat visuelle signaler"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Når «Ikke forstyrr» er på"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Varsler"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Vis varsler uten lyd"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Varsler blir ignorert"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Ingen lyd fra varsler"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Du ser varsler på skjermen"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Når du mottar varsler, kommer ikke telefonen til å lage lyd eller vibrere."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Skjul varsler"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Du ser ikke nye eller eksisterende varsler"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Ingen lyder eller visuelle elementer fra varsler"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Du kommer ikke til å se eller høre varsler"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Telefonen din viser ikke nye eller eksisterende varsler og kommer ikke til å lage lyd eller vibrere. Varsler vises ikke når du sveiper nedover fra toppen av skjermen.\n\nHusk at kritiske varsler for telefonaktivitet og -status fremdeles vises."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Tilpasset"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Slå på tilpasset innstilling"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Fjern tilpasset innstilling"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Vises"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Ingen lyd fra varsler"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Delvis skjult"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Skjult"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Ingen lyder eller visuelle elementer fra varsler"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Tilpassede begrensninger"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Når skjermen er på"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Når skjermen er av"</string>
@@ -3162,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Ignorert, men tillat <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> og <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Meldinger, aktiviteter og påminnelser"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Når «Ikke forstyrr» er på, ignoreres meldinger, påminnelser og aktiviteter, med unntak av elementene du tillater ovenfor. Du kan justere meldingsinnstillinger for å la venner, familie eller andre kontakter nå deg."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Ferdig"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Innstillinger"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Ingen lyder eller visuelle elementer fra varsler"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Ingen lyd fra varsler"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Du kommer ikke til å se eller høre varsler. Anrop fra stjernemerkede kontakter og gjentatte oppringere tillates."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Gjeldende innstilling)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Vil du endre innstillinger for varsler for «Ikke forstyrr»?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Lyder i jobbprofilen"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Bruk personlig profil-lyder"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Lydene er like for jobbprofilen og den personlige profilen"</string>
@@ -3346,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Tillat anrop"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Når «Ikke forstyrr» er på, blir innkommende anrop blokkert. Du kan justere innstillinger for å la venner, familie eller andre kontakter nå deg."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Stjernemerkede kontakter"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">og <xliff:g id="NUM_PEOPLE">%d</xliff:g> andre</item>
-      <item quantity="one">og 1 annen</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Meldinger"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Tillat meldinger"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Meldinger"</string>
@@ -3779,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Kald fargetemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Bruk kaldere skjermfarger"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"For å bruke fargeendringen, slå av skjermen"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Tilkoblingsmonitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Tilkoblingsmonitoren loggfører problemer som oppdages med tilkoblingen, og varsler brukeren om å sende inn en feilrapport"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Start enheten på nytt for å aktivere endringene i tilkoblingsmonitoren"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameraets lasersensor"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Logisk kamera som standard"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatiske systemoppdateringer"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Bruk oppdateringer når enheten starter på nytt"</string>
     <string name="usage" msgid="2977875522080448986">"Bruk"</string>
@@ -4092,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Autofylltjeneste"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"auto, fyll, autofyll"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Sørg for at appen er pålitelig&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google autofyll&gt;%1$s&lt;/xliff:g&gt; bruker det som er på skjermen til å fastslå hva som kan fylles ut automatisk."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Enhetstema"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Fargetema"</string>
     <string name="default_theme" msgid="7085644992078579076">"Standard"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Enhetstema"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automatisk (basert på bakgrunn)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Lys"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Mørk"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Nettverksnavn"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Vis nettverksnavn i statusfeltet"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Lagringsadministrator: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4105,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informasjon om operatørhåndtering"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Utløs operatørhåndtering"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Oppdater «Ikke forstyrr»"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Skjul varsler for å holde deg fokusert"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Sett varsler på pause for å holde deg fokusert"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Hva er nytt og spennende?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Få en innføring i den nye telefonen din"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Få en innføring i det nye nettbrettet ditt"</string>
diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml
index 6347c43..d767ba0 100644
--- a/res/values-ne/arrays.xml
+++ b/res/values-ne/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"४"</item>
+    <item msgid="5900372418924184351">"०"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"सधैँ सक्रिय"</item>
     <item msgid="6385301106124765323">"सधैँ निष्क्रिय"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index d4e5a1e..08706ad 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"आफ्नो ट्याब्लेटलाई वरपरका ब्लुटुथ यन्त्रहरूसँग सञ्चार गर्न दिनुहोस्"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"आफ्नो यन्त्रलाई वरपरका ब्लुटुथ यन्त्रहरूसँग सञ्चार गर्न दिनुहोस्"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"आफ्नो फोनलाई वरपरका ब्लुटुथ यन्त्रहरूसँग सञ्चार गर्न दिनुहोस्"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"ब्लुटुथ A2DP हार्डवेयरको अफलोड असक्षम पार्नुहोस्"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"यन्त्र पुनः सुरु गर्ने हो?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"यो सेटिङ परिवर्तन गर्न तपाईंले आफ्नो यन्त्र पुनः सुरु गर्नु पर्छ।"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"पुन: सुरु गर्नु…"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"रद्द गर्नु…"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"मिडियासम्बन्धी सुविधा भएका उपलब्ध यन्त्रहरू"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"कल गर्ने सुविधा भएका उपलब्ध यन्त्रहरू"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"हाल जडान अवस्थामा छ"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"जडानसम्बन्धी प्राथमिकताहरू"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"यसअघि जडान भएका यन्त्रहरू"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"यसअघि जडान भएका यन्त्रहरू"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"मिति र समय"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"समय क्षेत्र चयन गर्नुहोस्"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"तपाईंले टाइप गर्नुभएको पोर्ट मान्य छैन।"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP प्रोक्सी ब्राउजरद्वारा प्रयोग गरिन्छ तर अन्य अनुप्रयोगहरूद्वारा प्रयोग गर्न नसकिने पनि हुन सक्छ।"</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL ब्यान्डविथ (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL व्यान्डविथ (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"सेलको स्थान बारे जानकारी (प्रचलनमा नरहेको):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"छिमेकीको सेल बारे जानकारी (प्रचलनमा नरहेको):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE को भौतिक च्यानलको कन्फिगरेसन:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"सेल सम्बन्धी जानकारीलाई पुन:ताजा गरिने आवृत्ति:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"सेलको मापन सम्बन्धी सबै जानकारी:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"डेटामा जडान बारे वास्तविक समयमा जानकारी:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"डेटा सम्बन्धी सेवा:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"रोमिङ:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -402,7 +410,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"तपाईंको फोन अनलक वा खरिदहरूको अनुमोदन गर्न आफ्नो फिंगरप्रिन्ट प्रयोग गर्नुहोस्।\n\nटिपोट: तपाईंको फिंगरप्रिन्ट भरपर्दो ढाँचा वा PIN भन्दा कम सुरक्षित हुनसक्छ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"रद्द गर्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"जारी राख्नुहोस्"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"छाड्नुहोस्"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"छोड्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"अर्को"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"फिंगरप्रिन्ट सेटअप छाड्ने हो?"</string>
     <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"फिंगरप्रिन्ट सेटअप गर्न केवल एक वा दुई मिनेट लाग्छ। छाड्नु भएको खण्डमा, तपाईं सेटिङहरूमा गएर पछि आफ्नो फिंगरप्रिन्ट थप्न सक्नुहुन्छ।"</string>
@@ -1007,16 +1015,11 @@
     <string name="emergency_address_title" msgid="932729250447887545">"आपतकालीन ठेगाना"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"तपाईंले Wi‑Fi मार्फत आपतकालीन कल गर्दा उक्त ठेगानालाई तपाईंको स्थानको रूपमा प्रयोग गरिन्छ"</string>
     <string name="private_dns_help_message" msgid="3299567069152568958">"DNS का सुविधाहरूबारे "<annotation id="url">"थप जान्नुहोस्"</annotation></string>
-    <!-- no translation found for wifi_calling_pref_managed_by_carrier (6845711858866828986) -->
-    <skip />
-    <!-- no translation found for wifi_calling_settings_activation_instructions (7492509632478260955) -->
-    <skip />
-    <!-- no translation found for wifi_calling_turn_on (1171403510313983983) -->
-    <skip />
-    <!-- no translation found for wifi_calling_not_supported (7878640438907807754) -->
-    <skip />
-    <!-- no translation found for carrier (5264014738689761132) -->
-    <skip />
+    <string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"सेवा प्रदायकद्वारा व्यवस्थापन गरिएको सेटिङ"</string>
+    <string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Wi-Fi कलिङ सक्रिय गर्नुहोस्"</string>
+    <string name="wifi_calling_turn_on" msgid="1171403510313983983">"Wi-Fi कलिङ सक्रिय गर्नुहोस्"</string>
+    <string name="wifi_calling_not_supported" msgid="7878640438907807754">"%1$s मा Wi-Fi कलिङ समर्थित छैन"</string>
+    <string name="carrier" msgid="5264014738689761132">"सेवा प्रदायक"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"प्रदर्शन"</string>
     <string name="sound_settings" msgid="5534671337768745343">"आवाज"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"भोल्युम"</string>
@@ -1151,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"स्वचालित उज्यालोपना"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"चालु गर्न उठाउनुहोस्"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"एम्बियन्ट प्रदर्शन"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"सधैँ सक्रिय / ब्याट्रीको बढेको उपयोग"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"नयाँ सूचनाहरू"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"देखाउने समय"</string>
     <string name="doze_title" msgid="2375510714460456687">"नयाँ सूचनाहरू"</string>
     <string name="doze_summary" msgid="3846219936142814032">"सूचनाहरू प्राप्त हुँदा स्क्रिनलाई सक्रिय गर्नुहोस्"</string>
@@ -1197,8 +1198,6 @@
       <item quantity="one">SIM PIN कोड गलत छ, तपाईंले अाफ्नो यन्त्र खोल्नलाई तपाईंको वाहकसँग सम्पर्क गर्नै पर्न अघि तपाईंसँग <xliff:g id="NUMBER_0">%d</xliff:g> पटक प्रयास बाँकी छ।</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM PIN कार्य बिफल भयो!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"ट्याब्लेट वस्तुस्थिति"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"फोनको स्थिति"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"प्रणाली  अद्यावधिकहरू"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"एन्ड्रोइड संस्करण"</string>
@@ -2119,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"पृष्ठभूमिको प्रयोगमा प्रतिबन्ध लगाउन सकिँदैन"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"पृष्ठभूमिको गतिविधिलाई सीमित गर्ने हो?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"तपाईंले कुनै अनुप्रयोगको पृष्ठभूमिको गतिविधिलाई सीमित गर्नुभयो भने यसले सही तरिकाले काम नगर्न सक्छ"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"यो अनुप्रयोगलाई ब्याट्री अप्टिमाइज गर्न भनी सेट नगरिएको हुनाले तपाईं यसमा बन्देज लगाउन सक्नुहुन्न।\n\nअनुप्रयोगमा बन्देज लगाउन पहिले ब्याट्री अप्टिमाइजेसन सुविधा सक्रिय गर्नुहोस्।"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"पूर्ण चार्ज भएदेखि स्क्रिनको प्रयोग"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"स्क्रिनले गरेको पावरको खपत"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"मोबाइल नेटवर्क स्क्यान गर्ने कार्य"</string>
@@ -2440,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"इमर्जेन्सी डाइलिङसम्बन्धी सङ्केत"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"आपातकालीन कल राखिएको बेलाको व्यवहार सेट गर्नुहोस्"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"ब्याकअप"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"सक्रिय छ"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"निष्क्रिय छ"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"ब्याकअप र पुनःस्थापना गर्नुहोस्"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"व्यक्तिगत डेटा"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"मेरो डेटा ब्याकअप गर्नुहोस्।"</string>
@@ -2766,6 +2766,12 @@
       <item quantity="one">प्रमाणपत्रलाई जाँच गर्नुहोस्</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"बहु प्रयोगकर्ताहरू"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"प्रयोगकर्ता र प्रोफाइलहरू"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"प्रयोगकर्ता वा प्रोफाइल थप गर्नुहोस्"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"प्रयोगकर्ता थप्नुहोस्"</string>
@@ -2948,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"डेटाको प्रयोग"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"हटस्पट"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"जडान गरिएका यन्त्रहरू"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"ब्लुटुथ, ड्राइभिङ मोड, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"ब्लुटुथ, ड्राइभिङ मोड"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"ब्लुटुथ, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"ब्लुटुथ"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"अनुप्रयोग तथा सूचनाहरू"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"अनुमतिहरू, पूर्वनिर्धारित अनुप्रयोगहरू"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"खाताहरू"</string>
@@ -2972,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"लन्चर, पूर्वनिर्धारित, अनुप्रयोगहरू"</string>
     <string name="keywords_display" msgid="8910345814565493016">"स्क्रिन, टचस्क्रिन"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"मधुरो स्क्रिन, टचस्क्रिन, ब्याट्री, चहकिलो"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"मधुरो स्क्रिन, टचस्क्रिन, ब्याट्री"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"मधुरो स्क्रिन, रात, टिन्ट, रात्रि ड्युटी, उज्यालोपन, स्क्रिनको रङ, रङ"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"पृष्ठभूमि, निजीकृत गर्नुहोस्, प्रदर्शन आफू अनुकूल गर्नुहोस्"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"पाठ आकार"</string>
@@ -3013,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"नेटवर्क, मोबाइल नेटवर्कको स्थिति, सेवाको स्थिति, सिग्नलको क्षमता, मोबाइल नेटवर्कको प्रकार, रोमिङ, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"क्रम संख्या, हार्डवेयरको संस्करण"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android को सुरक्षासम्बन्धी प्याचको स्तर, बेसब्यान्ड संस्करण, कर्नेल संस्करण"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"परिवेशको प्रदर्शन, लक स्क्रिनको प्रदर्शन"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"फिंगरप्रिन्ट"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"घुमाउनुहोस्, पल्टाउनुहोस्, परिक्रमा, पोर्ट्रेट, ल्यान्डस्केप, अभिमुखीकरण, ठाडो, तेर्सो"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"स्तरवृद्धि गर्नुहोस्, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, समयतालिका, सूचनाहरू, रोक लगाउनुहोस्, माैन, कम्पन, शयन अवस्थामा लानुहोस्, कार्य, फोकस, आवाज, म्युट गर्नुहोस्, दिन, काम गर्ने दिन, सप्ताहान्त, काम गर्ने रात, कार्यक्रम"</string>
@@ -3097,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"सङ्केतहरूलाई देखिन दिनुहोस्"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"बाधा नपुर्‍याउनुहोस् मोड सक्रिय भएका बेला"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"सूचनाहरू"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"सूचनाहरूलाई मौन रूपमा देखाउनुहोस्"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"सूचनाहरू म्युट गरिने छन्"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"सूचनाहरूको कुनै पनि ध्वनि छैन"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"तपाईं आफ्नो स्क्रिनमा सूचनाहरू देख्नु हुने छ"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"सूचनाहरू आउँदा तपाईंको फोनले आवाज निकाल्ने वा कम्पन गर्ने छैन।"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"सूचनाहरू लुकाउनुहोस्"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"तपाईं नयाँ वा विद्यमान सूचनाहरू देख्नु हुने छैन"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"सूचनाहरूको कुनै पनि भिजुअल वा ध्वनि छैन"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"तपाईं सूचनाहरू देख्न वा सुन्न सक्नु हुने छैन।"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"तपाईंको फोनले नयाँ वा विद्यमान सूचनाहरू देखाउने, आवाज निकाल्ने वा कम्पन गर्ने छैन। तपाईंले आफ्नो स्क्रिनको माथिल्लो भागबाट तल स्वाइप गर्दा सूचनाहरू देखिने छैनन्।\n\nयाद राख्नुहोस्, फोनको गतिविधि तथा स्थितिसम्बन्धी महत्त्वपूर्ण सूचनाहरू अझै पनि देखिने छन्।"</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"आफू अनुकूल"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"आफू अनुकूल सेटिङ सक्षम पार्नुहोस्‌"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"आफू अनुकूल सेटिङ हटाउनुहोस्‌"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"देखा पर्ने छ"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"सूचनाहरूको कुनै पनि ध्वनि छैन"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"आंशिक रूपमा लुकेको"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"लुकेको"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"सूचनाहरूको कुनै पनि भिजुअल वा ध्वनि छैन"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"आफू अनुकूल बन्देजहरू"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"स्क्रिन सक्रिय रहेको अवस्थामा"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"स्क्रिन निष्क्रिय रहेको अवस्थामा"</string>
@@ -3167,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"म्युट गरिएको छ, तर <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> र <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> लाई अनुमति दिनुहोस्"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"सन्देश, कार्यक्रम तथा रिमाइन्डरहरू"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"बाधा नपुर्‍याउनुहोस् मोड सक्रिय भएका बेला तपाईंले माथि अनुमति दिनुभएका वस्तुहरूबाहेक सन्देश, रिमाइन्डर तथा कार्यक्रमहरूलाई म्युट गरिने छ। तपाईं आफ्ना साथीभाइ, परिवारजन वा अन्य सम्पर्कहरूलाई आफूसँग सम्पर्क राख्न दिने गरी सन्देशसम्बन्धी सेटिङहरू समायोजन गर्न सक्नुहुन्छ।"</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"सम्पन्न भयो"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"सेटिङहरू"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"सूचनाहरूको कुनै पनि भिजुअल वा ध्वनि छैन"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"सूचनाहरूको कुनै पनि ध्वनि छैन"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"तपाईं सूचनाहरू देख्न वा सुन्न सक्नु हुने छैन। ताराङ्कित सम्पर्क ठेगाना तथा बारम्बार कल गर्ने व्यक्तिका कलहरू।"</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(हालको सेटिङ)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"बाधा नपुर्याउनुहोस् नामक मोडका सूचनासम्बन्धी सेटिङहरू बदल्ने हो?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"कार्य प्रोफाइलका ध्वनिहरू"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"व्यक्तिगत प्रोफाइलका ध्वनिहरूको प्रयोग गर्नुहोस्"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"कार्य र व्यक्तिगत दुवै प्रोफाइलका लागि आवाज उही नै हो"</string>
@@ -3348,17 +3347,12 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g>बाट <xliff:g id="END">%2$s</xliff:g>सम्म"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"कलहरू"</string>
-    <!-- no translation found for zen_mode_calls_title (623395033931747661) -->
-    <skip />
+    <string name="zen_mode_calls_title" msgid="623395033931747661">"कलहरूलाई अनुमति दिनुहोस्"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"बाधा नपुर्‍याउनुहोस् मोड सक्रिय भएका बेला आगमन कलहरूमाथि रोक लगाइन्छ। तपाईं आफ्ना साथीभाइ, परिवारजन वा अन्य सम्पर्कहरूलाई आफूसँग सम्पर्क राख्न दिने गरी सेटिङहरू समायोजन गर्न सक्नुहुन्छ।"</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"ताराङ्कित सम्पर्कहरू"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">र <xliff:g id="NUM_PEOPLE">%d</xliff:g> अन्य</item>
-      <item quantity="one">र १ अन्य</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"सन्देशहरू"</string>
-    <!-- no translation found for zen_mode_messages_title (7729380010396411129) -->
-    <skip />
+    <string name="zen_mode_messages_title" msgid="7729380010396411129">"सन्देशहरूलाई अनुमति दिनुहोस्"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"सन्देशहरू"</string>
     <string name="zen_mode_selected_messages" msgid="1047355526202106114">"केही सन्देशहरू"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"कसैबाट"</string>
@@ -3372,19 +3366,15 @@
     <string name="zen_mode_media" msgid="8808264142134422380">"मिडिया"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"छुवाइसम्बन्धी ध्वनि"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"रिमान्डरहरू"</string>
-    <!-- no translation found for zen_mode_reminders_title (2345044406347406902) -->
-    <skip />
+    <string name="zen_mode_reminders_title" msgid="2345044406347406902">"रिमाइन्डरहरूलाई अनुमति दिनुहोस्"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"कार्यक्रमहरू"</string>
-    <!-- no translation found for zen_mode_events_title (5597241655883329085) -->
-    <skip />
+    <string name="zen_mode_events_title" msgid="5597241655883329085">"कार्यक्रमहरूलाई अनुमति दिनुहोस्"</string>
     <string name="zen_mode_all_callers" msgid="2378065871253871057">"जोसुकै"</string>
     <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"सम्पर्क ठेगानाहरू"</string>
     <string name="zen_mode_starred_callers" msgid="1023167821338514140">"ताराङ्कित सम्पर्कहरू"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"कलरहरू दोरोर्‍याउनुहोस्"</string>
-    <!-- no translation found for zen_mode_repeat_callers_title (8553876328249671783) -->
-    <skip />
-    <!-- no translation found for zen_mode_calls_summary_one (3972333792749874863) -->
-    <skip />
+    <string name="zen_mode_repeat_callers_title" msgid="8553876328249671783">"दोहोरिएका कल गर्ने व्यक्तिहरूलाई अनुमति दिनुहोस्"</string>
+    <string name="zen_mode_calls_summary_one" msgid="3972333792749874863">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> देखि"</string>
     <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> र <xliff:g id="CALLERT_TPYE">%2$s</xliff:g> का कलहरू"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"एउटै व्यक्तिले <xliff:g id="MINUTES">%d</xliff:g> मिनेटको अवधिमा दोस्रो पटक कल गरेको खण्डमा"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"आफू अनुकूल"</string>
@@ -3790,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"सुन्दर रंगको तापमान"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"अझ सुन्दर प्रदर्शनको रंगहरू प्रयोग गर्नुहोस्"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"रंगको परिवर्तन लागू गर्न स्क्रिन बन्द गर्नुहोस्"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"कनेक्टिभिटी मनिटर"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor ले प्रयोगकर्ताहरूलाई जडानसम्बन्धी कुनै समस्या पत्ता लगायो भने लगहरू सङ्कलन गरी बगबारे रिपोर्ट गर्न भनी सूचित गर्ने छ"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"कनेक्टिभिटी मनिटरमा गरिएको परिवर्तनलाई लागू गर्न यन्त्र पुनः बुट गर्नुहोस्"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"क्यामेरा लेजरको सेन्सर"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"लजिकल क्यामेरालाई पूर्वनिर्धारित क्यामेरा बनाउनुहोस्"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"स्वचालित प्रणाली अद्यावधिकहरू"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"यन्त्र पुनः सुरु भएपछि अद्यावधिकहरू लागू गर्नुहोस्"</string>
     <string name="usage" msgid="2977875522080448986">"उपयोग"</string>
@@ -4103,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"स्वतः भरण सेवा"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"स्वतः, भरण, स्वतः भरण"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;तपाईं यो अनुप्रयोगमाथि भरोसा गर्नुहुन्छ भन्ने कुरा पक्का गर्नुहोस्&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; यस अनुप्रयोगले स्वतः भर्नसकिने कुराहरूको निर्धारण गर्न तपाईंको स्क्रिनमा भएका वस्तुहरूको प्रयोग गर्छ।"</string>
-    <string name="device_theme" msgid="4571803018917608588">"यन्त्रको विषयवस्तु"</string>
+    <string name="color_theme" msgid="1535685696756738324">"रङको विषयवस्तु"</string>
     <string name="default_theme" msgid="7085644992078579076">"पूर्वनिर्धारित"</string>
+    <string name="device_theme" msgid="4571803018917608588">"यन्त्रको विषयवस्तु"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"स्वचालित (वालपेपरमा आधारित)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"उज्यालो"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"अँध्यारो"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"नेटवर्कको नाम"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"वस्तुस्थिति पट्टीमा नेटवर्कको नाम देखाउनुहोस्"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"भण्डारणको प्रबन्धक: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4116,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"सेवा प्रदायकको प्रावधान सम्बन्धी जानकारी"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"सेवा प्रदायकको प्रावधानलाई ट्रिगर गर्नुहोस्"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"बाधा नपुर्‍याउनुहोस्‌ नामक सेवालाई अद्यावधिक गर्नुहोस्‌"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"केन्द्रित रहन सूचनाहरू लुकाउनुहोस्"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"केन्द्रित रहन सूचनाहरू पज गर्नुहोस्"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"सेटिङहरूको गृहपृष्ठमा नयाँ र रोमाञ्चक के छ?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"आफ्नो नयाँ फोनको बारेमा राम्रोसँग जान्नुहोस्‌"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"आफ्नो नयाँ ट्याब्लेटको बारेमा राम्रोसँग जान्नुहोस्‌"</string>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index cfb42b4..5f1b292 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Altijd aan"</item>
     <item msgid="6385301106124765323">"Altijd uit"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index b640658..f339646 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Je tablet toestaan om te communiceren met Bluetooth-apparaten in de nabije omgeving"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Je apparaat toestaan om te communiceren met Bluetooth-apparaten in de nabije omgeving"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Je telefoon toestaan om te communiceren met Bluetooth-apparaten in de nabije omgeving"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Bluetooth A2DP-hardware-offload uitschakelen"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Apparaat herstarten?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Start het apparaat opnieuw op om de instelling te wijzigen."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Herstarten"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Annuleren"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Beschikbare media-apparaten"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Beschikbare apparaten voor oproepen"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Momenteel verbonden"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Verbindingsvoorkeuren"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Eerder verbonden apparaten"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Eerder verbonden"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Datum en tijd"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Een tijdzone kiezen"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"De poort die je hebt ingevoerd, is ongeldig."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"De HTTP-proxy wordt gebruikt door de browser, maar mogelijk niet door de andere apps."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL-bandbreedte (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL-bandbreedte (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Mobiele locatiegegevens (beëindigd):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Mobiele data voor locatie in de buurt (beëindigd):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Fysieke LTE-kanaalconfiguratie:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Vernieuwingsfrequentie van mobiele data:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Alle mobiele meetgegevens:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Realtime informatie over gegevensverbinding:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Gegevensservice:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI-nummer:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische helderheid"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Optillen om te activeren"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Inactieve display"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Altijd aan (hoger batterijverbruik)"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nieuwe meldingen"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Wanneer weergeven"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nieuwe meldingen"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Scherm activeren wanneer je meldingen ontvangt"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">Onjuiste pincode voor simkaart. Je hebt nog <xliff:g id="NUMBER_0">%d</xliff:g> poging over voordat je contact met je provider moet opnemen om je apparaat te ontgrendelen.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Bewerking met pincode voor simkaart mislukt."</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tabletstatus"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefoonstatus"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Systeemupdates"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android-versie"</string>
@@ -2434,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Noodoproepsignaal"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Gedrag bij noodoproepen instellen"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Back-up"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Aan"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Uit"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Back-up en herstel"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Persoonlijke gegevens"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Back-up maken van mijn gegevens"</string>
@@ -2760,6 +2766,12 @@
       <item quantity="one">Certificaat controleren</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Meerdere gebruikers"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Gebruikers en profielen"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Gebruiker of profiel toevoegen"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Gebruiker toevoegen"</string>
@@ -2942,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"datagebruik"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Verbonden apparaten"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, rijmodus, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, rijmodus"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps en meldingen"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Machtigingen, standaard-apps"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Accounts"</string>
@@ -2966,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"launcher, standaard, apps"</string>
     <string name="keywords_display" msgid="8910345814565493016">"scherm, touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"scherm dimmen, touchscreen, batterij, helder"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"scherm dimmen, touchscreen, batterij"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"scherm dimmen, nacht, tint, nachtdienst, helderheid, schermkleur, kleur, kleurstelling"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"achtergrond, personaliseren, weergave aanpassen"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tekstgrootte"</string>
@@ -3007,8 +3014,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"netwerk, status mobiel netwerk, servicestatus, signaalsterkte, type mobiel netwerk, roaming, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"serienummer, hardwareversie"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"niveau van android-beveiligingspatch, smalbandversie, kernel-versie"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Inactieve display, vergrendelingsscherm"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"vingerafdruk"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"scherm dimmen, touchscreen, batterij, slimme helderheid, dynamische helderheid"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"roteren, draaien, omdraaien, rotatie, portret, landschap, oriëntatie, verticaal, horizontaal, staand, liggend"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"upgrade, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, schema, meldingen, blokkeren, stil, trillen, slapen, werken, focus, geluid, dempen, dag, weekdag, weekend, doordeweekse avond, evenement, afspraak"</string>
@@ -3091,18 +3101,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Visuele signalen toestaan"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Wanneer \'Niet storen\' is ingeschakeld"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Meldingen"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Meldingen zonder geluid weergeven"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Meldingen worden gedempt"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Geen geluid van meldingen"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Je ziet meldingen op je scherm"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Wanneer er meldingen binnenkomen, laat je telefoon geen geluid horen en trilt deze niet"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Meldingen verbergen"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Je ziet geen nieuwe of bestaande meldingen"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Geen zichtbare of hoorbare meldingen"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Je ziet of hoort geen meldingen"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Je telefoon geeft geen nieuwe of bestaande meldingen weer, laat geen geluid horen en trilt niet. Er worden geen meldingen weergegeven wanneer je vanaf de bovenkant van het scherm omlaag veegt.\n\nHoud er rekening mee dat belangrijke meldingen voor telefoonactiviteit en -status nog wel steeds worden weergegeven."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Aangepast"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Aangepaste instelling inschakelen"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Aangepaste instelling verwijderen"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Worden weergegeven"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Geen geluid van meldingen"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Gedeeltelijk verborgen"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Verborgen"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Geen zichtbare of hoorbare meldingen"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Aangepaste beperkingen"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Wanneer het scherm is ingeschakeld"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Wanneer het scherm is uitgeschakeld"</string>
@@ -3161,19 +3171,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Gedempt, maar <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> , <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> en <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> wel toestaan"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Meldingen, afspraken en herinneringen"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Wanneer \'Niet storen\' is ingeschakeld, worden berichten, herinneringen en gebeurtenissen gedempt, met uitzondering van de items die je hierboven toestaat. Je kunt de instellingen aanpassen zodat je vrienden, gezinsleden of andere contacten je kunnen bereiken."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Klaar"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Instellingen"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Geen zichtbare of hoorbare meldingen"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Geen geluid van meldingen"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Je ziet of hoort geen meldingen. Oproepen van contacten met ster en terugkerende bellers zijn toegestaan."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Huidige instelling)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Instellingen voor meldingen in modus \'Niet storen\' wijzigen?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Geluiden voor werkprofiel"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Gebruik geluid persoonsprofiel"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Geluiden voor werkprofielen en persoonlijke profielen komen overeen"</string>
@@ -3345,10 +3349,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Oproepen toestaan"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Wanneer \'Niet storen\' is ingeschakeld, worden inkomende oproepen geblokkeerd. Je kunt de instellingen aanpassen zodat je vrienden, gezinsleden of andere contacten je kunnen bereiken."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Contacten met ster"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">en <xliff:g id="NUM_PEOPLE">%d</xliff:g> anderen</item>
-      <item quantity="one">en 1 andere</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Berichten"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Berichten toestaan"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Berichten"</string>
@@ -3778,10 +3779,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Koele kleurtemperatuur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Koelere weergavekleuren gebruiken"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Schakel het scherm uit om de kleurwijziging toe te passen"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"ConnectivityMonitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor verzamelt logboeken wanneer een connectiviteitsprobleem wordt gedetecteerd. De gebruiker krijgt een melding te zien waarin wordt gevraagd of hij een bug wil indienen."</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Start het apparaat opnieuw op om de wijziging in ConnectivityMonitor toe te passen"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Cameralasersensor"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Logische camera als standaard"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatische systeemupdates"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Updates toepassen wanneer apparaat opnieuw wordt opgestart"</string>
     <string name="usage" msgid="2977875522080448986">"Gebruik"</string>
@@ -4091,8 +4090,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Service voor automatisch aanvullen"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"auto, automatisch, invullen, aanvullen"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Zorg dat je deze app vertrouwt&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; maakt gebruik van de content op je scherm om te bepalen wat automatisch kan worden aangevuld."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Apparaatthema"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Kleurenthema"</string>
     <string name="default_theme" msgid="7085644992078579076">"Standaard"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Apparaatthema"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automatisch (op basis van achtergrond)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Licht"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Donker"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Netwerknaam"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Netwerknaam weergeven in statusbalk"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Opslagbeheer: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4104,7 +4107,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Gegevens voor providerregistratie"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Providerregistratie activeren"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"\'Niet storen\' updaten"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Meldingen verbergen om gefocust te blijven"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Meldingen onderbreken om gefocust te blijven"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Wat is er nieuw en interessant?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Een rondleiding volgen voor je nieuwe telefoon"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Een rondleiding volgen voor je nieuwe tablet"</string>
diff --git a/res/values-or/arrays.xml b/res/values-or/arrays.xml
index 2673aee..4169703 100644
--- a/res/values-or/arrays.xml
+++ b/res/values-or/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"ସର୍ବଦା ଅନ୍‌"</item>
     <item msgid="6385301106124765323">"ସର୍ବଦା ଅଫ୍"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 7dc03b8..845a4db 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -172,6 +172,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"ଆପଣଙ୍କର ଟାବଲେଟ୍‌କୁ ଆଖପାଖରେ ଥିବା ବ୍ଲୁ-ଟୂଥ୍‍ ଡିଭାଇସ୍ ସହ ଯୋଗାଯୋଗ କରିବାକୁ ଦିଅନ୍ତୁ"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"ଆପଣଙ୍କର ଡିଭାଇସ୍‌କୁ ଆଖପାଖରେ ଥିବା ବ୍ଲୁ-ଟୂଥ୍‍ ଡିଭାଇସ୍ ସହ ଯୋଗାଯୋଗ କରିବାକୁ ଦିଅନ୍ତୁ"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"ଆପଣଙ୍କର ଫୋନ୍‌କୁ ଆଖପାଖରେ ଥିବା ବ୍ଲୁ-ଟୂଥ୍‍ ଡିଭାଇସ୍ ସହ ଯୋଗାଯୋଗ କରିବାକୁ ଦିଅନ୍ତୁ"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Bluetooth A2DP ହାର୍ଡୱେର୍‍ ଅଫ୍‍ଲୋଡ୍‍ ଅକ୍ଷମ କରନ୍ତୁ"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"ଡିଭାଇସ୍‍ ରିଷ୍ଟାର୍ଟ କରିବେ କି?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"ଏହି ସେଟିଂ ବଦଳାଇବାକୁ ଆପଣଙ୍କୁ ଆପଣଙ୍କର ଡିଭାଇସ୍‍ ରିଷ୍ଟାର୍ଟ କରିବାକୁ ହେବ।"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"ପୁଣି ଆରମ୍ଭ କରନ୍ତୁ"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"କ୍ୟାନ୍ସଲ୍‍"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"ଉପଲବ୍ଧ ଥିବା ମେଡିଆ ଡିଭାଇସ୍"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"କଲ୍ କରିବା ପାଇଁ ସୁବିଧା ଉପଲବ୍ଧ ଥିବା ଡିଭାଇସ୍"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"ବର୍ତ୍ତମାନ କନେକ୍ଟ ଅଛି"</string>
@@ -181,6 +186,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"ନିଜ ପସନ୍ଦର କନେକ୍ସନ୍‍"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"ପୂର୍ବରୁ ଯୋଡ଼ିହୋ‌ଇଥିବା ଡିଭାଇସ୍"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"ପୂର୍ବରୁ କନେକ୍ଟ ହୋ‍ଇଛି"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"ତାରିଖ ଓ ସମୟ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"ସମୟ ଅଞ୍ଚଳ ବାଛନ୍ତୁ"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -206,11 +213,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"ଆପଣ ଟାଇପ୍‌ କରିଥିବା ପୋର୍ଟ ସଠିକ ନୁହେଁ।"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP ପ୍ରକ୍ସୀ ବ୍ରାଉଜର୍‌ ଦ୍ୱାରା ବ୍ୟବହୃତ ହୋଇଛି କିନ୍ତୁ ଅନ୍ୟ ଆପ୍‌ ଦ୍ୱାରା ବ୍ୟବହୃତ ନହୋଇପାରେ।"</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL ବ୍ୟାଣ୍ଡୱିଡଥ୍ (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL ବ୍ୟାଣ୍ଡୱିଡଥ୍ (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"ସେଲ୍ ଲୋକେଶନ୍‌ ସୂଚନା (ଅନୁରୋଧ କରାଯାଇଛି):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"ଆଖପାଖର ସେଲ୍‌ର ସୂଚନା (ବନ୍ଦ କରିଦିଆଯାଇଛି):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE ଫିଜିକାଲ୍‍ ଚ୍ୟାନେଲ୍‍ କନଫିଗରେଶନ୍‍:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"ସେଲ୍‌ ସୂଚନା ରିଫ୍ରେଶ୍ ଦର:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"ସମସ୍ତ ସେଲ୍‌ ପରିମାପ ସୂଚନା:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"ଡାଟା ସଂଯୋଗ ରିଅଲ୍-ଟାଇମ୍ ସୂଚନା:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"ଡାଟା ସେବା:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"ରୋମିଙ୍ଗ:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -995,16 +1003,11 @@
     <string name="emergency_address_title" msgid="932729250447887545">"ଜରୁରୀକାଳୀନ ଠିକଣା"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"ୱାଇ-ଫାଇ ମାଧ୍ୟମରେ ଆପଣ କୌଣସି ଆପାତକାଳୀନ କଲ୍‌ କରିବା ବେଳେ ଆପଣଙ୍କ ଲୋକେଶନ୍‌ ରୂପେ ବ୍ୟବହୃତ ହୋଇଥାଏ"</string>
     <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"ବ୍ୟକ୍ତିଗତ DNS ବୈଶିଷ୍ଟ୍ୟ ବିଷୟରେ"</annotation>" ଅଧିକ ଜାଣନ୍ତୁ"</string>
-    <!-- no translation found for wifi_calling_pref_managed_by_carrier (6845711858866828986) -->
-    <skip />
-    <!-- no translation found for wifi_calling_settings_activation_instructions (7492509632478260955) -->
-    <skip />
-    <!-- no translation found for wifi_calling_turn_on (1171403510313983983) -->
-    <skip />
-    <!-- no translation found for wifi_calling_not_supported (7878640438907807754) -->
-    <skip />
-    <!-- no translation found for carrier (5264014738689761132) -->
-    <skip />
+    <string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"ସେଟିଙ୍ଗ, କେରିଅର୍‍ଙ୍କ ଦ୍ଵାରା ପରିଚାଳିତ ହେଉଛି"</string>
+    <string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"ୱାଇ-ଫାଇ କଲିଙ୍ଗକୁ ସକ୍ରିୟ କରନ୍ତୁ"</string>
+    <string name="wifi_calling_turn_on" msgid="1171403510313983983">"ୱାଇ-ଫାଇ କଲିଙ୍ଗ ଚାଲୁ କରନ୍ତୁ"</string>
+    <string name="wifi_calling_not_supported" msgid="7878640438907807754">"%1$s ପାଇଁ ୱାଇ-ଫାଇ କଲିଙ୍ଗ ସପୋର୍ଟ କରୁନାହିଁ"</string>
+    <string name="carrier" msgid="5264014738689761132">"ନେଟ୍‍ୱର୍କ କେରିଅର୍"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ଡିସ୍‌ପ୍ଲେ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ସାଉଣ୍ଡ"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ଭଲ୍ୟୁମ୍‌"</string>
@@ -1139,8 +1142,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"ସ୍ୱଚାଳିତ ଉଜ୍ଜ୍ୱଳତା"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"ଉଠାଇଲେ ଜାଗ୍ରତ ହେବ"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"ହାଲୁକା ବାଦାମୀ ଡିସ୍‌ପ୍ଲେ"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"ସର୍ବଦା ଅନ୍‌ / ବର୍ଦ୍ଧିତ ବ୍ୟାଟେରୀ ବ୍ୟବହାର"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"ନୂଆ ବିଜ୍ଞପ୍ତି"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"କେତେବେଳେ ଦେଖାଇବ"</string>
     <string name="doze_title" msgid="2375510714460456687">"ନୂଆ ବିଜ୍ଞପ୍ତି"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ଆପଣ ବିଜ୍ଞପ୍ତି ପାଇବା ବେଳେ ସ୍କ୍ରୀନ୍‌କୁ ଜାଗ୍ରତ କରନ୍ତୁ"</string>
@@ -1185,8 +1186,6 @@
       <item quantity="one">SIMର PIN କୋଡ୍‌ଟି ଭୁଲ୍‌, ଆପଣଙ୍କ ଡିଭାଇସ୍‌ ଅନଲକ୍‌ କରିବାକୁ ଆପଣ ଆଉ <xliff:g id="NUMBER_0">%d</xliff:g> ଥର ପ୍ରୟାସ କରିପାରିବେ, ତା\'ପରେ ଆପଣଙ୍କୁ ନିଜ କେରିଅର୍‌ଙ୍କ ସହିତ ଯୋଗାଯୋଗ କରିବାକୁ ହେବ।</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"ସିମ୍‌ ପିନ୍‌ କାମ ବିଫଳ ହେଲା!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"ଟାବଲେଟ୍‌ ସ୍ଥିତି"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"ଫୋନ୍‌ର ଷ୍ଟାଟସ୍"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"ସିଷ୍ଟମ୍‌ ଅପଡେଟ୍‌‍"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android ଭର୍ସନ୍‌"</string>
@@ -2107,8 +2106,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"ବ୍ୟାକଗ୍ରାଉଣ୍ଡରେ ବ୍ୟବହାରକୁ ପ୍ରତିବନ୍ଧିତ କରିହେବ ନାହିଁ"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡ କାର୍ଯ୍ୟକଳାପ ସୀମିତ କରିବେ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"ଯଦି ଆପଣ ଗୋଟିଏ ଆପ୍‌ର ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡ କାର୍ଯ୍ୟକଳାପକୁ ସୀମିତ କରିବେ, ଏହା ଠିକ୍‍ ଭାବରେ କାମ କରିନପାରେ"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"ବ୍ୟାଟେରୀକୁ ଅପ୍ଟିମାଇଜ୍ କରିବା ପାଇଁ ଯେହେତୁ ଏହି ଆପ୍‍କୁ ସେଟ୍ କରାଯାଇନାହିଁ, ତେଣୁ ଆପଣ ଏହାକୁ ସୀମାବଦ୍ଧ କରିପାରିବେ ନାହିଁ। \n\nଆପ୍‍କୁ ସୀମାବଦ୍ଧ କରିବା ପାଇଁ ପ୍ରଥମେ ବ୍ୟାଟେରୀ ଅପ୍ଟିମାଇଜେଶନ୍‍କୁ ଚାଲୁ କରନ୍ତୁ।"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବା ପରଠାରୁ ସ୍କ୍ରୀନ୍‌ର ବ୍ୟବହାର"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"ସ୍କ୍ରୀନ୍‌ ବ୍ୟବହାର"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"ମୋବାଇଲ୍‌ ନେଟ୍‌ୱର୍କ ଖୋଜୁଛି"</string>
@@ -2428,6 +2426,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"ଆପାତକାଳୀନ ଡାଏଲିଙ୍ଗ ସିଗ୍ନାଲ୍"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"ଏକ ଜରୁରୀକାଳୀନ କଲ୍ କରୁଥିବାବେଳେ ଗତିବିଧି ସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"ବ୍ୟାକଅପ୍‌"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"ଅନ୍ ଅଛି"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"ଅଫ୍ ଅଛି"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"ବ୍ୟାକ୍‌ଅପ୍‌ ଓ ରିଷ୍ଟୋର୍‌"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"ବ୍ୟକ୍ତିଗତ ଡାଟା"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"ମୋ ଡାଟାର ବ୍ୟାକ୍‌ଅପ୍‌ ନିଅ"</string>
@@ -2754,6 +2754,12 @@
       <item quantity="one">ସର୍ଟିଫିକେଟ୍‌କୁ ଦେଖନ୍ତୁ</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"ଏକାଧିକ ୟୁଜର୍ସ"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"ଉପଯୋଗକର୍ତ୍ତା ଓ ପ୍ରୋଫାଇଲ୍‌"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ଉପଯୋଗକର୍ତ୍ତା ନହେଲେ ପ୍ରୋଫାଇଲ ଯୋଡ଼ନ୍ତୁ"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"ଉପଯୋଗକର୍ତ୍ତାଙ୍କୁ ଯୋଡ଼ନ୍ତୁ"</string>
@@ -2936,14 +2942,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ଡାଟା ଉପଯୋଗ"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"ହଟସ୍ପଟ୍‌"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"କନେକ୍ଟ ହୋଇଥିବା ଡିଭାଇସ୍‌"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"ବ୍ଲୁ-ଟୂଥ୍‍‌, ଡ୍ରାଇଭିଙ୍ଗ ମୋଡ୍, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"ବ୍ଲୁ-ଟୂଥ୍‍‌, ଡ୍ରାଇଭିଙ୍ଗ ମୋଡ୍"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"ବ୍ଲୁ-ଟୂଥ୍‍‌, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"ବ୍ଲୁ-ଟୂଥ୍‍‌"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ଆପ୍‌ ଓ ବିଜ୍ଞପ୍ତି"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ଅନୁମତି, ଡିଫଲ୍ଟ ଆପ୍‌"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"ଆକାଉଣ୍ଟ"</string>
@@ -2960,7 +2962,6 @@
     <string name="keywords_home" msgid="294182527446892659">"ଲଞ୍ଚର୍, ଡିଫଲ୍ଟ, ଆପ୍"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ସ୍କ୍ରୀନ୍‌, ଟଚ୍‌ସ୍କ୍ରୀନ୍‌"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"ଅସ୍ପଷ୍ଟ ସ୍କ୍ରୀନ୍, ଟଚସ୍କ୍ରୀନ୍, ବ୍ୟାଟେରୀ, ଉଜ୍ଜ୍ୱଳ"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"ଡିମ୍‌ ସ୍କ୍ରିନ୍‌, ଟଚ୍‌ସ୍କ୍ରିନ୍‌, ବ୍ୟାଟେରୀ"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"ଅସ୍ପଷ୍ଟ ସ୍କ୍ରୀନ୍, ରାତି, ଟିଣ୍ଟ, ରାତି ପାଳି, ଉଜ୍ଜ୍ୱଳତା, ସ୍କ୍ରୀନ୍ ରଙ୍ଗ, ରଙ୍ଗ"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡ, ନିଜ ପସନ୍ଦ ଅନୁଯାୟୀ, ଅନୁକୂଳ ଡିସ୍‌ପ୍ଲେ"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ଅକ୍ଷର ଆକାର"</string>
@@ -3001,8 +3002,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"ନେଟ୍‌ୱର୍କ, ମୋବାଇଲ୍‌ ନେଟ୍‌ୱର୍କ ସ୍ଥିତି, ସେବା ସ୍ଥିତି, ସିଗ୍‌ନାଲ୍‌ ଶକ୍ତି, ମୋବାଇଲ୍‌ ନେଟ୍‌ୱର୍କ ପ୍ରକାର, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"କ୍ରମିକ ସଂଖ୍ୟା, ହାର୍ଡୱେର୍‌ ଭର୍ସନ୍‌"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"Android ସୁରକ୍ଷା ପ୍ୟାଚ୍‌ ସ୍ତର, ବେସ୍‌ବ୍ୟାଣ୍ଡ ଭର୍ସନ୍‌, କର୍ନେଲ୍‌ ଭର୍ସନ୍‌"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"ଆମ୍ବିଏଣ୍ଟ ଡିସ୍‌ପ୍ଲେ, ଲକ୍ ସ୍କ୍ରୀନ୍ ଡିସ୍‌ପ୍ଲେ"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"ଆଙ୍ଗୁଠି ଚିହ୍ନ"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"ରୋଟେଟ୍, ଫ୍ଲିପ୍, ରୋଟେଶନ୍, ପୋର୍ଟେଟ୍, ଲ୍ୟାଣ୍ଡସ୍କେପ୍, ଓରିଏଣ୍ଟେଶନ୍, ଭର୍ଟିକଲ୍, ହୋରିଜୋଣ୍ଟାଲ୍"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"ଅପଗ୍ରେଡ୍, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"DND, ନିର୍ଦ୍ଧାରଣ, ବିଜ୍ଞପ୍ତି, ଅବରୋଧ, ସାଇଲେନ୍ସ, ଭାଇବ୍ରେଟ୍, ସ୍ଲୀପ୍, ୱର୍କ, ଫୋକସ୍, ସାଉଣ୍ଡ, ମ୍ୟୁଟ୍, ଦିନ,ସାପ୍ତାହିକ ଦିନ, ସପ୍ତାହର ଶେଷ ଦିନ, ସାପ୍ତାହିକ ରାତି, ଇଭେଣ୍ଟ"</string>
@@ -3085,18 +3090,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"ଭିଜୁଆଲ୍‌ ସଙ୍କେତ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"ଯେତେବେଳେ ’ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ’ ଚାଲୁ ଥିବ"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"ବିଜ୍ଞପ୍ତି"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"ବିଜ୍ଞପ୍ତିକୁ ନିରବରେ ଦେଖାନ୍ତୁ"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"ବିଜ୍ଞପ୍ତିକୁ ମ୍ୟୁଟ୍ କରାଯିବ"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"ବିଜ୍ଞପ୍ତି ଆସିଲେ କୌଣସି ସାଉଣ୍ଡ ନାହିଁ"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"ଆପଣ ଆପଣଙ୍କର ସ୍କ୍ରିନରେ ବିଜ୍ଞପ୍ତି ଦେଖିବେ"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"ଯେତେବେଳେ ବିଜ୍ଞପ୍ତି ଦେଖାଦେବ, ଆପଣଙ୍କର ଫୋନ୍‍ରେ ସାଉଣ୍ଡ କିମ୍ବା ଭାଇବ୍ରେଟ୍ ହେବନାହିଁ।"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"ବିଜ୍ଞପ୍ତି ଲୁଚାନ୍ତୁ"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"ଆପଣ ନୂଆ କିମ୍ବା ବିଦ୍ୟମାନ ଥିବା ବିଜ୍ଞପ୍ତିକୁ ଦେଖିପାରିବେ ନାହିଁ"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"ବିଜ୍ଞପ୍ତି ଆସିଲେ କୌଣସି ଭିଜୁଆଲ୍ ଦେଖାଯିବ ନାହିଁ କିମ୍ବା ସାଉଣ୍ଡ୍‍ ବାହାରିବ ନାହିଁ"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"ଆପଣ ବିଜ୍ଞପ୍ତିଗୁଡିକୁ ଦେଖିପାରିବେ ନାହିଁ କିମ୍ବା ଶୁଣିପାରିବେ ନାହିଁ"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"ଆପଣଙ୍କର ଫୋନ୍ ନୂଆ କିମ୍ବା ବିଦ୍ୟମାନ ବିଜ୍ଞପ୍ତିକୁ ପ୍ରଦର୍ଶନ କରିବ ନାହିଁ ତଥା ସାଉଣ୍ଡ କିମ୍ବା ଭାଇବ୍ରେଟ୍ ହେବନାହିଁ। ଯେତେବେଳେ ଆପଣ ସ୍କ୍ରୀନ୍‍ର ଉପରୁ ତଳକୁ ସ୍ୱାଇପ୍ କରିବେ ବିଜ୍ଞପ୍ତି ଦେଖାଯିବ ନାହିଁ। \n\nମନେରଖନ୍ତୁ ଯେ, ଫୋନ୍ କାର୍ଯ୍ୟକଳାପ ଏବଂ ଷ୍ଟାଟସ୍ ପାଇଁ ଜଟିଳ ବିଜ୍ଞପ୍ତି ତଥାପି ଦୃଶ୍ୟମାନ ହେଉଥିବ।"</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"କଷ୍ଟମ"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"କଷ୍ଟମ ସେଟିଙ୍ଗକୁ ସକ୍ଷମ କରନ୍ତୁ"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"କଷ୍ଟମ ସେଟିଙ୍ଗକୁ କାଢ଼ିଦିଅନ୍ତୁ"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"ଦେଖାଦେବ"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"ବିଜ୍ଞପ୍ତି ଆସିଲେ କୌଣସି ସାଉଣ୍ଡ ନାହିଁ"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"ଆଶିଂକ ଭାବେ ଲୁଚିଯାଇଛି"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"ଲୁଚିଯାଇଛି"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"ବିଜ୍ଞପ୍ତି ଆସିଲେ କୌଣସି ଭିଜୁଆଲ୍ ଦେଖାଯିବ ନାହିଁ କିମ୍ବା ସାଉଣ୍ଡ୍‍ ବାହାରିବ ନାହିଁ"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"କଷ୍ଟମ୍ ସୀମାବଦ୍ଧତା"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"ସ୍କ୍ରୀନ୍‌ ଅନ୍ ଥିବାବେଳେ"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"ସ୍କ୍ରୀନ୍‌ ଅଫ୍ ଥିବାବେଳେ"</string>
@@ -3155,20 +3160,14 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"ମ୍ୟୁଟ୍ ହୋ‍ଇଛି, କିନ୍ତୁ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> ଓ <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>କୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"ମେସେଜ୍, ଇଭେଣ୍ଟ ଓ ରିମାଇଣ୍ଡର୍"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"ଯେତେବେଳେ ’ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ’ ଅନ୍ ଥିବ, ସେତେବେଳେ ଉପରେ ଆପଣ ଅନୁମତି ଦେଇଥିବା ଆଇଟମ୍ ବ୍ୟତୀତ ମେସେଜ୍, ରିମାଇଣ୍ଡର୍ ଓ ଇଭେଣ୍ଟ ମ୍ୟୁଟ୍ ହୋ‍ଇଯିବ। ସାଙ୍ଗ, ପରିବାର ଲୋକେ କିମ୍ବା ଅନ୍ୟାନ୍ୟ ଯୋଗାଯୋଗ ଆପଣଙ୍କୁ ସମ୍ପର୍କ କରିବା ପାଇଁ ଆପଣ ସେଟିଙ୍ଗକୁ ଆଡଜଷ୍ଟ କରିପାରିବେ।"</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"ହୋ‍ଇଗଲା"</string>
     <!-- no translation found for zen_onboarding_settings (9046451821239946868) -->
     <skip />
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"ବିଜ୍ଞପ୍ତି ଆସିଲେ କୌଣସି ଭିଜୁଆଲ୍ ଦେଖାଯିବ ନାହିଁ କିମ୍ବା ସାଉଣ୍ଡ୍‍ ବାହାରିବ ନାହିଁ"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"ବିଜ୍ଞପ୍ତି ଆସିଲେ କୌଣସି ସାଉଣ୍ଡ ନହେଉ"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"ଆପଣ ବିଜ୍ଞପ୍ତିକୁ ଦେଖି କିମ୍ବା ଶୁଣିପାରିବେ ନାହିଁ। ତାରାଙ୍କିତ ଯୋଗାଯୋଗରୁ ଆସିଥିବା କଲ୍ ଏବଂ ପୁଣି କଲ୍ କରୁଥିବା କଲର୍‍ଙ୍କୁ ଅନୁମତି ଦିଆଯାଇଛି।"</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(ସାମ୍ପ୍ରତିକ ସେଟିଙ୍ଗ)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"’ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ’ ବିଜ୍ଞପ୍ତି ସେଟିଙ୍ଗ ବଦଳାଇବେ?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"କାର୍ଯ୍ୟ ପ୍ରୋଫାଇଲ୍‌ ଶବ୍ଦ"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"ବ୍ୟକ୍ତିଗତ ପ୍ରୋଫାଇଲ୍‌ ଧ୍ୱନୀ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"କାର୍ଯ୍ୟ ଓ ବ୍ୟକ୍ତିଗତ ପ୍ରୋଫାଇଲ୍‌ ପାଇଁ ଶବ୍ଦଗୁଡ଼ିକ ସମାନ ଅଟେ"</string>
@@ -3339,17 +3338,12 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> ରୁ <xliff:g id="END">%2$s</xliff:g> ପର୍ଯ୍ୟନ୍ତ"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"କଲ୍‌ଗୁଡ଼ିକ"</string>
-    <!-- no translation found for zen_mode_calls_title (623395033931747661) -->
-    <skip />
+    <string name="zen_mode_calls_title" msgid="623395033931747661">"କଲ୍‍ ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"ଯେତେବେଳେ ’ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ’ ଅନ୍ ଥିବ, ସେତେବେଳେ ଇନକମିଙ୍ଗ କଲ୍ ଅବରୋଧ ହେବ। ସାଙ୍ଗ, ପରିବାର ଲୋକେ କିମ୍ବା ଅନ୍ୟାନ୍ୟ ଯୋଗାଯୋଗ ଆପଣଙ୍କୁ ସମ୍ପର୍କ କରିବା ପାଇଁ ଆପଣ ସେଟିଙ୍ଗକୁ ଆଡଜଷ୍ଟ କରିପାରିବେ।"</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"ତାରାଙ୍କିତ ଯୋଗାଯୋଗ"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other"> ଓ ଅନ୍ୟ <xliff:g id="NUM_PEOPLE">%d</xliff:g>ଜଣ</item>
-      <item quantity="one"> ଓ ଅନ୍ୟ ଜଣେ</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"ମେସେଜ୍‌"</string>
-    <!-- no translation found for zen_mode_messages_title (7729380010396411129) -->
-    <skip />
+    <string name="zen_mode_messages_title" msgid="7729380010396411129">"ମେସେଜ୍‍ ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"ମେସେଜ୍‌"</string>
     <string name="zen_mode_selected_messages" msgid="1047355526202106114">"କିଛି ମେସେଜ୍"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"ଯେକୌଣସି ବ୍ୟକ୍ତିଙ୍କଠାରୁ"</string>
@@ -3363,19 +3357,15 @@
     <string name="zen_mode_media" msgid="8808264142134422380">"ମିଡିଆ"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"ସ୍ପର୍ଶଜନିତ ସାଉଣ୍ଡ"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"ରିମାଇଣ୍ଡର"</string>
-    <!-- no translation found for zen_mode_reminders_title (2345044406347406902) -->
-    <skip />
+    <string name="zen_mode_reminders_title" msgid="2345044406347406902">"ରିମାଇଣ୍ଡର୍‍ ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ଇଭେଣ୍ଟ"</string>
-    <!-- no translation found for zen_mode_events_title (5597241655883329085) -->
-    <skip />
+    <string name="zen_mode_events_title" msgid="5597241655883329085">"ଇଭେଣ୍ଟ ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="zen_mode_all_callers" msgid="2378065871253871057">"ଯେକୌଣସି ବ୍ୟକ୍ତି"</string>
     <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"ଯୋଗାଯୋଗ"</string>
     <string name="zen_mode_starred_callers" msgid="1023167821338514140">"ତାରାଙ୍କିତ ଯୋଗାଯୋଗ"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ବାରମ୍ୱାର ଫୋନ୍‌ କରୁଥିବା କଲର୍"</string>
-    <!-- no translation found for zen_mode_repeat_callers_title (8553876328249671783) -->
-    <skip />
-    <!-- no translation found for zen_mode_calls_summary_one (3972333792749874863) -->
-    <skip />
+    <string name="zen_mode_repeat_callers_title" msgid="8553876328249671783">"ବାରମ୍ବାର କଲ୍ କରୁଥିବା ବ୍ୟକ୍ତିଙ୍କ ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
+    <string name="zen_mode_calls_summary_one" msgid="3972333792749874863">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g>ଙ୍କଠାରୁ"</string>
     <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> ଓ <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>ଙ୍କଠାରୁ"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"<xliff:g id="MINUTES">%d</xliff:g> ମିନିଟ୍‌ ମଧ୍ୟରେ ଯଦି ସେହି ସମାନ ବ୍ୟକ୍ତି ଦ୍ୱିତୀୟ ଥର ପାଇଁ କଲ୍‌ କରନ୍ତି"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"କଷ୍ଟମ"</string>
@@ -3784,10 +3774,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"କୁଲ୍‌ ରଙ୍ଗ ତାପମାତ୍ରା"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"କୁଲର୍‌ ପ୍ରଦର୍ଶନ ରଙ୍ଗ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"ରଙ୍ଗ ପରିବର୍ତ୍ତନ କରିବା ପାଇଁ ସ୍କ୍ରୀନ୍‌ ବନ୍ଦ କରନ୍ତୁ"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"କନେକ୍ଟିଭିଟୀ ମନିଟର୍"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ସଂଯୋଗ ସ୍ଥାପନାରେ କୌଣସି ସମସ୍ୟା ଦେଖିଲେ କନେକ୍ଟିଭିଟୀ ମନିଟର୍‌ ଲଗ୍ସ ଏକତ୍ରିତ କରି ୟୁଜର୍‌ଙ୍କୁ ତ୍ରୁଟି ଫାଇଲ୍‌ କରିବା ପାଇଁ ବିଜ୍ଞପ୍ତି ଦେଇଥାଏ।"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"ସଂଯୁକ୍ତତା ମନିଟର୍‌ ପରିବର୍ତ୍ତନ ଲାଗୁ କରିବା ପାଇଁ ଡିଭାଇସ୍‌କୁ ରିବୂଟ୍‌ କରନ୍ତୁ"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"କ୍ୟାମେରା ଲେଜର୍‌ ସେନ୍ସର୍‌"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"ଡିଫଲ୍ଟଭାବରେ ଲଜିକାଲ୍‍ କ୍ୟାମରା"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ସ୍ୱଚାଳିତ ସିଷ୍ଟମ୍‌ ଅପଡେଟ୍‌"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"ଡିଭାଇସ୍ ରିଷ୍ଟାର୍ଟ ହେଲେ ଅପଡେଟ୍ ଲାଗୁ କରନ୍ତୁ"</string>
     <string name="usage" msgid="2977875522080448986">"ବ୍ୟବହାର"</string>
@@ -4097,8 +4085,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"ସ୍ୱତଃପୂରଣ ସେବା"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"ଅଟୋ, ଫିଲ, ଅଟୋଫିଲ"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;ଆପଣ ଏହି ଆପ୍‌କୁ ବିଶ୍ୱାସ କରୁଥିବା ନିଶ୍ଚିତ କରନ୍ତୁ&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; କ\'ଣ ଅଟୋଫିଲ୍‌ କରାଯାଇପାରିବ ନିର୍ଦ୍ଧାରଣ କରିବା ପାଇଁ, Google Autofill ଆପଣଙ୍କ ସ୍କ୍ରୀନ୍‌ରେ ଯାହା ଥାଏ, ତାହା ବ୍ୟବହାର କରେ।"</string>
-    <string name="device_theme" msgid="4571803018917608588">"ଡିଭାଇସ୍‌ ଥିମ୍‌"</string>
+    <string name="color_theme" msgid="1535685696756738324">"ରଙ୍ଗ ଥିମ୍"</string>
     <string name="default_theme" msgid="7085644992078579076">"ପ୍ରାକ୍‌-ନିର୍ଦ୍ଧାରିତ"</string>
+    <string name="device_theme" msgid="4571803018917608588">"ଡିଭାଇସ୍‌ ଥିମ୍‌"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"ସ୍ଵଚାଳିତ (ୱାଲପେପର୍ ଉପରେ ଆଧାରିତ)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"ଫିକା"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"ଗାଢ଼"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"ନେଟୱାର୍କ ନାମ"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"ଷ୍ଟାଟସ୍‌ ବାର୍‌ରେ ନେଟ୍‌ୱର୍କର ନାମ ଡିସ୍‌ପ୍ଲେ କରନ୍ତୁ"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"ଷ୍ଟୋରେଜ ମ୍ୟାନେଜର: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4110,7 +4102,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"ମୋବାଇଲ୍‌ ନେଟ୍‌ୱର୍କ ବାହକ ପ୍ରାବଧାନ ସୂଚନା"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"କେରିଅର୍‌ ପ୍ରୋଭିଜନିଙ୍ଗ ଟ୍ରିଗର୍‌ କରନ୍ତୁ"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"’ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ’ ଅପଡେଟ୍ କରନ୍ତୁ"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"ଫୋକସ୍ ରହିବା ପାଇଁ ବିଜ୍ଞପ୍ତିକୁ ଲୁଚାନ୍ତୁ"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"ଫୋକସ୍ ରହିବା ପାଇଁ ବିଜ୍ଞପ୍ତି ବିରତି କରନ୍ତୁ"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"କଣ ନୂତନ ତଥା ମଜାଦାର ଅଛି?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ଆପଣଙ୍କ ନୂଆ ଫୋନ୍‌କୁ ଚଲାଇ ଦେଖନ୍ତୁ"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ଆପଣଙ୍କ ନୂଆ ଟାବ୍‌ଲେଟ୍‌କୁ ଚଲାଇ ଦେଖନ୍ତୁ"</string>
diff --git a/res/values-pa/arrays.xml b/res/values-pa/arrays.xml
index 15bf9f9..2f6ff7e 100644
--- a/res/values-pa/arrays.xml
+++ b/res/values-pa/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"ਹਮੇਸ਼ਾਂ ਚਾਲੂ"</item>
     <item msgid="6385301106124765323">"ਹਮੇਸ਼ਾਂ ਬੰਦ"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 310afcf..a1b8566 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"ਆਪਣੇ ਟੈਬਲੇੱਟ ਨੂੰ ਨਜ਼ਦੀਕੀ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸਾਂ ਨਾਲ ਸੰਚਾਰ ਕਰਨ ਦਿਓ"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਨਜ਼ਦੀਕੀ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸਾਂ ਨਾਲ ਸੰਚਾਰ ਕਰਨ ਦਿਓ"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਨਜ਼ਦੀਕੀ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸਾਂ ਨਾਲ ਸੰਚਾਰ ਕਰਨ ਦਿਓ"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"ਬਲੂਟੁੱਥ A2DP ਹਾਰਡਵੇਅਰ ਆਫ਼ਲੋਡ ਬੰਦ ਕਰੋ"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"ਡੀਵਾਈਸ ਮੁੜ-ਚਾਲੂ ਕਰੀਏ?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"ਤੁਹਾਨੂੰ ਇਹ ਸੈਟਿੰਗ ਬਦਲਣ ਲਈ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"ਮੁੜ-ਚਾਲੂ ਕਰੋ"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"ਰੱਦ ਕਰੋ"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"ਉਪਲਬਧ ਮੀਡੀਆ ਡੀਵਾਈਸ"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"ਉਪਲਬਧ ਕਾਲ ਡੀਵਾਈਸ"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"ਇਸ ਵੇਲੇ ਕਨੈਕਟ ਹੈ"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"ਕਨੈਕਸ਼ਨ ਤਰਜੀਹਾਂ"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"ਪਹਿਲਾਂ ਤੋਂ ਕਨੈਕਟ ਕੀਤੇ ਡੀਵਾਈਸ"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"ਪਹਿਲਾਂ ਤੋਂ ਕਨੈਕਟ ਕੀਤੇ"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"ਤਾਰੀਖ ਅਤੇ ਸਮਾਂ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"ਸਮਾਂ ਜ਼ੋਨ ਚੁਣੋ"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਟਾਈਪ ਕੀਤਾ ਪੋਰਟ ਵੈਧ ਨਹੀਂ ਹੈ।"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP ਪ੍ਰੌਕਸੀ ਬ੍ਰਾਊਜ਼ਰ ਵੱਲੋਂ ਵਰਤੀ ਜਾਂਦੀ ਹੈ ਪਰ ਹੋ ਸਕਦਾ ਹੈ ਹੋਰ ਐਪਾਂ ਵੱਲੋਂ ਇਸ ਦੀ ਵਰਤੋਂ ਨਾ ਕੀਤੀ ਜਾ ਸਕੇ।"</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL ਬੈਂਡਵਿਡਥ (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL ਬੈਂਡਵਿਡਥ (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"ਸੈੱਲ ਟਿਕਾਣਾ ਜਾਣਕਾਰੀ (ਹਟਾਈ ਗਈ):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"ਆਂਢ-ਗੁਆਂਢ ਸੈੱਲ ਜਾਣਕਾਰੀ (ਹਟਾਈ ਗਈ):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE ਭੌਤਿਕ ਕੈਮਰਾ ਸੰਰੂਪਣ:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"ਸੈੱਲ ਜਾਣਕਾਰੀ ਮੁੜ-ਤਾਜ਼ਾ ਕਰਨ ਦੀ ਦਰ:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"ਸਾਰੀ ਸੈੱਲ ਮਾਪ ਜਾਣਕਾਰੀ:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਰੀਅਲ-ਟਾਈਮ ਜਾਣਕਾਰੀ:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">" ਡਾਟਾ  ਸੇਵਾ:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"ਰੋਮਿੰਗ:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1007,16 +1015,11 @@
     <string name="emergency_address_title" msgid="932729250447887545">"ਸੰਕਟਕਾਲੀਨ ਪਤਾ"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਕੀਤੀ ਜਾਣ ਵਾਲੀ ਕਿਸੇ ਸੰਕਟਕਾਲੀਨ ਕਾਲ ਵੇਲੇ ਇਹ ਪਤਾ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ"</string>
     <string name="private_dns_help_message" msgid="3299567069152568958">"ਨਿੱਜੀ DNS ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਬਾਰੇ "<annotation id="url">"ਹੋਰ ਜਾਣੋ"</annotation></string>
-    <!-- no translation found for wifi_calling_pref_managed_by_carrier (6845711858866828986) -->
-    <skip />
-    <!-- no translation found for wifi_calling_settings_activation_instructions (7492509632478260955) -->
-    <skip />
-    <!-- no translation found for wifi_calling_turn_on (1171403510313983983) -->
-    <skip />
-    <!-- no translation found for wifi_calling_not_supported (7878640438907807754) -->
-    <skip />
-    <!-- no translation found for carrier (5264014738689761132) -->
-    <skip />
+    <string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"ਸੈਟਿੰਗ ਦਾ ਪ੍ਰਬੰਧਨ ਕੈਰੀਅਰ ਵੱਲੋਂ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
+    <string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ ਕਿਰਿਆਸ਼ੀਲ ਕਰੋ"</string>
+    <string name="wifi_calling_turn_on" msgid="1171403510313983983">"ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="wifi_calling_not_supported" msgid="7878640438907807754">"%1$s ਲਈ ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ"</string>
+    <string name="carrier" msgid="5264014738689761132">"ਕੈਰੀਅਰ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ਡਿਸਪਲੇ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ਧੁਨੀ"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ਵੋਲਯੂਮ"</string>
@@ -1151,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"ਸਵੈਚਲਿਤ ਚਮਕ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"ਕਿਰਿਆਸ਼ੀਲ ਕਰਨ ਲਈ ਚੁੱਕੋ"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"ਸਰਗਰਮ ਡਿਸਪਲੇ"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"ਹਮੇਸ਼ਾ ਚਾਲੂ / ਬੈਟਰੀ ਵਰਤੋਂ ਵਧ ਜਾਵੇਗੀ"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"ਨਵੀਆਂ ਸੁਚਨਾਵਾਂ"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ਦਿਖਾਉਣ ਦਾ ਸਮਾਂ"</string>
     <string name="doze_title" msgid="2375510714460456687">"ਨਵੀਆਂ ਸੁਚਨਾਵਾਂ"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ਜਦ ਤੁਹਾਨੂੰ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਹੋਣ ਤਾਂ ਸਕ੍ਰੀਨ ਕਿਰਿਆਸ਼ੀਲ ਕਰੋ"</string>
@@ -1197,8 +1198,6 @@
       <item quantity="other">ਗਲਤ ਸਿਮ ਪਿੰਨ ਕੋਡ, ਤੁਹਾਡੇ ਕੋਲ <xliff:g id="NUMBER_1">%d</xliff:g> ਕੋਸ਼ਿਸ਼ ਬਾਕੀ ਹੈ।</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"ਸਿਮ ਪਿੰਨ ਕਾਰਵਾਈ ਅਸਫਲ ਰਹੀ!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"ਟੈਬਲੈੱਟ ਸਥਿਤੀ"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"ਫ਼ੋਨ ਸਥਿਤੀ"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"ਸਿਸਟਮ ਅੱਪਡੇਟ"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android ਵਰਜਨ"</string>
@@ -2119,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"ਬੈਕਗ੍ਰਾਊਂਡ ਵਰਤੋਂ \'ਤੇ ਪਾਬੰਦੀ ਨਹੀਂ ਲਗਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"ਕੀ ਬੈਕਗ੍ਰਾਊਂਡ ਸਰਗਰਮੀ ਸੀਮਿਤ ਕਰਨੀ ਹੈ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"ਜੇਕਰ ਤੁਸੀਂ ਕਿਸੇ ਐਪ ਦੀ ਬੈਕਗ੍ਰਾਊਂਡ ਸਰਗਰਮੀ ਨੂੰ ਸੀਮਿਤ ਕਰਦੇ ਹੋ, ਤਾਂ ਉਹ ਅਜੀਬ ਢੰਗ ਨਾਲ ਵਰਤਾਅ ਕਰ ਸਕਦੀ ਹੈ"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"ਇਹ ਐਪ ਬੈਟਰੀ ਨੂੰ ਸੁਯੋਗ ਕਰੋ \'ਤੇ ਸੈੱਟ ਨਾ ਕੀਤੀ ਹੋਣ ਕਰਕੇ, ਤੁਸੀਂ ਇਸ \'ਤੇ ਪਾਬੰਧੀ ਨਹੀਂ ਲਗਾ ਸਕਦੇ।\n\nਐਪ \'ਤੇ ਪਾਬੰਧੀ ਲਗਾਉਣ ਲਈ, ਪਹਿਲਾਂ ਬੈਟਰੀ ਸੁਯੋਗਕਰਨ ਨੂੰ ਚਾਲੂ ਕਰੋ।"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਸਕ੍ਰੀਨ ਵਰਤੋਂ"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"ਸਕ੍ਰੀਨ ਖਪਤ"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਸਕੈਨਿੰਗ"</string>
@@ -2440,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"ਸੰਕਟਕਾਲੀਨ ਡਾਇਲਿੰਗ ਸਿਗਨਲ"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"ਜਦੋਂ ਇੱਕ ਸੰਕਟਕਾਲੀਨ ਕਾਲ ਕੀਤੀ ਜਾਂਦੀ ਹੈ ਤਾਂ ਵਿਵਹਾਰ ਸੈੱਟ ਕਰੋ"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"ਬੈਕਅੱਪ"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"ਚਾਲੂ"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"ਬੰਦ"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"ਬੈਕਅੱਪ &amp; ਰੀਸਟੋਰ ਕਰੋ"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"ਨਿੱਜੀ  ਡਾਟਾ"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"ਮੇਰਾ ਡਾਟਾ ਬੈਕ ਅੱਪ ਲਓ"</string>
@@ -2766,6 +2766,12 @@
       <item quantity="other">ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਦੀ ਜਾਂਚ ਕਰੋ</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"ਬਹੁ-ਵਰਤੋਂਕਾਰ"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"ਉਪਭੋਗਤਾ &amp; ਪ੍ਰੋਫਾਈਲਾਂ"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ਵਰਤੋਂਕਾਰ ਜਾਂ ਪ੍ਰੋਫਾਈਲ ਜੋੜੋ"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"ਵਰਤੋਂਕਾਰ ਸ਼ਾਮਲ ਕਰੋ"</string>
@@ -2948,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ਡਾਟਾ ਵਰਤੋਂ"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"ਹੌਟਸਪੌਟ"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"ਕਨੈਕਟ ਕੀਤੇ ਡੀਵਾਈਸ"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"ਬਲੂਟੁੱਥ, ਗੱਡੀ ਚਲਾਉਣ ਸੰਬੰਧੀ ਮੋਡ, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"ਬਲੂਟੁੱਥ, ਗੱਡੀ ਚਲਾਉਣ ਸੰਬੰਧੀ ਮੋਡ"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"ਬਲੂਟੁੱਥ, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"ਬਲੂਟੁੱਥ"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ਐਪਾਂ ਅਤੇ ਸੂਚਨਾਵਾਂ"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ਇਜਾਜ਼ਤਾਂ, ਪੂਰਵ-ਨਿਰਧਾਰਤ ਐਪਾਂ"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"ਖਾਤੇ"</string>
@@ -2972,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"ਲਾਂਚਰ, ਪੂਰਵ-ਨਿਰਧਾਰਤ, ਐਪਾਂ"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ਸਕ੍ਰੀਨ, ਟੱਚਸਕ੍ਰੀਨ"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"ਮਧੱਮ ਸਕ੍ਰੀਨ, ਟੱਚਸਕ੍ਰੀਨ, ਬੈਟਰੀ, ਚਮਕਦਾਰ"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"ਡਿਮ ਸਕ੍ਰੀਨ, ਟੱਚਸਕ੍ਰੀਨ, ਬੈਟਰੀ"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"ਮਧੱਮ ਸਕ੍ਰੀਨ, ਰਾਤ, ਭਾਹ, ਰਾਤ ਵੇਲੇ ਬਦਲਾਅ, ਚਮਕ, ਸਕ੍ਰੀਨ ਦਾ ਰੰਗ, ਰੰਗ, ਰੰਗ"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"ਬੈਕਗ੍ਰਾਊਂਡ, ਵਿਅਕਤੀਗਤ, ਵਿਉਂਤਬੱਧ ਡਿਸਪਲੇ"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ਟੈਕਸਟ ਆਕਾਰ"</string>
@@ -3013,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"ਨੈੱਟਵਰਕ, ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਅਵਸਥਾ, ਸੇਵਾ ਅਵਸਥਾ, ਸਿਗਨਲ ਸ਼ਕਤੀ, ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਦੀ ਕਿਸਮ, ਰੋਮਿੰਗ, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"ਸੀਰੀਅਲ ਨੰਬਰ, ਹਾਰਡਵੇਅਰ ਵਰਜਨ"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"Android ਸੁਰੱਖਿਆ ਪੈਚ ਪੱਧਰ, ਬੇਸਬੈਂਡ ਵਰਜਨ, ਕਰਨਲ ਵਰਜਨ"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"ਤੱਕਣੀਯੋਗ ਡਿਸਪਲੇ, ਲਾਕ ਸਕ੍ਰੀਨ ਡਿਸਪਲੇ"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"ਘੁੰਮਾਓ, ਫਲਿੱਪ, ਘੁਮਾਅ, ਪੋਰਟਰੇਟ, ਲੈਂਡਸਕੇਪ, ਦਿਸ਼ਾਮਾਨ, ਖੜ੍ਹਵਾਂ, ਲੇਟਵਾਂ"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"ਅੱਪਗ੍ਰੇਡ ਕਰੋ, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"DND, ਸਮਾਂ-ਸੂਚੀ, ਸੂਚਨਾਵਾਂ, ਬਲਾਕ ਕਰੋ, ਖਾਮੋਸ਼ੀ, ਥਰਥਰਾਹਟ, ਸਲੀਪ, ਕੰਮ, ਫੋਕਸ ਕਰੋ, ਧੁਨੀ, ਮਿਊਟ, ਦਿਨ, ਵੀਕਡੇ, ਵੀਕਇੰਡ, ਵੀਕਨਾਈਟ, ਇਵੈਂਟ"</string>
@@ -3097,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"ਦ੍ਰਿਸ਼ਟੀਗਤ ਸਿਗਨਲ ਦਿਖਣ ਦਿਓ"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਦੇ ਚਾਲੂ ਹੋਣ \'ਤੇ"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"ਸੂਚਨਾਵਾਂ"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"ਸੂਚਨਾਵਾਂ ਚੁੱਪ-ਚਪੀਤੇ ਢੰਗ ਨਾਲ ਦਿਖਾਓ"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"ਸੂਚਨਾਵਾਂ ਨੂੰ ਮਿਊਟ ਕੀਤਾ ਜਾਵੇਗਾ"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"ਸੂਚਨਾਵਾਂ ਦੀ ਕੋਈ ਧੁਨੀ ਨਹੀਂ"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"ਤੁਸੀਂ ਆਪਣੀ ਸਕ੍ਰੀਨ \'ਤੇ ਸੂਚਨਾਵਾਂ ਦੇਖੋਗੇ"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"ਸੂਚਨਾਵਾਂ ਆਉਣ \'ਤੇ ਤੁਹਾਡਾ ਫ਼ੋਨ ਕੋਈ ਧੁਨੀ ਨਹੀਂ ਵਜਾਵੇਗਾ ਜਾਂ ਥਰਥਰਾਹਟ ਨਹੀਂ ਕਰੇਗਾ।"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"ਸੂਚਨਾਵਾਂ ਲੁਕਾਓ"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"ਤੁਹਾਨੂੰ ਨਵੀਆਂ ਜਾਂ ਮੌਜੂਦਾ ਸੂਚਨਾਵਾਂ ਦਿਖਾਈ ਨਹੀਂ ਦੇਣਗੀਆਂ"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"ਸੂਚਨਾਵਾਂ ਦੇ ਕੋਈ ਦ੍ਰਿਸ਼ਟੀਗਤ ਸੰਕੇਤ ਜਾਂ ਧੁਨੀ ਨਹੀਂ"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"ਤੁਹਾਨੂੰ ਸੂਚਨਾਵਾਂ ਨਾ ਹੀ ਦਿਸਣਗੀਆਂ ਅਤੇ ਨਾ ਹੀ ਸੁਣਨਗੀਆਂ"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਨਵੀਆਂ ਅਤੇ ਮੌਜੂਦਾ ਸੂਚਨਾਵਾਂ ਨਹੀਂ ਦਿਖਾਵੇਗਾ ਅਤੇ ਨਾ ਕੋਈ ਧੁਨੀ ਵਜਾਵੇਗਾ ਜਾਂ ਥਰਥਰਾਹਟ ਕਰੇਗਾ। ਤੁਹਾਡੇ ਵੱਲੋਂ ਆਪਣੀ ਸਕ੍ਰੀਨ ਦੇ ਸਿਖਰ ਤੋਂ ਹੇਠਾਂ ਵੱਲ ਸਵਾਈਪ ਕਰਨ \'ਤੇ ਸੂਚਨਾਵਾਂ ਦਿਖਾਈ ਨਹੀਂ ਦੇਣਗੀਆਂ।\n\nਧਿਆਨ ਵਿੱਚ ਰੱਖੋ ਕਿ, ਫ਼ੋਨ ਸਰਗਰਮੀ ਅਤੇ ਸਥਿਤੀ ਦੀਆਂ ਗੰਭੀਰ ਸੂਚਨਾਵਾਂ ਹਾਲੇ ਵੀ ਦਿਖਾਈ ਦੇਣਗੀਆਂ।"</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"ਵਿਉਂਤਿਆ"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"ਵਿਉਂਤੀ ਸੈਟਿੰਗ ਚਾਲੂ ਕਰੋ"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"ਵਿਉਂਤੀ ਸੈਟਿੰਗ ਹਟਾਓ"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"ਦਿਖਾਈ ਦੇਵੇਗਾ"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"ਸੂਚਨਾਵਾਂ ਦੀ ਕੋਈ ਧੁਨੀ ਨਹੀਂ"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"ਅਧੂਰੇ ਤੌਰ \'ਤੇ ਲੁਕਾਓ"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"ਲੁਕਾਇਆ ਹੋਇਆ"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"ਸੂਚਨਾਵਾਂ ਦੇ ਕੋਈ ਦ੍ਰਿਸ਼ਟੀਗਤ ਸੰਕੇਤ ਜਾਂ ਧੁਨੀ ਨਹੀਂ"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"ਵਿਉਂਤਬੱਧ ਪਾਬੰਦੀਆਂ"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"ਜਦੋਂ ਸਕ੍ਰੀਨ ਚਾਲੂ ਹੋਵੇ"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"ਜਦੋਂ ਸਕ੍ਰੀਨ ਬੰਦ ਹੋਵੇ"</string>
@@ -3167,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"ਮਿਊਟ ਕੀਤਾ ਗਿਆ, ਪਰ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> ਅਤੇ <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> ਚੱਲਣ ਦਿਓ"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"ਸੁਨੇਹੇ, ਇਵੈਂਟ ਅਤੇ ਯਾਦ-ਸੂਚਨਾਵਾਂ"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਚਾਲੂ ਹੋਣ \'ਤੇ ਉਪਰੋਕਤ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਵਾਲੀਆਂ ਆਈਟਮਾਂ ਤੋਂ ਇਲਾਵਾ ਸੁਨੇਹੇ, ਯਾਦ-ਸੂਚਨਾਵਾਂ ਅਤੇ ਇਵੈਂਟ ਮਿਊਟ ਕੀਤੇ ਜਾਣਗੇ। ਤੁਸੀਂ ਆਪਣੇ ਦੋਸਤਾਂ, ਪਰਿਵਾਰਕ ਜਾਂ ਹੋਰ ਸੰਪਰਕਾਂ ਵੱਲੋਂ ਤੁਹਾਡੇ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੇਣ ਲਈ ਸੁਨੇਹੇ ਸੈਟਿੰਗਾਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰ ਸਕਦੇ ਹੋ।"</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"ਹੋ ਗਿਆ"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"ਸੈਟਿੰਗਾਂ"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"ਸੂਚਨਾਵਾਂ ਦੇ ਕੋਈ ਦ੍ਰਿਸ਼ਟੀਗਤ ਸੰਕੇਤ ਜਾਂ ਧੁਨੀ ਨਹੀਂ"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"ਸੂਚਨਾਵਾਂ ਦੀ ਕੋਈ ਧੁਨੀ ਨਹੀਂ"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"ਤੁਹਾਨੂੰ ਸੂਚਨਾਵਾਂ ਨਾ ਹੀ ਦਿਸਣਗੀਆਂ ਅਤੇ ਨਾ ਹੀ ਸੁਣਨਗੀਆਂ। ਤਾਰਾਬੱਧ ਸੰਪਰਕਾਂ ਅਤੇ ਵਾਰ-ਵਾਰ ਕਾਲਾਂ ਕਰਨ ਵਾਲੇ ਕਾਲਰਾਂ ਦੀਆਂ ਕਾਲਾਂ ਮਿਲਣਗੀਆਂ।"</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(ਮੌਜੂਦਾ ਸੈਟਿੰਗ)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"ਕੀ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਦੀਆਂ ਸੂਚਨਾ ਸੈਟਿੰਗਾਂ ਬਦਲਣੀਆਂ ਹਨ?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਧੁਨੀਆਂ"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"ਨਿੱਜੀ ਪ੍ਰੋਫਾਈਲ ਧੁਨੀਆਂ ਵਰਤੋ"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"ਕਾਰਜ ਅਤੇ ਨਿੱਜੀ ਪ੍ਰੋਫਾਈਲਾਂ ਲਈ ਧੁਨੀਆਂ ਇੱਕੋ ਹਨ"</string>
@@ -3348,17 +3347,12 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> ਤੋਂ <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"ਕਾਲਾਂ"</string>
-    <!-- no translation found for zen_mode_calls_title (623395033931747661) -->
-    <skip />
+    <string name="zen_mode_calls_title" msgid="623395033931747661">"ਕਾਲਾਂ ਕਰਨ ਅਤੇ ਆਉਣ ਦਿਓ"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਚਾਲੂ ਹੋਣ \'ਤੇ ਇਨਕਮਿੰਗ ਕਾਲਾਂ ਬਲਾਕ ਹੁੰਦੀਆਂ ਹਨ। ਤੁਸੀਂ ਆਪਣੇ ਦੋਸਤਾਂ, ਪਰਿਵਾਰਕ ਜਾਂ ਹੋਰ ਸੰਪਰਕਾਂ ਵੱਲੋਂ ਤੁਹਾਡੇ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੇਣ ਲਈ ਸੈਟਿੰਗਾਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰ ਸਕਦੇ ਹੋ।"</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"ਤਾਰਾਬੱਧ ਸੰਪਰਕ"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">ਅਤੇ <xliff:g id="NUM_PEOPLE">%d</xliff:g> ਹੋਰ</item>
-      <item quantity="other">ਅਤੇ <xliff:g id="NUM_PEOPLE">%d</xliff:g> ਹੋਰ</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"ਸੁਨੇਹੇ"</string>
-    <!-- no translation found for zen_mode_messages_title (7729380010396411129) -->
-    <skip />
+    <string name="zen_mode_messages_title" msgid="7729380010396411129">"ਸੁਨੇਹੇ ਭੇਜਣ ਅਤੇ ਆਉਣ ਦਿਓ"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"ਸੁਨੇਹੇ"</string>
     <string name="zen_mode_selected_messages" msgid="1047355526202106114">"ਕੁਝ ਸੁਨੇਹੇ"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"ਕਿਸੇ ਵੀ ਵਿਅਕਤੀ ਤੋਂ"</string>
@@ -3372,19 +3366,15 @@
     <string name="zen_mode_media" msgid="8808264142134422380">"ਮੀਡੀਆ"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"ਸਪੱਰਸ਼ ਧੁਨੀਆਂ"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"ਯਾਦ-ਸੂਚਨਾਵਾਂ"</string>
-    <!-- no translation found for zen_mode_reminders_title (2345044406347406902) -->
-    <skip />
+    <string name="zen_mode_reminders_title" msgid="2345044406347406902">"ਯਾਦ-ਸੂਚਨਾਵਾਂ ਨੂੰ ਦਿਖਾਉਣ ਦਿਓ"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ਇਵੈਂਟ"</string>
-    <!-- no translation found for zen_mode_events_title (5597241655883329085) -->
-    <skip />
+    <string name="zen_mode_events_title" msgid="5597241655883329085">"ਇਵੈਂਟ ਦਿਖਾਉਣ ਦਿਓ"</string>
     <string name="zen_mode_all_callers" msgid="2378065871253871057">"ਕੋਈ ਵੀ"</string>
     <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"ਸੰਪਰਕ"</string>
     <string name="zen_mode_starred_callers" msgid="1023167821338514140">"ਤਾਰਾਬੱਧ ਸੰਪਰਕ"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ਦੁਬਾਰਾ ਕਾਲ ਕਰਨ ਵਾਲੇ"</string>
-    <!-- no translation found for zen_mode_repeat_callers_title (8553876328249671783) -->
-    <skip />
-    <!-- no translation found for zen_mode_calls_summary_one (3972333792749874863) -->
-    <skip />
+    <string name="zen_mode_repeat_callers_title" msgid="8553876328249671783">"ਦੁਬਾਰਾ ਕਾਲ ਕਰਨ ਵਾਲੇ ਕਾਲਰ ਨੂੰ ਕਾਲਾਂ ਕਰਨ ਅਤੇ ਆਉਣ ਦਿਓ"</string>
+    <string name="zen_mode_calls_summary_one" msgid="3972333792749874863">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> ਵੱਲੋਂ"</string>
     <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> ਅਤੇ <xliff:g id="CALLERT_TPYE">%2$s</xliff:g> ਵੱਲੋਂ"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"ਜੇਕਰ ਇੱਕੋ ਵਿਅਕਤੀ <xliff:g id="MINUTES">%d</xliff:g> ਮਿੰਟ ਵਿੱਚ ਦੂਜੀ ਵਾਰ ਕਾਲ ਕਰੇ"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"ਵਿਉਂਤੀ"</string>
@@ -3790,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"ਠੰਡਾ ਰੰਗ ਤਾਪਮਾਨ"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ਵਧੇਰੇ ਠੰਡੇ ਡਿਸਪਲੇ ਰੰਗਾਂ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"ਰੰਗ ਬਦਲਾਅ ਲਾਗੂ ਕਰਨ ਲਈ, ਸਕ੍ਰੀਨ ਨੂੰ ਬੰਦ ਕਰੋ"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"ਕਨੈਕਟਿਵਟੀ ਮੋਨੀਟਰ"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ਕਨੈਕਟਿਵਟੀ ਮੋਨੀਟਰ ਕਿਸੇ ਕਨੈਕਟਿਵਟੀ ਸਮੱਸਿਆ ਦਾ ਪਤਾ ਲੱਗਣ \'ਤੇ ਲੌਗਾਂ ਨੂੰ ਇਕੱਤਰ ਕਰੇਗਾ ਅਤੇ ਵਰਤੋਂਕਾਰ ਨੂੰ ਇੱਕ ਬੱਗ ਦਾਇਰ ਕਰਨ ਲਈ ਸੂਚਨਾ ਦੇਵੇਗਾ"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"ਕਨੈਕਟਿਵਟੀ ਮੋਨੀਟਰ ਬਦਲਾਅ ਲਾਗੂ ਕਰਨ ਲਈ, ਡੀਵਾਈਸ ਨੂੰ ਰੀਬੂਟ ਕਰੋ"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"ਕੈਮਰਾ ਲੇਜ਼ਰ ਸੈਂਸਰ"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਵਜੋਂ ਲੌਜੀਕਲ ਕੈਮਰਾ"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ਸਵੈਚਲਿਤ ਸਿਸਟਮ ਅੱਪਡੇਟ"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"ਡੀਵਾਈਸ ਮੁੜ-ਚਾਲੂ ਹੋਣ \'ਤੇ ਅੱਪਡੇਟ ਲਾਗੂ ਕਰੋ"</string>
     <string name="usage" msgid="2977875522080448986">"ਵਰਤੋਂ"</string>
@@ -4103,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"ਆਟੋਫਿਲ ਸੇਵਾ"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"ਆਟੋ, ਫਿਲ, ਆਟੋਫਿਲ"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਇਸ ਐਪ \'ਤੇ ਭਰੋਸਾ ਕਰਦੇ ਹੋ&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; ਆਪਣੇ-ਆਪ ਭਰੀਆਂ ਜਾ ਸਕਣ ਵਾਲੀਆਂ ਚੀਜ਼ਾਂ ਦਾ ਪਤਾ ਲਗਾਉਣ ਲਈ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ \'ਤੇ ਮੌਜੂਦ ਚੀਜ਼ਾਂ ਦੀ ਵਰਤੋਂ ਕਰਦਾ ਹੈ।"</string>
-    <string name="device_theme" msgid="4571803018917608588">"ਡੀਵਾਈਸ ਥੀਮ"</string>
+    <string name="color_theme" msgid="1535685696756738324">"ਰੰਗ ਥੀਮ"</string>
     <string name="default_theme" msgid="7085644992078579076">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
+    <string name="device_theme" msgid="4571803018917608588">"ਡੀਵਾਈਸ ਥੀਮ"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"ਸਵੈਚਲਿਤ (ਵਾਲਪੇਪਰ \'ਤੇ ਆਧਾਰਿਤ)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"ਬਲਬ"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"ਗੂੜ੍ਹਾ"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"ਨੈੱਟਵਰਕ ਦਾ ਨਾਮ"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"ਸਥਿਤੀ ਪੱਟੀ ਵਿੱਚ ਨੈੱਟਵਰਕ ਦਾ ਨਾਮ ਦਿਖਾਓ"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4116,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"ਕੈਰੀਅਰ ਵਿਵਸਥਾਕਰਨ ਜਾਣਕਾਰੀ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ਕੈਰੀਅਰ ਵਿਵਸਥਾਕਰਨ ਨੂੰ ਤੂਲ ਦਿਓ"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਨੂੰ ਅੱਪਡੇਟ ਕਰੋ"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"ਧਿਆਨ ਕੇਂਦਰਿਤ ਰੱਖਣ ਲਈ ਸੂਚਨਾਵਾਂ ਲੁਕਾਓ"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"ਧਿਆਨ ਕੇਂਦਰਿਤ ਰੱਖਣ ਲਈ ਸੂਚਨਾਵਾਂ ਰੋਕੋ"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"ਕੀ ਕੁਝ ਨਵਾਂ ਅਤੇ ਦਿਲਚਸਪ ਹੈ?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Take a tour of your new phone"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ਆਪਣਾ ਨਵਾਂ ਟੈਬਲੈੱਟ ਵਰਤਣ ਬਾਰੇ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index d948734..23eb887 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -70,7 +70,7 @@
     <item msgid="8934131797783724664">"Trwa skanowanie..."</item>
     <item msgid="8513729475867537913">"Trwa łączenie..."</item>
     <item msgid="515055375277271756">"Trwa uwierzytelnianie..."</item>
-    <item msgid="1943354004029184381">"Uzyskiwanie adresu IP..."</item>
+    <item msgid="1943354004029184381">"Uzyskuję adres IP..."</item>
     <item msgid="4221763391123233270">"Połączono"</item>
     <item msgid="624838831631122137">"Zawieszona"</item>
     <item msgid="7979680559596111948">"Trwa rozłączanie..."</item>
@@ -84,7 +84,7 @@
     <item msgid="8878186979715711006">"Trwa skanowanie..."</item>
     <item msgid="355508996603873860">"Trwa łączenie z siecią <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
     <item msgid="554971459996405634">"Trwa uwierzytelnianie w sieci <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
-    <item msgid="7928343808033020343">"Uzyskiwanie adresu IP z sieci <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7928343808033020343">"Uzyskuję adres IP z sieci <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
     <item msgid="8937994881315223448">"Połączono z siecią <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
     <item msgid="1330262655415760617">"Zawieszona"</item>
     <item msgid="7698638434317271902">"Trwa rozłączanie z siecią <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Zawsze włączony"</item>
     <item msgid="6385301106124765323">"Zawsze wyłączony"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 469755b..09bb9f2 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -175,6 +175,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Zezwól tabletowi na komunikowanie się z urządzeniami Bluetooth w pobliżu"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Zezwól urządzeniu na komunikowanie się z urządzeniami Bluetooth w pobliżu"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Zezwól telefonowi na komunikowanie się z urządzeniami Bluetooth w pobliżu"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Wyłącz odciążanie sprzętu Bluetooth A2DP"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Uruchomić ponownie?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Musisz ponownie uruchomić urządzenie, by to zmienić."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Zrestartuj"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Anuluj"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Dostępne urządzenia multimedialne"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Dostępne urządzenia telefoniczne"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Obecnie połączone"</string>
@@ -184,6 +189,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Ustawienia połączeń"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Wcześniej połączone urządzenia"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Wcześniej połączone"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Data i czas"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Wybierz strefę czasową"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -209,11 +216,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Wpisany port jest nieprawidłowy."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Serwer proxy HTTP jest używany przez przeglądarkę, ale inne aplikacje mogą go nie używać."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"URL pliku PAC: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Przepustowość kanału DL (kb/s):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Przepustowość kanału UL (kb/s):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Informacje o lokalizacji z sieci komórkowej (wycofane):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Informacje o sąsiedniej sieci komórkowej (wycofane):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Konfiguracja kanału fizycznego LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Częstotliwość odświeżania informacji o sieci komórkowej:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Wszystkie informacje pomiarowe z sieci komórkowej:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Bieżące informacje o transmisji danych:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Usługa transmisji danych:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1178,8 +1186,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatyczna"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Podnieś, by wybudzić"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ekran zgodny z otoczeniem"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Zawsze włączony/ Zwiększone zużycie baterii"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nowe powiadomienia"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kiedy wyświetlać"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nowe powiadomienia"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Włącz ekran po otrzymaniu powiadomień"</string>
@@ -1226,8 +1232,6 @@
       <item quantity="one">Nieprawidłowy kod PIN karty SIM. Masz jeszcze <xliff:g id="NUMBER_0">%d</xliff:g> próbę, zanim będziesz musiał skontaktować się z operatorem, by odblokować swoje urządzenie.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Operacja z kodem PIN karty SIM nie udała się."</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stan tabletu"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Stan telefonu"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Aktualizacje systemu"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Wersja Androida"</string>
@@ -2166,8 +2170,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Nie można ograniczyć działania w tle"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Ograniczyć aktywność w tle?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Jeśli ograniczysz aktywność aplikacji w tle, może ona działać nieprawidłowo"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Ta aplikacja nie jest skonfigurowana do optymalnego wykorzystywania baterii, więc nie możesz wprowadzić dla niej ograniczeń.\n\nAby wprowadzić ograniczenia dla aplikacji, najpierw włącz optymalizację baterii."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Wykorzystanie przez ekran od ostatniego naładowania"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Zużycie przez ekran"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Skanowanie sieci komórkowej"</string>
@@ -2501,6 +2504,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Sygnał wybierania numeru alarmowego"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Skonfiguruj sposób działania w przypadku połączenia alarmowego"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Kopia zapasowa"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Wł."</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Wył."</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Tworzenie i przywracanie kopii zapasowej"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dane osobiste"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Utwórz kopię zapasową"</string>
@@ -2835,6 +2840,12 @@
       <item quantity="one">Sprawdź certyfikat</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Wielu użytkowników"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Użytkownicy i profile"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Dodaj użytkownika lub profil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Dodaj użytkownika"</string>
@@ -3019,14 +3030,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"użycie danych"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Połączone urządzenia"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, tryb samochodowy, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, tryb samochodowy"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacje i powiadomienia"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Uprawnienia, aplikacje domyślne"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Konta"</string>
@@ -3043,7 +3050,6 @@
     <string name="keywords_home" msgid="294182527446892659">"program uruchamiający, domyślny, aplikacje"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ekran, ekran dotykowy"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"przyciemnij ekran, ekran dotykowy, bateria, jasność"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"przyciemnij ekran, ekran dotykowy, bateria"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"przyciemnij ekran, noc, odcień, tryb nocy, jasność, kolor ekranu, kolor"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"tło, personalizuj, dostosuj wyświetlacz"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"rozmiar tekstu"</string>
@@ -3084,8 +3090,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"sieć, stan sieci komórkowej, stan usługi, moc sygnału, typ sieci komórkowej, roaming, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"numer seryjny, wersja sprzętu"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"stan aktualizacji zabezpieczeń Androida, wersja pasma podstawowego, wersja jądra"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ekran dostosowany do otoczenia, ekran blokady"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"odcisk palca"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"obrót, odwrócenie, rotacja, pionowo, poziomo, orientacja, pionowa, pozioma"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"aktualizacja, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"nie przeszkadzać, harmonogram, powiadomienia, blokować, wyciszanie, wibrowanie, uśpienie, praca, koncentracja, dźwięk, wyciszenie, dzień, dzień tygodnia, weekend, noc poza weekendem, wydarzenie"</string>
@@ -3170,18 +3180,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Zezwól na sygnały wizualne"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Po włączeniu trybu Nie przeszkadzać"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Powiadomienia"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Pokazuj powiadomienia bez dźwięku"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Powiadomienia będą wyciszone"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Brak dźwięku powiadomień"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Nie zobaczysz powiadomień na ekranie"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Telefon nie będzie sygnalizował powiadomień dźwiękiem ani wibracjami."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Ukryj powiadomienia"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Nowe i dotychczasowe powiadomienia nie będą wyświetlane"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Brak wizualnego i dźwiękowego sygnalizowania powiadomień"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Powiadomienia nie będą wyświetlane ani sygnalizowane dźwiękiem."</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Telefon nie będzie wyświetlać ani sygnalizować dźwiękiem oraz wibracjami nowych i dotychczasowych powiadomień. Powiadomienia nie pojawią się, gdy przesuniesz palcami w dół ekranu.\n\nPamiętaj, że powiadomienia o znaczeniu krytycznym dotyczące aktywności i stanu telefonu będą się pojawiały."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Niestandardowe"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Włącz ustawienia niestandardowe"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Usuń ustawienia niestandardowe"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Będą się pojawiać"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Brak dźwięku powiadomień"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Częściowo ukryte"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Ukryte"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Brak wizualnego i dźwiękowego sygnalizowania powiadomień"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Niestandardowe ograniczenia"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Gdy ekran jest włączony"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Gdy ekran jest wyłączony"</string>
@@ -3244,19 +3254,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Wyciszone, ale zezwól na: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> i <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Wiadomości, wydarzenia i przypomnienia"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Gdy włączysz tryb Nie przeszkadzać, wiadomości, przypomnienia i wydarzenia będą wyciszone. Wyciszenie nie będzie dotyczyło elementów, na które zezwolisz powyżej. Możesz dostosować ustawienia wiadomości, by znajomi, rodzina i inne osoby mogli do Ciebie zadzwonić."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Gotowe"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Ustawienia"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Brak wizualnego i dźwiękowego sygnalizowania powiadomień"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Brak dźwięku powiadomień"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Powiadomienia nie będą wyświetlane ani sygnalizowane dźwiękiem. Dozwolone są połączenia od kontaktów oznaczonych gwiazdką i dzwoniących powtórnie."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Aktualne ustawienie)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Zmienić ustawienia trybu Nie przeszkadzać?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Dźwięki w profilu do pracy"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Użyj dźwięków z profilu osobistego"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Dźwięki są takie same w profilu osobistym i do pracy"</string>
@@ -3436,12 +3440,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Zezwól na połączenia"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Gdy tryb Nie przeszkadzać jest włączony, połączenia przychodzące są zablokowane. Możesz dostosować ustawienia, by znajomi, rodzina i inne osoby z kontaktów mogli do Ciebie zadzwonić."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Kontakty oznaczone gwiazdką"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="few">i jeszcze <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="many">i jeszcze <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="other">i jeszcze <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="one">i jeszcze 1</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Wiadomości"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Zezwól na wiadomości"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Wiadomości"</string>
@@ -3897,10 +3896,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Chłodna temperatura kolorów"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Używaj chłodniejszych kolorów na ekranie"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Aby zastosować zmianę kolorów, wyłącz ekran"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitorowanie łączności"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor zbiera logi po wykryciu problemu z łącznością i powiadamia użytkownika o możliwości zgłoszenia błędu"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Aby zmiana ustawienia monitorowania łączności zaczęła obowiązywać, zrestartuj urządzenie"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Czujnik lasera aparatu"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Aparat logiczny jako domyślny"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatyczne aktualizacje systemu"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Zastosuj aktualizacje po ponownym uruchomieniu urządzenia"</string>
     <string name="usage" msgid="2977875522080448986">"Wykorzystanie danych"</string>
@@ -4238,8 +4235,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Usługa autouzupełniania"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatyczne, uzupełnianie, autouzupełnianie"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Sprawdź, czy ta aplikacja jest zaufana&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Autouzupełnianie Google&gt;%1$s&lt;/xliff:g&gt; na podstawie zawartości ekranu określa, co można uzupełnić automatycznie."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Motyw urządzenia"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Motyw kolorystyczny"</string>
     <string name="default_theme" msgid="7085644992078579076">"Wartość domyślna"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Motyw urządzenia"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automatyczny (na podstawie tapety)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Jasny"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Ciemny"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Nazwa sieci"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Wyświetlaj nazwę sieci na pasku stanu"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Menedżer miejsca: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4251,7 +4252,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informacje o obsłudze administracyjnej operatora"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Uruchom obsługę administracyjną operatora"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Zmień ustawienia trybu Nie przeszkadzać"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Ukryj powiadomienia, by Cię nie rozpraszały"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Wstrzymaj powiadomienia, by Cię nie rozpraszały"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Co nowego i fajnego?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Poznaj swój nowy telefon"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Poznaj swój nowy tablet"</string>
diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml
index 936f5e3..6bcb237 100644
--- a/res/values-pt-rBR/arrays.xml
+++ b/res/values-pt-rBR/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Sempre ativado"</item>
     <item msgid="6385301106124765323">"Sempre desativado"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 5bb5692..fa9a7ed 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Permita que seu tablet se comunique com dispositivos Bluetooth nas proximidades"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Permita que seu dispositivo se comunique com dispositivos Bluetooth nas proximidades"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Permite que seu smartphone se comunique com dispositivos Bluetooth nas proximidades"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Desat. descarga de hardware Bluetooth A2DP"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Reiniciar?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Reinicie o dispositivo para alterar essa configuração."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Reiniciar"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Cancelar"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Dispositivos de mídia disponíveis"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Dispositivos de chamada disponíveis"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Conectados no momento"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Preferências de conexão"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Dispositivos conectados anteriormente"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Conectados anteriormente"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Data e hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Selecione o fuso horário"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"A porta digitada não é válida."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"O proxy HTTP é usado pelo navegador, mas não pode ser usado por outros apps."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"URL do PAC: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Largura de banda DL (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Largura de banda UL (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Informações de local do celular (uso suspenso):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Informações do celular vizinho (uso suspenso):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Configuração do canal físico de LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Taxa de atualização das informações do celular:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Todas as informações de medição do celular:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Informações de conexão de dados em tempo real:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Serviço de dados:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar para ativar"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Exibição de ambiente"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Sempre ativado / Aumento do uso da bateria"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Novas notificações"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Quando mostrar"</string>
     <string name="doze_title" msgid="2375510714460456687">"Novas notificações"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Ativar a tela ao receber notificações"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="other">Código PIN do SIM incorreto. Tentativas restantes: <xliff:g id="NUMBER_1">%d</xliff:g>.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Falha na operação de PIN do SIM."</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status do tablet"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Status do telefone"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Atualizações do sistema"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versão do Android"</string>
@@ -2434,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Sinal de discagem de emergência"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Definir comportamento durante uma chamada de emergência"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Backup"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Ativado"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Desativado"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Backup e restauração"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dados pessoais"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Fazer backup"</string>
@@ -2760,6 +2766,12 @@
       <item quantity="other">Verificar certificados</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Vários usuários"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Usuários e perfis"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Adicionar usuário ou perfil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Adicionar usuário"</string>
@@ -2942,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"uso de dados"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"ponto de acesso"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivos conectados"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, Modo carro, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, Modo carro"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps e notificações"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permissões, apps padrão"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Contas"</string>
@@ -2966,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"tela de início, padrão, apps"</string>
     <string name="keywords_display" msgid="8910345814565493016">"tela, touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"escurecer tela, touchscreen, bateria, alto brilho"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"escurecer tela, touchscreen, bateria"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"escurecer tela, noite, tonalidade, noturno, brilho, cor da tela, cor"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"segundo plano, personalizar, personalizar tela"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tamanho do texto"</string>
@@ -3007,8 +3014,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"rede, estado da rede móvel, estado do serviço, potência do sinal, tipo de rede móvel, roaming, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"número de série, versão do hardware"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"nível do patch de segurança do android, versão da banda de base, versão do kernel"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Exibição ambiente, exibição de tela de bloqueio"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"impressão digital"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"escurecer tela, touchscreen, bateria, brilho inteligente, brilho dinâmico"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"girar, virar, rotação, retrato, paisagem, orientação, vertical, horizontal"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"upgrade, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"não perturbe, programação, notificações, bloquear, silenciar, vibrar, suspender, trabalho, focar, som, desativar som, dia, dia da semana, final de semana, durante a semana à noite, evento"</string>
@@ -3091,18 +3101,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permitir sinais visuais"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Quando o \"Não perturbe\" estiver ativado"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notificações"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Mostrar notificações de forma silenciosa"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"As notificações serão silenciadas"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Sem som de notificações"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Você verá notificações na sua tela"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Quando houver notificações, o smartphone não emitirá nenhum som ou vibração."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Ocultar notificações"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Não serão exibidas notificações novas ou existentes"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Sem aviso visual ou sonoro de notificações"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Você não verá nem ouvirá notificações"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Não serão exibidas notificações novas ou existentes no seu smartphone, e ele não emitirá nenhum som ou vibração. As notificações não serão exibidas quando você deslizar a tela de cima para baixo.\n\nObservações importantes: as notificações críticas para atividades e status do smartphone ainda serão exibidas."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Personalizado"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Ativar configuração personalizada"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Remover configuração personalizada"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Exibidas"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Sem som de notificações"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Parcialmente ocultas"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Ocultas"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Sem aviso visual ou sonoro de notificações"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Restrições personalizadas"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Quando a tela estiver ligada"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Quado a tela estiver desligada"</string>
@@ -3161,19 +3171,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Som desativado, mas permitido para <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> e <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mensagens, eventos e lembretes"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Quando o \"Não perturbe\" estiver ativado, mensagens, lembretes e eventos serão silenciados, com exceção dos itens permitidos por você acima. É possível ajustar as configurações de mensagens para permitir que seus amigos, familiares ou outros contatos falem com você."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Concluído"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Configurações"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Sem aviso visual ou sonoro de notificações"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Sem som para notificações"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Você não verá nem ouvirá notificações. As chamadas de contatos marcados com estrela e de autores de chamadas repetidas serão permitidas."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Configuração atual)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Alterar as configurações de notificação do \"Não perturbe\"?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Sons do perfil de trabalho"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Usar sons do perfil pessoal"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Os sons são os mesmos para os perfis pessoal e de trabalho"</string>
@@ -3345,10 +3349,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Permitir chamadas"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Quando o \"Não perturbe\" estiver ativado, as chamadas recebidas serão bloqueadas. Você pode ajustar as configurações para permitir que seus amigos, familiares ou outros contatos falem com você."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Contatos marcados com estrela"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">e mais <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="other">e mais <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mensagens"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Permitir mensagens"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Mensagens"</string>
@@ -3654,7 +3655,7 @@
     <string name="system_alert_window_apps_title" msgid="7005760279028569491">"Apps"</string>
     <string name="system_alert_window_access_title" msgid="6297115362542361241">"Sobrepor a outros apps"</string>
     <string name="permit_draw_overlay" msgid="7456536798718633432">"Permitir sobreposição a outros apps"</string>
-    <string name="allow_overlay_description" msgid="8961670023925421358">"Permite que esse app seja sobreposto a outros apps que você esteja usando. Ele pode interferir no uso que você faz desses apps ou alterar a forma como eles aparecem ou se comportam."</string>
+    <string name="allow_overlay_description" msgid="8961670023925421358">"Permite que esse app seja exibido em sobreposição a outros apps que você esteja usando. Pode haver interferência no uso e alteração nas atividades desses apps."</string>
     <string name="keywords_vr_listener" msgid="7441221822576384680">"rv realidade virtual ouvinte estéreo serviço de ajuda"</string>
     <string name="keywords_system_alert_window" msgid="5049498015597864850">"alerta do sistema janela caixa de diálogo sobreposição apps"</string>
     <string name="overlay_settings" msgid="6930854109449524280">"Sobrepor a outros apps"</string>
@@ -3778,10 +3779,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de cor fria"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Usar cores de tela mais frias"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar a alteração de cor, desative a tela"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitor de conectividade"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"O monitor de conectividade coletará registros quando detectar um problema de conectividade e enviará uma notificação ao usuário para informar um bug"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Para que a alteração do monitor de conectividade seja aplicada, reinicialize o dispositivo"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor a laser da câmera"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Câmera lógica como padrão"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Atualizações automáticas do sistema"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Aplicar atualizações quando o dispositivo for reiniciado"</string>
     <string name="usage" msgid="2977875522080448986">"Utilização"</string>
@@ -4091,8 +4090,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Preenchimento automático"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automático, preenchimento, preenchimento automático"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Você precisa confiar nesse app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=O Preenchimento automático do Google&gt;%1$s&lt;/xliff:g&gt; usa o que está na sua tela para determinar o que pode ser preenchido automaticamente."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Tema do dispositivo"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Tema de cores"</string>
     <string name="default_theme" msgid="7085644992078579076">"Padrão"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Tema do dispositivo"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automático (baseado no plano de fundo)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Claro"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Escuro"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Nome da rede"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Exibir o nome da rede na barra de status"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gerenciador de armazenamento: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4104,7 +4107,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informações de aprovisionamento da operadora"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Acionar aprovisionamento da operadora"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Atualizar o modo Não perturbe"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Ocultar notificações para manter o foco"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pausar notificações para manter o foco"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"O que há de novo e empolgante?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Faça um tour pelo seu novo smartphone"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faça um tour pelo seu novo tablet"</string>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index cbed03d..29f8bdd 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Sempre ativado"</item>
     <item msgid="6385301106124765323">"Sempre desativado"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index fc21d2c..0cbbecf 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Autorize o tablet a comunicar com dispositivos Bluetooth próximos."</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Autorize o dispositivo a comunicar com dispositivos Bluetooth próximos."</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Autorize o telemóvel a comunicar com dispositivos Bluetooth próximos."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Desat. descarga hardware Bluetooth A2DP"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Reiniciar disposit.?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Tem de reiniciar o dispositivo para alterar esta definição."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Reiniciar"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Cancelar"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Dispositivos multimédia disponíveis"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Dispositivos de chamada disponíveis"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Ligado atualmente"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Preferências de ligação"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Dispositivos ligados anteriormente"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Ligados anteriormente"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Data e hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Escolher o fuso horário"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"A porta introduzida não é válida."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"O proxy HTTP é utilizado pelo navegador, mas não pode ser utilizado por outras aplicações."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"URL do PAC: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Largura de banda de transferência (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Largura de banda de carregamento (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Informações da localização da célula (descontinuadas):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Informações de célula próxima (descontinuadas):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Configuração do canal físico LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Taxa de atualização das informações da célula:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Todas as informações de medição de células:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Informações em tempo real da ligação de dados:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Serviço de dados:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ativar ao levantar"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Visualização ambiente"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Sempre ativado/Maior utilização da bateria"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Novas notificações"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Quando apresentar"</string>
     <string name="doze_title" msgid="2375510714460456687">"Novas notificações"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Ativar o ecrã quando recebe notificações"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">Código PIN incorreto. Tem mais <xliff:g id="NUMBER_0">%d</xliff:g> tentativa antes de ter de contactar operador p/ desbloquear dispos.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Falha ao introduzir o PIN do cartão SIM!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Estado do tablet"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Estado do telefone"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Actualizações do sistema"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versão do Android"</string>
@@ -2434,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Sinal para marcação de emergência"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Definir o comportamento quando é efetuada uma chamada de emergência"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Cópia de segurança"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Ativada"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Desativada"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Fazer cópia de segurança e restaurar"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dados pessoais"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Fazer cópia de segurança dos dados"</string>
@@ -2760,6 +2766,12 @@
       <item quantity="one">Verificar certificado</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Vários utilizadores"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Utilizadores e perfis"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Adicionar utilizador ou perfil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Adicionar utilizador"</string>
@@ -2942,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"utilização de dados"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"zona Wi-Fi"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivos ligados"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, modo de condução, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, modo de condução"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicações e notificações"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Autorizações, aplicações predefinidas"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Contas"</string>
@@ -2966,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"iniciador, predefinição, aplicações"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ecrã, ecrã tátil"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"escurecer ecrã, ecrã tátil, bateria, brilho"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"escurecer ecrã, ecrã tátil, bateria"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"escurecer ecrã, noite, tonalidade, modo noturno, luminosidade, cor do ecrã, cor, cor"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"fundo, personalizar, personalizar visualização"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tamanho do texto"</string>
@@ -3007,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"rede, estado da rede móvel, estado do serviço, intensidade do sinal, tipo de rede móvel, roaming, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"número de série, versão de hardware"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"nível de patch de segurança android, versão da banda de base, versão do kernel"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Visualização de ambiente, visualização de ecrã de bloqueio"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"impressão digital"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"rodar, inverter, rotação, retrato, paisagem, orientação, vertical, horizontal"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"atualizar, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"não incomodar, agendar, notificações, bloquear, silêncio, vibrar, suspensão, trabalho, focar, som, desativar, dia, dia de semana, fim de semana, noite de semana, evento"</string>
@@ -3091,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permitir sinais visuais"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Quando o modo Não incomodar está ativado"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notificações"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Mostrar notificações sem som"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"O som das notificações é desativado."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Sem som de notificações"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Vê as notificações no ecrã."</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"O telemóvel não emite sons nem vibra quando recebe notificações."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Ocultar notificações"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Não verá notificações novas ou existentes."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Sem imagens ou som de notificações"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Não vê nem ouve notificações."</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"O telemóvel não apresenta notificações novas ou existentes e não emite sons nem vibra. As notificações não são apresentadas quando deslizar rapidamente a partir da parte superior do ecrã.\n\nTenha em atenção que as notificações críticas relativas à atividade e ao estado do telemóvel continuam a ser apresentadas."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Personalizadas"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Ativar definição personalizada"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Remover definição personalizada"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Serão apresentadas"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Sem som de notificações"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Parcialmente ocultas"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Ocultas"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Sem imagens ou som de notificações"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Restrições personalizadas"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Quando o ecrã estiver ligado"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Quando o ecrã estiver desligado"</string>
@@ -3161,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Desativado, mas permitir <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> e <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>."</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mensagens, eventos e lembretes"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Quando o modo Não incomodar está ativo, o som de mensagens, lembretes e eventos é desativado, exceto para os itens que permitir acima. Pode ajustar as definições para permitir que os seus amigos, a sua família ou outras pessoas o contactem."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Concluído"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Definições"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Sem imagens ou som de notificações"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Sem som de notificações"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Não vê nem ouve notificações. São permitidas chamadas de contactos marcados com uma estrela ou de autores de chamadas repetentes."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Definição atual)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Pretende alterar as definições de notificação do modo Não incomodar?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Sons do perfil de trabalho"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Util. sons do perfil pessoal"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Os sons são iguais para os perfis de trabalho e pessoal"</string>
@@ -3345,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Permitir chamadas"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Quando o modo Não incomodar está ativo, as chamadas recebidas são bloqueadas. Pode ajustar as definições para permitir que os seus amigos, a sua família ou outras pessoas o contactem."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Contactos marcados com estrela"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">e mais <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="one">e mais 1</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mensagens"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Permitir mensagens"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Mensagens"</string>
@@ -3778,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura da cor fria"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilizar cores de visualização mais frias"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar uma alteração de cor, desligue o ecrã"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitor de conetividade"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"O Monitor de conetividade recolhe registos quando deteta um problema de conetividade e apresenta uma notificação ao utilizador para comunicar um erro."</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Para aplicar a alteração do monitor de conetividade, reinicie o dispositivo."</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor de laser da câmara"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Câmara lógica por predefinição"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Atualizações do sistema automáticas"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Aplique as atualizações quando o dispositivo for reiniciado."</string>
     <string name="usage" msgid="2977875522080448986">"Utilização"</string>
@@ -4091,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Preenchimento automático"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automático, preenchimento, preenchimento automático"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Certifique-se de que confia nesta aplicação&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=O Preenchimento automático do Google&gt;%1$s&lt;/xliff:g&gt; utiliza o que está no ecrã para determinar o que pode ser preenchido automaticamente."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Tema do dispositivo"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Tema de cores"</string>
     <string name="default_theme" msgid="7085644992078579076">"Predefinição"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Tema do dispositivo"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automático (com base na imagem de fundo)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Claro"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Escuro"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Nome da rede"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Apresentar o nome da rede na barra de estado"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gestor de armazenamento: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4104,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informações de fornecimento do operador"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Acionar fornecimento do operador"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Atualizar o modo Não incomodar"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Ocultar notificações para se manter concentrado"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Coloque as notificações em pausa para se manter concentrado."</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Quais são as grandes novidades?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Faça uma visita guiada ao seu novo telemóvel"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faça uma visita guiada ao seu novo tablet"</string>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 936f5e3..6bcb237 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Sempre ativado"</item>
     <item msgid="6385301106124765323">"Sempre desativado"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 5bb5692..fa9a7ed 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Permita que seu tablet se comunique com dispositivos Bluetooth nas proximidades"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Permita que seu dispositivo se comunique com dispositivos Bluetooth nas proximidades"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Permite que seu smartphone se comunique com dispositivos Bluetooth nas proximidades"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Desat. descarga de hardware Bluetooth A2DP"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Reiniciar?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Reinicie o dispositivo para alterar essa configuração."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Reiniciar"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Cancelar"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Dispositivos de mídia disponíveis"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Dispositivos de chamada disponíveis"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Conectados no momento"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Preferências de conexão"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Dispositivos conectados anteriormente"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Conectados anteriormente"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Data e hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Selecione o fuso horário"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"A porta digitada não é válida."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"O proxy HTTP é usado pelo navegador, mas não pode ser usado por outros apps."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"URL do PAC: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Largura de banda DL (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Largura de banda UL (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Informações de local do celular (uso suspenso):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Informações do celular vizinho (uso suspenso):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Configuração do canal físico de LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Taxa de atualização das informações do celular:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Todas as informações de medição do celular:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Informações de conexão de dados em tempo real:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Serviço de dados:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar para ativar"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Exibição de ambiente"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Sempre ativado / Aumento do uso da bateria"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Novas notificações"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Quando mostrar"</string>
     <string name="doze_title" msgid="2375510714460456687">"Novas notificações"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Ativar a tela ao receber notificações"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="other">Código PIN do SIM incorreto. Tentativas restantes: <xliff:g id="NUMBER_1">%d</xliff:g>.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Falha na operação de PIN do SIM."</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status do tablet"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Status do telefone"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Atualizações do sistema"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versão do Android"</string>
@@ -2434,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Sinal de discagem de emergência"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Definir comportamento durante uma chamada de emergência"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Backup"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Ativado"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Desativado"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Backup e restauração"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dados pessoais"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Fazer backup"</string>
@@ -2760,6 +2766,12 @@
       <item quantity="other">Verificar certificados</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Vários usuários"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Usuários e perfis"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Adicionar usuário ou perfil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Adicionar usuário"</string>
@@ -2942,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"uso de dados"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"ponto de acesso"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivos conectados"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, Modo carro, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, Modo carro"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps e notificações"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permissões, apps padrão"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Contas"</string>
@@ -2966,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"tela de início, padrão, apps"</string>
     <string name="keywords_display" msgid="8910345814565493016">"tela, touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"escurecer tela, touchscreen, bateria, alto brilho"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"escurecer tela, touchscreen, bateria"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"escurecer tela, noite, tonalidade, noturno, brilho, cor da tela, cor"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"segundo plano, personalizar, personalizar tela"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tamanho do texto"</string>
@@ -3007,8 +3014,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"rede, estado da rede móvel, estado do serviço, potência do sinal, tipo de rede móvel, roaming, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"número de série, versão do hardware"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"nível do patch de segurança do android, versão da banda de base, versão do kernel"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Exibição ambiente, exibição de tela de bloqueio"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"impressão digital"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"escurecer tela, touchscreen, bateria, brilho inteligente, brilho dinâmico"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"girar, virar, rotação, retrato, paisagem, orientação, vertical, horizontal"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"upgrade, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"não perturbe, programação, notificações, bloquear, silenciar, vibrar, suspender, trabalho, focar, som, desativar som, dia, dia da semana, final de semana, durante a semana à noite, evento"</string>
@@ -3091,18 +3101,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permitir sinais visuais"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Quando o \"Não perturbe\" estiver ativado"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notificações"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Mostrar notificações de forma silenciosa"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"As notificações serão silenciadas"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Sem som de notificações"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Você verá notificações na sua tela"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Quando houver notificações, o smartphone não emitirá nenhum som ou vibração."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Ocultar notificações"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Não serão exibidas notificações novas ou existentes"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Sem aviso visual ou sonoro de notificações"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Você não verá nem ouvirá notificações"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Não serão exibidas notificações novas ou existentes no seu smartphone, e ele não emitirá nenhum som ou vibração. As notificações não serão exibidas quando você deslizar a tela de cima para baixo.\n\nObservações importantes: as notificações críticas para atividades e status do smartphone ainda serão exibidas."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Personalizado"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Ativar configuração personalizada"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Remover configuração personalizada"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Exibidas"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Sem som de notificações"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Parcialmente ocultas"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Ocultas"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Sem aviso visual ou sonoro de notificações"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Restrições personalizadas"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Quando a tela estiver ligada"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Quado a tela estiver desligada"</string>
@@ -3161,19 +3171,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Som desativado, mas permitido para <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> e <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mensagens, eventos e lembretes"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Quando o \"Não perturbe\" estiver ativado, mensagens, lembretes e eventos serão silenciados, com exceção dos itens permitidos por você acima. É possível ajustar as configurações de mensagens para permitir que seus amigos, familiares ou outros contatos falem com você."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Concluído"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Configurações"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Sem aviso visual ou sonoro de notificações"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Sem som para notificações"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Você não verá nem ouvirá notificações. As chamadas de contatos marcados com estrela e de autores de chamadas repetidas serão permitidas."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Configuração atual)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Alterar as configurações de notificação do \"Não perturbe\"?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Sons do perfil de trabalho"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Usar sons do perfil pessoal"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Os sons são os mesmos para os perfis pessoal e de trabalho"</string>
@@ -3345,10 +3349,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Permitir chamadas"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Quando o \"Não perturbe\" estiver ativado, as chamadas recebidas serão bloqueadas. Você pode ajustar as configurações para permitir que seus amigos, familiares ou outros contatos falem com você."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Contatos marcados com estrela"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">e mais <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="other">e mais <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mensagens"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Permitir mensagens"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Mensagens"</string>
@@ -3654,7 +3655,7 @@
     <string name="system_alert_window_apps_title" msgid="7005760279028569491">"Apps"</string>
     <string name="system_alert_window_access_title" msgid="6297115362542361241">"Sobrepor a outros apps"</string>
     <string name="permit_draw_overlay" msgid="7456536798718633432">"Permitir sobreposição a outros apps"</string>
-    <string name="allow_overlay_description" msgid="8961670023925421358">"Permite que esse app seja sobreposto a outros apps que você esteja usando. Ele pode interferir no uso que você faz desses apps ou alterar a forma como eles aparecem ou se comportam."</string>
+    <string name="allow_overlay_description" msgid="8961670023925421358">"Permite que esse app seja exibido em sobreposição a outros apps que você esteja usando. Pode haver interferência no uso e alteração nas atividades desses apps."</string>
     <string name="keywords_vr_listener" msgid="7441221822576384680">"rv realidade virtual ouvinte estéreo serviço de ajuda"</string>
     <string name="keywords_system_alert_window" msgid="5049498015597864850">"alerta do sistema janela caixa de diálogo sobreposição apps"</string>
     <string name="overlay_settings" msgid="6930854109449524280">"Sobrepor a outros apps"</string>
@@ -3778,10 +3779,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de cor fria"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Usar cores de tela mais frias"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Para aplicar a alteração de cor, desative a tela"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitor de conectividade"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"O monitor de conectividade coletará registros quando detectar um problema de conectividade e enviará uma notificação ao usuário para informar um bug"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Para que a alteração do monitor de conectividade seja aplicada, reinicialize o dispositivo"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor a laser da câmera"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Câmera lógica como padrão"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Atualizações automáticas do sistema"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Aplicar atualizações quando o dispositivo for reiniciado"</string>
     <string name="usage" msgid="2977875522080448986">"Utilização"</string>
@@ -4091,8 +4090,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Preenchimento automático"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automático, preenchimento, preenchimento automático"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Você precisa confiar nesse app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=O Preenchimento automático do Google&gt;%1$s&lt;/xliff:g&gt; usa o que está na sua tela para determinar o que pode ser preenchido automaticamente."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Tema do dispositivo"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Tema de cores"</string>
     <string name="default_theme" msgid="7085644992078579076">"Padrão"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Tema do dispositivo"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automático (baseado no plano de fundo)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Claro"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Escuro"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Nome da rede"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Exibir o nome da rede na barra de status"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gerenciador de armazenamento: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4104,7 +4107,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informações de aprovisionamento da operadora"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Acionar aprovisionamento da operadora"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Atualizar o modo Não perturbe"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Ocultar notificações para manter o foco"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pausar notificações para manter o foco"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"O que há de novo e empolgante?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Faça um tour pelo seu novo smartphone"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faça um tour pelo seu novo tablet"</string>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index db4b19c..1ad9095 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Activat permanent"</item>
     <item msgid="6385301106124765323">"Dezactivat permanent"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 995dcf6..098994c 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -174,6 +174,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Permiteți tabletei să comunice cu dispozitivele Bluetooth din apropiere"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Permiteți dispozitivului să comunice cu dispozitivele Bluetooth din apropiere"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Permiteți telefonului să comunice cu dispozitivele Bluetooth din apropiere"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Dezactivați descărcarea prin hardware cu Bluetooth A2DP"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Reporniți dispoz.?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Trebuie să reporniți dispozitivul pentru a modifica setarea."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Reporniți"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Anulați"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Dispozitive media disponibile"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Dispozitive de apel disponibile"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Conectat în prezent"</string>
@@ -183,6 +188,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Preferințe pentru conexiune"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Dispozitive conectate anterior"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Conectat anterior"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Data și ora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Selectați fusul orar"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -208,11 +215,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Portul introdus nu este valid."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy-ul HTTP este utilizat de browser, dar nu poate fi utilizat de alte aplicații."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"Adresă URL fișier PAC: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Lățime de bandă de descărcare (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Lățime de bandă de încărcare (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Informații despre localizarea celulei (învechite):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Informații despre celula învecinată (învechite):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Configurarea canalului fizic LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Frecvența de actualizare a informațiilor despre celulă:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Toate informațiile de măsurare despre celulă:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Informații în timp real despre conexiunea de date:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Serviciu de date:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1162,8 +1170,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminozitate automată"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ridicați pentru a reactiva"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Afișaj ambiental"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Activat permanent/Utilizare ridicată a bateriei"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Notificări noi"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Când se afișează"</string>
     <string name="doze_title" msgid="2375510714460456687">"Notificări noi"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Activează ecranul când primiți notificări"</string>
@@ -1209,8 +1215,6 @@
       <item quantity="one">Cod PIN incorect pt. card SIM. <xliff:g id="NUMBER_0">%d</xliff:g> încercare rămasă, apoi deblocați dispozitivul contactând operatorul.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Deblocarea cu ajutorul codului PIN pentru cardul SIM nu a reușit!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stare tabletă"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Stare telefon"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Actualizări de sistem"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versiune Android"</string>
@@ -2467,6 +2471,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Semnal pentru apel de urgență"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Setați comportamentul la efectuarea unui apel de urgență"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Backup"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Activat"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Dezactivat"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Backup și restabilire"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Date personale"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Backup pentru date"</string>
@@ -2797,6 +2803,12 @@
       <item quantity="one">Verificați certificatul</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Utilizatori multipli"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Utilizatori și profiluri"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Adăugați un utilizator/un profil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Adăugați un utilizator"</string>
@@ -2980,14 +2992,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"utilizarea datelor"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispozitive conectate"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, modul Cu mașina, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, modul Cu mașina"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicații și notificări"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permisiuni, aplicații prestabilite"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Conturi"</string>
@@ -3004,7 +3012,6 @@
     <string name="keywords_home" msgid="294182527446892659">"lansator, prestabilit, aplicații"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ecran, ecran tactil"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"reduceți luminozitatea ecranului, ecran tactil, baterie, strălucitor"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"reduceți luminozitatea ecranului, ecran tactil, baterie"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"reduceți luminozitatea ecranului, noapte, nuanță, mod noapte, luminozitate, culoarea ecranului, culoare"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"fundal, personalizați, personalizați afișarea"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"dimensiunea textului"</string>
@@ -3045,8 +3052,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"rețea, starea rețelei mobile, starea acoperirii, puterea semnalului, tip de rețea mobilă, roaming, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"număr de serie, versiune de hardware"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"nivelul corecției de securitate Android, versiunea benzii de bază, versiune nucleu"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Afișare ambient, Afișare ecran de blocare"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"amprentă"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"reduceți luminozitatea ecranului, ecran tactil, luminozitate inteligentă, luminozitate dinamică"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"rotiți, comutați, rotire, portret, peisaj, orientare, vertical, orizontal"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"upgrade, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"Nu deranja, program, notificări, blocați, dezactivați sonorul, vibrații, inactivitate, serviciu, concentrare, sunet, sunet dezactivat, zi, zi din săptămână, weekend, seară din săptămână, eveniment"</string>
@@ -3130,18 +3140,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permiteți semnale vizuale"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Când este activată setarea „Nu deranja”"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Notificări"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Afișați notificările cu sunet dezactivat"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Sunetul pentru notificări va fi dezactivat"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Fără sunet de la notificări"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Veți vedea notificările pe ecran"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Când sosesc notificările, telefonul nu va scoate niciun sunet și nu va vibra."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Ascundeți notificările"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Nu veți vedea notificări noi sau existente"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Fără imagini sau sunet de la notificări"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Nu veți vedea și nu veți auzi notificări"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Telefonul nu va afișa notificări noi sau existente, nu va emite niciun sunet și nu va vibra. Nu se vor afișa notificările când glisați în jos din partea de sus a ecranului.\n\nRețineți: se vor afișa totuși notificările foarte importante pentru activitatea și starea telefonului."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Personalizat"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Activați setarea personalizată"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Eliminați setarea personalizată"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Se afișează"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Fără sunet de la notificări"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Parțial ascunse"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Ascunse"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Fără imagini sau sunet de la notificări"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Restricții personalizate"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Când ecranul este activat"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Când ecranul este dezactivat"</string>
@@ -3202,19 +3212,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Sunetul este dezactivat, dar permiteți <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> și <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mesaje, evenimente și mementouri"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Când este activată funcția Nu deranja, sunetele pentru mesaje, mementouri și evenimente vor fi dezactivate, cu excepția elementelor pe care le permiteți mai sus. Puteți să modificați setările pentru mesaje ca să le permiteți prietenilor, familiei sau altor persoane de contact să vă contacteze."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Gata"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Setări"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Fără imagini sau sunet de la notificări"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Fără sunet de la notificări"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Nu veți vedea și nu veți auzi notificări. Sunt permise apelurile de la persoanele de contact marcate cu stea și de la apelanții care revin."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Setarea curentă)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Modificați setările pentru notificări ale modului „Nu deranja”?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Sunetele profilului de serviciu"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Folosiți sunetele profilului personal"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Sunetele profilului de serviciu sunt aceleași ca la profilul personal"</string>
@@ -3390,11 +3394,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Permiteți apeluri"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Când este activată funcția Nu deranja, apelurile primite sunt blocate. Puteți să modificați setările ca să le permiteți prietenilor, familiei sau altor persoane de contact să vă contacteze."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Persoane din agendă marcate cu stea"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="few">și încă <xliff:g id="NUM_PEOPLE">%d</xliff:g> persoane</item>
-      <item quantity="other">și încă <xliff:g id="NUM_PEOPLE">%d</xliff:g> de persoane</item>
-      <item quantity="one">și încă o persoană</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mesaje"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Permiteți mesaje"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Mesaje"</string>
@@ -3837,10 +3837,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura culorii: rece"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Folosiți culori mai reci pentru afișare"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Pentru a aplica modificarea culorilor, dezactivați ecranul"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Connectivity Monitor colectează jurnalele când detectează o problemă de conectivitate și trimite notificări utilizatorilor să semnaleze o eroare"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Pentru a aplica modificarea pentru Connectivity Monitor, reporniți dispozitivul"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Senzor laser al camerei foto"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Utilizați în mod prestabilit camera foto logică"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Actualizări automate de sistem"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Aplicați actualizările când repornește dispozitivul"</string>
     <string name="usage" msgid="2977875522080448986">"Utilizare"</string>
@@ -4164,8 +4162,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Serviciu de completare automată"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automată, completare, completare automată"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Asigurați-vă că aveți încredere în această aplicație&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Completarea automată Google&gt;%1$s&lt;/xliff:g&gt; folosește conținutul de pe ecran pentru a stabili ce se poate completa automat."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Tema dispozitivului"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Temă de culoare"</string>
     <string name="default_theme" msgid="7085644992078579076">"Prestabilită"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Tema dispozitivului"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automată (în funcție de imaginea de fundal)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Deschisă"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Întunecată"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Numele rețelei"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Afișați numele rețelei în bara de stare"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Managerul spațiului de stocare: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4177,7 +4179,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informații despre provizionarea operatorului"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Declanșați provizionarea operatorului"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Actualizați funcția Nu deranja"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Ascundeți notificările pentru a vă păstra concentrarea"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Întrerupeți notificările pentru a vă păstra concentrarea"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Ce este nou și interesant?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Faceți un tur al noului dvs. telefon"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faceți un tur al noii dvs. tablete"</string>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 41b5b36..582ac93 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Всегда включен"</item>
     <item msgid="6385301106124765323">"Всегда отключен"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index fb70009..f8984ba 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -175,6 +175,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Разрешить планшету обмениваться данными с другими устройствами Bluetooth."</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Разрешить устройству обмениваться данными с другими устройствами Bluetooth."</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Разрешить телефону обмениваться данными с другими устройствами Bluetooth."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Отключить аппаратную разгрузку профиля Bluetooth A2DP"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Требуется перезапуск"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Чтобы изменить эту настройку, перезапустите устройство."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Перезапуск"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Отмена"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Доступные медиаустройства"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Доступные устройства для совершения звонков"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Текущие подключения"</string>
@@ -184,6 +189,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Настройки подключения"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Ранее подключенные устройства"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Ранее подключенные устройства"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Дата и время"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Выбрать часовой пояс"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -209,11 +216,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Указанный порт недействителен."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Прокси-сервер HTTP используется только браузером."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"URL автоконфигур. прокси: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Пропускная способность DL-канала (кбит/c):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Пропускная способность UL-канала (кбит/с):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Информация о местоположении сети (устаревшее):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Данные о соседней станции (устаревшее):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Конфигурация физического канала LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Частота обновления данных о сетях:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Статистика сети:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Информация о передаче данных в режиме реального времени:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Сервис для передачи данных:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Роуминг:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1178,8 +1186,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Автонастройка"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Активация в вертикальном положении"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Автоматич. включение экрана"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Всегда включено (батарея разряжается быстрее)"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"При новых уведомлениях"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Когда включать экран"</string>
     <string name="doze_title" msgid="2375510714460456687">"При новых уведомлениях"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Включать экран, когда приходит уведомление"</string>
@@ -1226,8 +1232,6 @@
       <item quantity="other">Неверный PIN-код. Осталось <xliff:g id="NUMBER_1">%d</xliff:g> попыток. После этого SIM-карта будет заблокирована и вам придется обратиться к оператору связи.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Не удалось разблокировать SIM-карту"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Состояние планшетного ПК"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Состояние телефона"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Обновление системы"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Версия Android"</string>
@@ -2166,8 +2170,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Невозможно ограничить работу в фоновом режиме"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Ограничить работу в фоновом режиме?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Это действие может привести к неправильной работе приложения."</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Оптимизация расхода заряда батареи для этого приложения не настроена.\n\nВключите ее, чтобы установить ограничения."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Использование экрана с момента полной зарядки"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Потребление энергии экраном"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Сканирование мобильной сети"</string>
@@ -2501,6 +2504,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Сигнал набора номера при экстренных вызовах"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Настроить режим работы при экстренном вызове"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Резервное копирование"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"ВКЛ"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"ВЫКЛ"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Резервное копирование и восстановление"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Возврат к заводским настройкам"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Резервирование данных"</string>
@@ -2835,6 +2840,12 @@
       <item quantity="other">Проверить сертификаты</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Несколько пользователей"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Пользователи и профили"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Добавить пользователя или профиль"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Добавить пользователя"</string>
@@ -3019,14 +3030,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"передача данных"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"точка доступа"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Подключенные устройства"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, NFC, режим вождения"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, режим вождения"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Приложения и уведомления"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Разрешения, приложения по умолчанию"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Аккаунты"</string>
@@ -3043,7 +3050,6 @@
     <string name="keywords_home" msgid="294182527446892659">"панель запуска, по умолчанию, приложения"</string>
     <string name="keywords_display" msgid="8910345814565493016">"экран, сенсорный экран"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"снижение яркости, сенсорный экран, батарея, яркий"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"яркость, сенсорный экран, батарея"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"снижение яркости, ночь, оттенок, ночной режим, яркость, цвет экрана, цвет"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"фон, настройка, пользовательский дисплей"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"размер шрифта"</string>
@@ -3084,8 +3090,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"сеть, подключение к мобильной сети, доступность мобильной сети, уровень сигнала, тип мобильной сети, роуминг, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"серийный номер, версия аппаратного обеспечения"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"обновление системы безопасности, прошивка модуля связи, версия ядра"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Автоматическое включение экрана, заблокированный экран"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"отпечаток пальца"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"повернуть, перевернуть, поворот, вертикальная, горизонтальная, ориентация, портрет, пейзаж"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"обновить, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"не беспокоить, расписание, уведомления, заблокировать, беззвучный режим, вибрировать, сон, работа, концентрация, звук, отключить звук, день, рабочий день, выходной день, вечер рабочего дня, мероприятие"</string>
@@ -3170,18 +3180,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Включить визуальное оповещение"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Режим \"Не беспокоить\""</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Уведомления"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Показывать без звука"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Уведомления будут приходить без звука."</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Отключить звук уведомлений"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Уведомления будут показываться на экране"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Уведомления будут приходить без звука и вибрации."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Скрывать уведомления"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Существующие и новые уведомления показываться не будут."</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Полностью отключить уведомления"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Уведомления будут полностью отключены"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Существующие и новые уведомления показываться не будут. Звук и вибрация будут отключены. Также уведомления не будут появляться, если вы проводите пальцем по экрану сверху вниз.\n\nОбратите внимание, что вы будете получать важные уведомления, которые необходимы для работы основных функций телефона."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Специальные настройки"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Включить специальные настройки"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Отключить специальные настройки"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Показывать"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Отключить звук уведомлений"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Скрывать частично"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Скрывать"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Полностью отключить уведомления"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Пользовательские ограничения"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"При включенном экране"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"При отключенном экране"</string>
@@ -3244,19 +3254,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Без звука, кроме: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> и <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Сообщения, напоминания и уведомления о мероприятиях"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"В режиме \"Не беспокоить\" сообщения, напоминания и уведомления о мероприятиях будут приходить без звука, за исключением тех, для которых вы задали разрешения выше. Вы можете изменить настройки, чтобы сообщения от друзей, членов семьи и других контактов приходили со звуком."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"ОК"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Настройки"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Полностью отключить уведомления"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Отключить звук уведомлений"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Уведомления будут полностью отключены. Вы сможете получать звонки только от помеченных контактов и от людей, звонящих повторно."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(выбрано)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Изменить настройки уведомлений в режиме \"Не беспокоить\"?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Сигналы в рабочем профиле"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Выбрать звуки личного профиля"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Одинаковые сигналы в рабочем и личном профиле"</string>
@@ -3436,12 +3440,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Звонки"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"В режиме \"Не беспокоить\" входящие вызовы заблокированы. Вы можете изменить настройки, чтобы принимать вызовы от друзей, членов семьи и других контактов."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Помеченные контакты"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">и ещё <xliff:g id="NUM_PEOPLE">%d</xliff:g> человек</item>
-      <item quantity="few">и ещё <xliff:g id="NUM_PEOPLE">%d</xliff:g> человека</item>
-      <item quantity="many">и ещё <xliff:g id="NUM_PEOPLE">%d</xliff:g> человек</item>
-      <item quantity="other">и ещё <xliff:g id="NUM_PEOPLE">%d</xliff:g> человека</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Сообщения"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Сообщения"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Сообщения"</string>
@@ -3897,10 +3896,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Холодные оттенки"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Использовать более холодные цвета на экране"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Для изменения цветовых настроек нужно отключить экран"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Обнаружив проблему подключения, Connectivity Monitor будет собирать журналы и предлагать пользователю отправить отчет об ошибке"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Чтобы включить Connectivity Monitor, перезагрузите устройство"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Лазерный датчик камеры"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Логическая камера по умолчанию"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматические обновления системы"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Устанавливать обновления при перезагрузке устройства"</string>
     <string name="usage" msgid="2977875522080448986">"Передача данных"</string>
@@ -4238,8 +4235,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Автозаполнение"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"автоматически, заполнять, автозаполнение"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Убедитесь, что это приложение безопасно&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; анализирует содержимое экрана и находит поля, которые можно заполнить автоматически."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Тема устройства"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Цветовая тема"</string>
     <string name="default_theme" msgid="7085644992078579076">"По умолчанию"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Тема устройства"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Автоматический выбор (в зависимости от обоев)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Светлая"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Темная"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Название сети"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Показывать название сети в строке состояния"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Менеджер хранилища: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4251,7 +4252,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Сведения об операторе"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Запустить синхронизацию оператора"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Включите режим \"Не беспокоить\""</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Скройте отвлекающие уведомления"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Заблокируйте отвлекающие уведомления"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Что нового?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Познакомьтесь со своим новым телефоном"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Познакомьтесь со своим новым планшетом"</string>
diff --git a/res/values-si/arrays.xml b/res/values-si/arrays.xml
index 2273e7a..c8d656a 100644
--- a/res/values-si/arrays.xml
+++ b/res/values-si/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"සැමවිට ක්‍රියාත්මකයි"</item>
     <item msgid="6385301106124765323">"සැමවිට ක්‍රියාවිරහිතයි"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 970519d..fd643a9 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"ඔබගේ ටැබ්ලට් උපාංගයට අවට බ්ලූටූත් උපාංග සමඟ සන්නිවේදනයට ඉඩ දෙන්න"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"ඔබගේ උපාංගයට අවට බ්ලූටූත් උපාංග සමඟ සන්නිවේදනයට ඉඩ දෙන්න"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"ඔබගේ දුරකථනයට අවට බ්ලූටූත් උපාංග සමඟ සන්නිවේදනයට ඉඩ දෙන්න"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"බ්ලූටූත් A2DP දෘඪාංග ඕෆ්ලෝඩ් අබල කරන්න"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"උපාංගය නැවත අරඹන්නද?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"මෙම සැකසීම වෙනස් කිරීමට ඔබ ඔබේ උපාංගය නැවත ඇරඹීම අවශ්‍යයි."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"යළි අරඹන්න"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"අවලංගු කර."</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"තිබෙන මාධ්‍ය උපාංග"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"තිබෙන ඇමතුම් උපාංග"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"දැනට සම්බන්ධ වී ඇත"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"සම්බන්ධතා මනාප"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"පෙර සම්බන්ධිත උපාංග"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"පෙර සම්බන්ධිත"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"දිනය සහ වේලාව"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"වේලා කලාපය තෝරන්න"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"ඔබ සඳහන් කළ තොට වලංගු නැත."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP නියුතුව බ්‍රව්සරය විසින් භාවිත කරන අතර වෙනත් යෙදුම් වලින් භාවිත නොකළ හැක."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL කලාප පළල (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL කලාප පළල (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"සෙල් ස්ථාන තොරතුරු (අත් හරින ලදී):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"අවට සෙල් තොරතුරු (අත් හරින ලදී):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE භෞතික නාලිකා වින්‍යාසය:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"සෙල් තොරතුරු යළි නැවුම් කිරීමේ අනුපාතය:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"සියලු සෙල් මිනුම් තොරතුරු:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"දත්ත සබැඳුම් තථ්‍ය-කාල තොරතුරු:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"දත්ත සේවාව:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"රෝමින්:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI"</string>
@@ -1007,16 +1015,11 @@
     <string name="emergency_address_title" msgid="932729250447887545">"හදිසි අවස්ථා ලිපිනය"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"ඔබ Wi-Fi හරහා හදිසි ඇමතුමක් ලබා ගන්නා විට ඔබගේ ස්ථානය ලෙස භාවිතා වේ"</string>
     <string name="private_dns_help_message" msgid="3299567069152568958">"පුද්ගලික DNS විශේෂාංග ගැන "<annotation id="url">"තව දැන ගන්න"</annotation></string>
-    <!-- no translation found for wifi_calling_pref_managed_by_carrier (6845711858866828986) -->
-    <skip />
-    <!-- no translation found for wifi_calling_settings_activation_instructions (7492509632478260955) -->
-    <skip />
-    <!-- no translation found for wifi_calling_turn_on (1171403510313983983) -->
-    <skip />
-    <!-- no translation found for wifi_calling_not_supported (7878640438907807754) -->
-    <skip />
-    <!-- no translation found for carrier (5264014738689761132) -->
-    <skip />
+    <string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"වාහකය මගින් කළමනාකරණය කළ සැකසීම"</string>
+    <string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Wi-Fi ඇමතුම සක්‍රිය කරන්න"</string>
+    <string name="wifi_calling_turn_on" msgid="1171403510313983983">"Wi-Fi ඇමතුම ක්‍රියාත්මක කරන්න"</string>
+    <string name="wifi_calling_not_supported" msgid="7878640438907807754">"Wi‑Fi ඇමතුම %1$s සඳහා සහාය නොදේ"</string>
+    <string name="carrier" msgid="5264014738689761132">"වාහකය"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"සංදර්ශකය"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ශබ්ද"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ශබ්ද තීව්‍රතා"</string>
@@ -1151,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"ස්වයංක්‍රිය දීප්තිය"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"අවදි කිරීමට ඔසවන්න"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"ස්ථානික සංදර්ශකය"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"සැම විට ක්‍රියාත්මකයි / වැඩි බැටරි භාවිතය"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"නව දැනුම්දීම්"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"පෙන්වන අවස්ථාව"</string>
     <string name="doze_title" msgid="2375510714460456687">"නව දැනුම්දීම්"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ඔබට දැනුම්දීම් ලැබුණ විට තිරය අවදි කරන්න"</string>
@@ -1197,8 +1198,6 @@
       <item quantity="other">වැරදී SIM PIN කේතයකි, ඔබගේ දුරකථනයේ අඟුල හැරීමට ඔබගේ වාහකයා සම්බන්ධ කරගැනීමට පෙර ඔබ සතුව තවත් උත්සාහයන් <xliff:g id="NUMBER_1">%d</xliff:g> ක් ඉතිරිව ඇත.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM PIN ක්‍රියාවලිය අපොහොසත් විය!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"ටැබ්ලට් තත්වය"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"දුරකථනයේ තත්වය"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"පද්ධති යාවත්කාලීන"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android අනුවාදය"</string>
@@ -2119,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"පසුබිම් භාවිතය සීමා කළ නොහැකිය"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"පසුබිම් ක්‍රියාකාරිත්වය සීමා කරන්නද?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"ඔබ යෙදුමක පසුබිම් ක්‍රියාකාරිත්වය සීමා කළහොත්, එය වැරදි ලෙස ක්‍රියා කරනු ඇත"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"මෙම යෙදුම බැටරිය ප්‍රශස්ත කිරීමට සකසා නැති නිසා, ඔබට එය සීමා කළ නොහැකිය. \n\nයෙදුම සීමා කිරීම සඳහා, පළමුව බැටරි ප්‍රශස්තකරණය ක්‍රියාත්මක කරන්න."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"පූර්ණ ආරෝපණයෙන් පසුව තිර භාවිතය"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"තිර පරිභෝජනය"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"ජංගම ජාල පරිලෝකනය කරමින්"</string>
@@ -2440,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"හදිසි අවස්ථා ඩයල් කිරීමේ සංඥාව"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"හදිසි ඇමතුමක් ලැබුණ විට හැසිරීම සකසන්න"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"උපස්ථය"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"ක්‍රියාත්මකයි"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"ක්‍රියාවිරහිතයි"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"උපස්ථය සහ පිළිනැගුම"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"පුද්ගලික දත්ත"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"මගේ දත්ත උපස්ථ කරන්න"</string>
@@ -2766,6 +2766,12 @@
       <item quantity="other">සහතික පරීක්ෂා කරන්න</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"බහු පරිශීලකයන්"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"පරිශීලකයින් සහ පැතිකඩ"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"පරිශීලයෙකු හෝ ගිණුමක් එක් කරන්න"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"පරිශීලකයෙක් එක් කරන්න"</string>
@@ -2948,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"දත්ත භාවිතය"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"හොට්ස්පොට්"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"සම්බන්ධ කළ උපාංග"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"බ්ලූටූත්, රිය පැදවීම් ප්‍රකාරය, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"බ්ලූටූත්, රිය පැවීම් ප්‍රකාරය"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"බ්ලූටූත්, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"බ්ලූටූත්"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"යෙදුම් සහ දැනුම්දීම්"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"අවසර, පෙරනිමි යෙදුම්"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"ගිණුම්"</string>
@@ -2972,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"ආරම්භක, පෙරනිමි, යෙදුම්"</string>
     <string name="keywords_display" msgid="8910345814565493016">"තිරය, ස්පර්ශ තිරය"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"අඳුරු තිරය, ස්පර්ශ තිරය, බැටරිය, දීප්තිය"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"අඳුරු තීරය, ස්පර්ශ තීරය, බැටරිය"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"අඳුරු තිරය, රාත්‍රිය, අඳුරු කළ, රාත්‍රී මුරය, දීප්තිය, තිර වර්ණය, වර්ණය, පැහැය"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"පසුබිම, පුද්ගලායනය, අභිමත සංදර්ශකය"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"පෙළ ප්‍රමාණය"</string>
@@ -3013,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"ජාලය, ජංගම ජාල තත්ත්වය, සේවා තත්ත්වය, සංඥා ප්‍රබලතාව, ජංගම ජාල වර්ගය, රෝමිං, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"අනුක්‍රමික අංකය, දෘඪාංග අනුවාදය"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"Android ආරක්ෂක පැච් මට්ටම, බේස්බෑන්ඩ් අනුවාදය, කර්නල් අනුවාදය"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"පරිසර දර්ශකය, අගුලු තිර දර්ශකය"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"ඇඟිලි සලකුණ"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"කරකවන්න, ෆ්ලිප් කරන්න, කරකැවීම, ආලේඛ්‍ය, භූ දර්ශනය, දිශානතිය, සිරස්, තිරස්"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"උත්ශ්‍රේණි කරන්න, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, කාලසටහන, දැනුම්දීම්, අවහිරය, නිශ්ශබ්දතාව, කම්පනය, නින්ද, වැඩ, අවධානය, ශබ්දය, නිහඬ, හිරු, සතියේ දින, සති අන්තය, සතියේ දින රෑ, සිදුවීම"</string>
@@ -3097,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"දෘශ්‍ය සංඥාවලට ඉඩ දෙන්න"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"බාධා නොකරන්න ක්‍රියාත්මක විට"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"දැනුම්දීම්"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"නිශ්ශබ්දව දැනුම්දීම් පෙන්වන්න"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"දැනුම්දීම් නිහඬ කරනු ලැබේ"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"දැනුම්දීම් වෙතින් හඬ නැත"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"ඔබ ඔබගේ තිරය මත දැනුම්දීම් දකිනු ඇත"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"දැනුම්දීම් පැමිණි විට ඔබගේ දුරකථනය ශබ්දයක් හෝ කම්පනයක් ඇති නොකරනු ඇත."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"දැනුම්දීම් සඟවන්න"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"නව හෝ පවත්නා දැනුම් දීම් ඔබ නොදකිනු ඇත"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"දැනුම්දීම්වලින් දෘශ්‍ය හෝ හඬ නැත"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"ඔබට දැනුම්දීම් පෙනෙන්නේ හෝ ඇසෙන්නේ නැත"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"ඔබගේ දුරකථනය නව හෝ පවතින දැනුම්දීම් නොපෙන්වන අතර, ශබ්ද නැගීම හෝ කම්පනය නොවනු ඇත. ඔබගේ තිරයේ ඉහළ සිට පහළට ස්වයිප් කරන විට දැනුම් දීම් දිස් නොවනු ඇත.\n\n මතක තබා ගන්න, දුරකථන ක්‍රියාකාරකම් සහ තත්ත්වය සඳහා වැදගත් දැනුම්දීම් තවමත් දිස්වනු ඇත."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"අභිරුචි"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"අභිරුචි සැකසීම සබල කරන්න"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"අභිරුචි සැකසීම ඉවත් කරන්න"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"දිස් වනු ඇත"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"දැනුම්දීම් වෙතින් හඬ නැත"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"අර්ධ වශයෙන් සඟවා ඇත"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"සඟවා ඇත"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"දැනුම්දීම්වලින් දෘශ්‍ය හෝ හඬ නැත"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"අභිමත සීමා කිරීම්"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"තිරය ක්‍රියාත්මක විට"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"තිරය ක්‍රියාවිරහිත විට"</string>
@@ -3167,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"නිහඬයි, නමුත් <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>, සහ <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> හට ඉඩ දෙන්න"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"පණිවිඩ, සිදුවීම් සහ සිහිැඳවීම්"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"බාධා නොකරන්න ක්‍රියාත්ම විට, ඔබ ඉහත අවසර දෙනු ලබන අයිතම හැරුණු විට, පණිවිඩ, සිහි කැඳවීම් සහ සිදුවීම් අවහිර කරනු ඇත. ඔබගේ මිතුරන්, පවුලේ අය හෝ වෙනත් සම්බන්ධතාවලට ඔබ සමග සම්බන්ධ වීමට ඉඩ දීමට පණිවිඩ සැකසීම් සකස් කිරීමට ඔබට හැකිය."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"නිමයි"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"සැකසීම්"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"දැනුම්දීම්වලින් දෘශ්‍ය හෝ හඬ නැත"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"දැනුම්දීම් වෙතින් හඬ නැත"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"ඔබට දැනුම්දීම් දැකීමට හෝ ඇසීමට නොලැබෙනු ඇත. තරු ලකුණු යෙදූ සම්බන්ධතා සහ පුනරාවර්තන ඇමතුම්කරුවන් වෙතින් වන ඇමතුම්වලට ඉඩ දෙනු ලැබේ."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(වත්මන් සැකසීම)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"බාධා නොකරන්න දැනුම්දීම් සැකසීම් වෙනස් කරන්නද?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"කාර්යාල පැතිකඩ හඬවල්"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"පුද්ගලික පැතිකඩ හඬ භාවිත කර."</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"කාර්යාල සහ පුද්ගලික පැතිකඩ සඳහා හඬ වල් එකමය"</string>
@@ -3348,17 +3347,12 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> සිට <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"ඇමතුම්"</string>
-    <!-- no translation found for zen_mode_calls_title (623395033931747661) -->
-    <skip />
+    <string name="zen_mode_calls_title" msgid="623395033931747661">"ඇමතුම් ඉඩ දෙන්න"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"බාධා නොකරේන ක්‍රියාත්මක විට, එන ඇමතුම් අවහිර වේ. ඔබගේ මිතුරන්, පවුලේ අය හෝ වෙනත් සම්බන්ධතාවලට ඔබව සම්බන්ධ කර ගැනීමට ඔබට සැකසීම් සකස් කළ හැකිය."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"තරු ලකුණු යෙදූ සම්බන්ධතා"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">සහ තවත් <xliff:g id="NUM_PEOPLE">%d</xliff:g> දෙනෙක්</item>
-      <item quantity="other">සහ තවත් <xliff:g id="NUM_PEOPLE">%d</xliff:g> දෙනෙක්</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"පණිවිඩ"</string>
-    <!-- no translation found for zen_mode_messages_title (7729380010396411129) -->
-    <skip />
+    <string name="zen_mode_messages_title" msgid="7729380010396411129">"පණිවිඩ ඉඩ දෙන්න"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"පණිවිඩ"</string>
     <string name="zen_mode_selected_messages" msgid="1047355526202106114">"සමහර පණිවිඩ"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"ඕනෑම අයෙකු වෙතින්"</string>
@@ -3372,19 +3366,15 @@
     <string name="zen_mode_media" msgid="8808264142134422380">"මාධ්‍ය"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"ස්පර්ශ ශබ්ද"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"සිහිකැඳවීම්"</string>
-    <!-- no translation found for zen_mode_reminders_title (2345044406347406902) -->
-    <skip />
+    <string name="zen_mode_reminders_title" msgid="2345044406347406902">"සිහිකැඳවීම් ඉඩ දෙන්න"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"සිදුවීම්"</string>
-    <!-- no translation found for zen_mode_events_title (5597241655883329085) -->
-    <skip />
+    <string name="zen_mode_events_title" msgid="5597241655883329085">"සිදුවීම් ඉඩ දෙන්න"</string>
     <string name="zen_mode_all_callers" msgid="2378065871253871057">"ඕනෑම කෙනෙක්"</string>
     <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"සම්බන්ධතා"</string>
     <string name="zen_mode_starred_callers" msgid="1023167821338514140">"තරු ලකුණු යෙදූ සම්බන්ධතා"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"නැවත අමතන්නන්"</string>
-    <!-- no translation found for zen_mode_repeat_callers_title (8553876328249671783) -->
-    <skip />
-    <!-- no translation found for zen_mode_calls_summary_one (3972333792749874863) -->
-    <skip />
+    <string name="zen_mode_repeat_callers_title" msgid="8553876328249671783">"යළි අමතන්නන්ට ඉඩ දෙන්න"</string>
+    <string name="zen_mode_calls_summary_one" msgid="3972333792749874863">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> සිට"</string>
     <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> සහ <xliff:g id="CALLERT_TPYE">%2$s</xliff:g> වෙතින් පමණි"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"එකම පුද්ගලයා විනාඩි <xliff:g id="MINUTES">%d</xliff:g>ක කාල සීමාවක් තුළ දෙවන වතාවටත් අමතයි නම්"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"අභිරුචි"</string>
@@ -3790,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"සිසිල් වර්ණ උෂ්ණත්වය"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"වඩා සිසිල් සංදර්ශක වර්ණ භාවිත කිරීම"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"වර්ණ වෙනස් කිරීම යෙදීමට තිරය ක්‍රියාවිරහිත කරන්න"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"සබැඳුම් හැකියා නිරීක්ෂකය"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor සබැඳුම් හැකියා ගැටලුවක් හඳුනා ගත් විට ලොග රැස් කිරීම සහ දෝෂයක් ගොනු කිරීමට පරිශීලකයා වෙත දැනුම්දීම ප්‍රේරණය කිරීම කරනු ඇත"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"සබැඳුම් හැකියා නිරීක්ෂක වෙනස් කිරීම යෙදීමට, උපාංගය නැවත පණ ගන්වන්න"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"කැමරා ලේසර් සංවේදකය"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"තාර්කික කැමරාව පෙරනිමි ලෙස"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ස්වයංක්‍රිය පද්ධති යාවත්කාලීන"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"උපාංගය නැවත ආරම්භ වන විට යාවත්කාලීන යොදන්න"</string>
     <string name="usage" msgid="2977875522080448986">"භාවිතය"</string>
@@ -4103,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"ස්වයං පිරවුම් සේවාව"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"ස්වයං, පිරවුම, ස්වයං පිරවුම"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;ඔබ මෙම යෙදුම විශ්වාස කරන බව සහතික කර ගන්න&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; ස්වයං පිරවිය හැකි දේවල් නිර්ණය කිරීමට ඔබේ තිරයෙහි ඇති දේවල් භාවිත කරයි."</string>
-    <string name="device_theme" msgid="4571803018917608588">"උපාංග තේමාව"</string>
+    <string name="color_theme" msgid="1535685696756738324">"වර්ණ තේමාව"</string>
     <string name="default_theme" msgid="7085644992078579076">"පෙරනිමි"</string>
+    <string name="device_theme" msgid="4571803018917608588">"උපාංග තේමාව"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"ස්වයංක්‍රිය (බිතුපත මත පදනම්ව)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"ආලෝකය"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"අඳුරු"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"ජාල නම"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"තත්ත්ව තීරුව තුළ ජාල නම සංදර්ශනය කරන්න"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"ගබඩා කළමනාකරු: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4116,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"වාහක ප්‍රතිපාදන තතු"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"උත්ප්‍රේරක වාහක ප්‍රතිපාදන"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"බාධා නොකරන්න යාවත්කාලීන කරන්න"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"අවධානය යොමු කිරීම සඳහා දැනුම්දීම් සඟවන්න"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"අවධානය යොමු කිරීම සඳහා දැනුම්දීම් විරාම කරන්න"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"අලුත් සහ උද්යෝගිමත් දේවල් මොනවාද?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ඔබගේ නව දුරකථනය ගැන දැන ගන්න"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ඔබගේ නව ටැබ්ලට් පරිගණකය ගැන දැන ගන්න"</string>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 675a782..9f96f67 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Vždy zapnuté"</item>
     <item msgid="6385301106124765323">"Vždy vypnuté"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 6b95a25..ffbd80c 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -175,6 +175,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Povoľte tabletu komunikovať so zariadeniami Bluetooth nablízku"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Povoľte zariadeniu komunikovať so zariadeniami Bluetooth nablízku"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Povoľte telefónu komunikovať so zariadeniami Bluetooth nablízku"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Zakázať hardvérové zníženie záťaže Bluetooth (A2DP)"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Reštartovať?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Ak chcete zmeniť nastavenie, musíte reštartovať zariadenie."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Reštartovať"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Zrušiť"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Dostupné mediálne zariadenia"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Dostupné telefonické zariadenia"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Aktuálne pripojené"</string>
@@ -184,6 +189,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Predvoľby pripojenia"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Predtým pripojené zariadenia"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Predtým pripojené zariadenia"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Dátum a čas"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Zvoľte časové pásmo"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -209,11 +216,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Zadaný port nie je platný."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Prehliadač používa proxy server protokolu HTTP, ale ostatné aplikácie ho používať nemusia."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"Webová adresa PAC: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Rýchlosť pripojenia DL (kb/s):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Rýchlosť pripojenia UL (kb/s):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Informácie o polohe mobilnej siete (podpora bola ukončená):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Informácie o susednej mobilnej sieti (podpora bola ukončená):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Konfigurácia fyzického kanála LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Interval obnovenia informácií o mobilnej sieti:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Všetky údaje o meraní mobilnej siete:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Informácie o dátovom pripojení v reálnom čase:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Dátová služba:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1178,8 +1186,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Prebudiť zdvihnutím"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambientné zobrazenie"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Vždy zapnuté / Zvýšené využitie batérie"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nové upozornenia"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kedy zobrazovať"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nové upozornenia"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Prebudiť obrazovku, keď dostanete upozornenie"</string>
@@ -1226,8 +1232,6 @@
       <item quantity="one">Nesprávny kód PIN SIM karty. Zostáva vám <xliff:g id="NUMBER_0">%d</xliff:g> pokus, potom budete musieť kontaktovať svojho operátora, aby vám odomkol zariadenie.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Operácia kódu PIN SIM karty zlyhala!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stav tabletu"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Stav telefónu"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Aktualizácie systému"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Verzia systému Android"</string>
@@ -2166,8 +2170,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Využívanie na pozadí sa nedá obmedziť"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Obmedziť aktivitu na pozadí?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ak obmedzíte aktivitu aplikácie na pozadí, nemusí fungovať správne"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Aplikácia nemá nastavenú optimalizáciu batérie, preto ju nemôžete obmedziť.\n\nAk ju chcete obmedziť, zapnite optimalizáciu."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Využitie obrazovky od úplného nabitia"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Spotreba obrazovkou"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Vyhľadávanie mobilnej siete"</string>
@@ -2501,6 +2504,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Signál núdzového vytáčania"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Nastaviť správanie pri tiesňovom volaní"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Zálohovanie"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Zapnuté"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Vypnuté"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Zálohovať a obnoviť"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Osobné údaje"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Zálohovať moje dáta"</string>
@@ -2835,6 +2840,12 @@
       <item quantity="one">Overiť certifikát</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Viacerí používatelia"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Používatelia a profily"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Pridať používateľa alebo profil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Pridať používateľa"</string>
@@ -3019,14 +3030,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"spotreba dát"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Pripojené zariadenia"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, režim v aute, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, režim v aute"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikácie a upozornenia"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Povolenia, predvolené aplikácie"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Účty"</string>
@@ -3043,7 +3050,6 @@
     <string name="keywords_home" msgid="294182527446892659">"spúšťač, predvolené, aplikácie"</string>
     <string name="keywords_display" msgid="8910345814565493016">"obrazovka, dotyková obrazovka"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"stlmiť obrazovku, dotyková obrazovka, batéria, svetlá"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"stlmiť obrazovku, dotyková obrazovka, batéria"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"stlmiť obrazovku, noc, tónovanie, nočný režim, jas, farba obrazovky, farba, farby"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"pozadie, prispôsobenie, prispôsobiť obrazovku"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"veľkosť textu"</string>
@@ -3084,8 +3090,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"sieť, stav mobilnej siete, stav služby, sila signálu, typ mobilnej siete, roaming, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"sériové číslo, hardvérová verzia"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"úroveň opráv zabezpečenia androidu, verzia základného pásma, verzia jadra"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambientné zobrazenie, zobrazenie uzamknutej obrazovky"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"odtlačok prsta"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"otočiť, prevrátiť, rotovať, na výšku, na šírku, orientácia, zvisle, vodorovne"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"inovovať, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"nerušiť, rozpis, upozornenia, blokovať, stíšiť, vibrovať, spánok, práca, sústredenie, zvuk, vypnúť zvuk, deň, pracovný deň, víkend, noc pracovného dňa, udalosť"</string>
@@ -3170,18 +3180,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Povoliť vizuálne signály"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Keď je zapnutý režim Nerušiť"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Upozornenia"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Zobrazovať upozornenia bez zvuku"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Upozornenia nebudú vydávať zvuk"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Upozornenia bez zvuku"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Upozornenia sa budú spúšťať na obrazovke"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Keď dostanete nové upozornenia, telefón nevydá zvuk ani nebude vibrovať."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Skryť upozornenia"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Nebudú sa zobrazovať nové ani existujúce upozornenia"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Upozornenia sa nebudú zobrazovať ani vydávať zvuky"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Upozornenia sa nebudú zobrazovať ani vydávať zvuky"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Váš telefón nebude zobrazovať nové ani existujúce upozornenia, vydávať zvuky ani vibrovať. Keď potiahnete prstom z hornej časti obrazovky smerom nadol, upozornenia sa nezobrazia.\n\nNezabudnite, že závažné upozornenia týkajúce sa aktivity a stavu telefónu sa budú zobrazovať."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Vlastné"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Povoliť vlastné nastavenie"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Odstrániť vlastné nastavenie"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Budú sa zobrazovať"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Upozornenia bez zvuku"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Čiastočne skryté"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Skryté"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Upozornenia sa nebudú zobrazovať ani vydávať zvuky"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Vlastné obmedzenia"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Keď je obrazovka zapnutá"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Keď je obrazovka vypnutá"</string>
@@ -3244,19 +3254,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Zvuk je vypnutý, ale povoľte <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> a <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Správy, udalosti a pripomenutia"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Keď je zapnutý režim Nerušiť, zvuky správ, pripomenutí a udalostí budú vypnuté. Výnimku predstavujú položky, ktoré povolíte vyššie. Môžete upraviť nastavenia správ a povoliť priateľom, rodine alebo ďalším kontaktom spojiť sa s vami."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Hotovo"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Nastavenia"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Upozornenia sa nebudú zobrazovať ani vydávať zvuky"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Upozornenia bez zvuku"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Upozornenia sa nebudú zobrazovať ani vydávať zvuky. Povolené sú kontakty označené hviezdičkou aj opakujúci sa volajúci."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Aktuálne nastavenie)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Zmeniť nastavenia upozornení režimu Nerušiť?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Zvuky pracovného profilu"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Použiť zvuky osobného profilu"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Zvuky sú rovnaké pre pracovný aj osobný profil"</string>
@@ -3436,12 +3440,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Povoliť hovory"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Keď je zapnutý režim Nerušiť, prichádzajúce hovory sú blokované. Môžete upraviť nastavenia a povoliť priateľom, rodine alebo ďalším kontaktom spojiť sa s vami."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Kontakty s hviedzdičkou"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="few">a <xliff:g id="NUM_PEOPLE">%d</xliff:g> ďalšie</item>
-      <item quantity="many">and <xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
-      <item quantity="other">a <xliff:g id="NUM_PEOPLE">%d</xliff:g> ďalších</item>
-      <item quantity="one">a 1 ďalší</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Správy"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Povoliť správy"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Správy"</string>
@@ -3897,10 +3896,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Studená teplota farby"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Používať studenšie farby obrazovky"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Ak chcete použiť zmenu farby, vypnite obrazovku"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitorovanie pripojenia"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Keď monitorovanie pripojenia zistí problém s pripojením, bude zhromažďovať denníky a zobrazí používateľovi upozornenie s výzvou na nahlásenie chyby"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Ak chcete použiť zmenu monitorovania pripojenia, reštartujte zariadenie"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Laserový snímač fotoaparátu"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Používať logický fotoaparát ako predvolený"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatické aktualizácie systému"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Použiť aktualizácie po reštartovaní zariadenia"</string>
     <string name="usage" msgid="2977875522080448986">"Spotreba"</string>
@@ -4238,8 +4235,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Služba automatického dopĺňania"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatické, dopĺňanie, automatické dopĺňanie"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Skontrolujte, či ide o dôveryhodnú aplikáciu&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Automatické dopĺňanie Google&gt;%1$s&lt;/xliff:g&gt; určuje na základe obsahu obrazovky, čo je možné automaticky vyplniť."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Motív zariadenia"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Farebný motív"</string>
     <string name="default_theme" msgid="7085644992078579076">"Predvolený"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Motív zariadenia"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automatický (podľa tapety)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Svetlý"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Tmavý"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Názov siete"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Zobrazovať názov siete v stavovom riadku"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Správca úložiska: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4251,7 +4252,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informácie o poskytovaní služieb operátorom"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Spustiť poskytovanie služieb operátorom"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Aktualizovať režim Nerušiť"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Skrývajte upozornenia, aby ste sa mohli sústrediť"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pozastavte upozornenia, aby ste sa mohli sústrediť"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Aké sú najaktuálnejšie novinky?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Pozrite si prehliadku nového telefónu"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Pozrite si prehliadku nového tabletu"</string>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 78ecc93..9fdffeca 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Vedno vklopljeno"</item>
     <item msgid="6385301106124765323">"Vedno izklopljeno"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 02afc0e..bb2ad4e 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -175,6 +175,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Omogočite tabličnemu računalniku, da komunicira z napravami Bluetooth v bližini"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Omogočite napravi, da komunicira z napravami Bluetooth v bližini"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Omogočite telefonu, da komunicira z napravami Bluetooth v bližini"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Onemogoči prelaganje s strojne opreme za A2DP za Bluetooth"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Vnovični zagon?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Če želite spremeniti to nastavitev, znova zaženite napravo."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Nov zagon"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Prekliči"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Razpoložljive naprave za predvajanje predstavnosti"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Razpoložljive naprave za klice"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Trenutno povezano"</string>
@@ -184,6 +189,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Nastavitve povezave"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Predhodno povezane naprave"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Predhodno povezane naprave"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Datum in ura"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Izberite časovni pas"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -209,11 +216,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Vtipkana številka vrat je neveljavna."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy HTTP lahko uporablja brskalnik, druge aplikacije pa ne."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"URL datoteke PAC: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Pasovna širina za prenos (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Pasovna širina za nalaganje (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Podatki o lokaciji celice (zastarelo):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Podatki o sosednji celici (zastarelo):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Konfiguracija fizičnega kanala LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Frekvenca osveževanja podatkov o celici:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Vsi podatki o meritvah celice:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Sprotni podatki za podatkovno povezavo:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Podatkovna storitev:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Gostovanje:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1178,8 +1186,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Samodejna svetlost"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Preklop iz stanja pripravlj. z dviganjem"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Prikaz na podlagi okolja"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Vedno vključeno/višja poraba energije akumulatorja"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nova obvestila"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Nastavitve prikaza"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nova obvestila"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Preklop zaslona iz stanja pripravljenosti, ko prejmete obvestila"</string>
@@ -1226,8 +1232,6 @@
       <item quantity="other">Napačna koda PIN kartice SIM. Na voljo imate še <xliff:g id="NUMBER_1">%d</xliff:g> poskusov.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Postopek za odklepanje s kodo PIN kartice SIM ni uspel."</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stanje tabličnega računalnika"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Stanje telefona"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Sistemske posodobitve"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Različica sistema Android"</string>
@@ -2166,8 +2170,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Dejavnosti v ozadju ni mogoče omejiti"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Želite omejiti dejavnost v ozadju?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Če boste omejili dejavnost aplikacije v ozadju, morda ne bo pravilno delovala"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Ker za to aplikacijo ni izbrana nastavitev optimiziranja porabe akumulatorja, je ni mogoče omejiti.\n\nČe želite omejiti aplikacijo, najprej vklopite optimizacijo akumulatorja."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Uporaba zaslona od polne napolnjenosti"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Poraba zaslona"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Pregledovanje mobilnih omrežij"</string>
@@ -2501,6 +2504,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Signal za klice v sili"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Nastavi način delovanja ob klicanju v sili"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Varnostno kopiranje"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Vklopljeno"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Izklopljeno"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Varnostno kopiranje in obnovitev"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Osebni podatki"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Varn. kopiraj podatke"</string>
@@ -2835,6 +2840,12 @@
       <item quantity="other">Preveri potrdila</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Več uporabnikov"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Uporabniki in profili"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Dodajanje uporabnika ali profila"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Dodaj uporabnika"</string>
@@ -3019,14 +3030,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"prenesena količina podatkov"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"dostopna točka"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Povezane naprave"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, način vožnje, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, način vožnje"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacije in obvestila"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Dovoljenja, privzete aplikacije"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Računi"</string>
@@ -3043,7 +3050,6 @@
     <string name="keywords_home" msgid="294182527446892659">"zaganjalnik, privzeto, aplikacije"</string>
     <string name="keywords_display" msgid="8910345814565493016">"zaslon, zaslon na dotik"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"zatemnitev zaslona, zaslon na dotik, akumulator, svetlo"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"zatemnitev zaslona, zaslon na dotik, akumulator"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"zatemnitev zaslona, noč, obarvanje, preklop na nočni način, svetlost, barva zaslona, barva"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"ozadje, prilagajanje, prilagajanje zaslona"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"velikost besedila"</string>
@@ -3084,8 +3090,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"omrežje, stanje mobilnega omrežja, stanje storitve, moč signala, vrsta mobilnega omrežja, gostovanje, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"serijska številka, različica strojne opreme"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"raven varnostnih popravkov za android, različica radijske programske opreme, različica jedra"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"prikaz na podlagi okolja, prikaz na zaklenjenem zaslonu"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"prstni odtis"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"zavrteti, obrniti, vrtenje, pokončno, ležeče, postavitev, navpično, vodoravno"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"nadgradnja, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"ne moti, razpored, obvestila, blokirati, utišati, vibriranje, spanje, delo, zbranost, izklopiti zvok, dan, delavnik, vikend, noč med tednom, dogodek"</string>
@@ -3170,18 +3180,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Dovoli vizualne znake"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Ko je vklopljen način »ne moti«"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Obvestila"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Prikaži obvestila brez zvoka"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Obvestila bodo prezrta"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Brez zvočnega opozarjanja na obvestila"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Obvestila bodo prikazana na zaslonu"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Telefon ob prejemu obvestil ne bo predvajal zvoka ali vibriral."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Skrij obvestila"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Nova ali obstoječa obvestila ne bodo prikazana"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Brez vidnega in zvočnega opozarjanja na obvestila"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Obvestila ne bodo prikazana in ne bodo pospremljena z zvokom"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Telefon ne bo prikazoval novih ali obstoječih obvestil in ne bo predvajal zvoka ali vibriral. Če s prstom povlečete navzdol z vrha zaslona, obvestila ne bodo prikazana.\n\nUpoštevajte, da se bodo nujna obvestila o delovanju in stanju telefona še vedno prikazovala."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Po meri"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Omogoči nastavitev po meri"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Odstrani nastavitev po meri"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Prikazano"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Brez zvočnega opozarjanja na obvestila"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Delno skrito"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Skrito"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Brez vidnega in zvočnega opozarjanja na obvestila"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Omejitve po meri"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Pri vklopljenem zaslonu"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Pri izklopljenem zaslonu"</string>
@@ -3244,19 +3254,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Prezrto; dovoljeni zvoki: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> in <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Sporočila, dogodki in opomniki"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Pri vklopljenem načinu »ne moti« bodo prezrta vsa sporočila, opomniki in dogodki razen za zgoraj omogočene elemente. Nastavitve sporočil lahko prilagodite tako, da boste dosegljivi za prijatelje, družinske člane ali druge stike."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Končano"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Nastavitve"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Brez vidnega in zvočnega opozarjanja na obvestila"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Brez zvočnega opozarjanja na obvestila"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Obvestila ne bodo prikazana in ne bodo pospremljena z zvokom. Klici od stikov z zvezdico in večkratnih klicateljev so dovoljeni."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(trenutna nastavitev)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Želite spremeniti nastavitve obvestil v načinu »ne moti«?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Zvoki v delovnem profilu"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Uporaba zvokov iz os. profila"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Zvoki v delovnem in osebnem profilu so enaki"</string>
@@ -3436,12 +3440,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Dovoli klice"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Pri vklopljenem načinu »ne moti« so dohodni klici blokirani. Nastavitve lahko prilagodite tako, da boste dosegljivi za prijatelje, družinske člane ali druge stike."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Stiki z zvezdico"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">in še <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="two">in še <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="few">in še <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="other">in še <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Sporočila"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Dovoli sporočila"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Sporočila"</string>
@@ -3897,10 +3896,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Hladnejša barvna temperatura"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Uporaba hladnejših barv zaslona"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Če želite uveljaviti spremembo barv, izklopite zaslon"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Nadziranje povezljivosti"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Funkcija Nadziranje povezljivosti pridobi dnevnike, ko zazna težavo s povezljivostjo, in uporabnika z obvestilom pozove, naj prijavi napako."</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Če želite uveljaviti spremembo nadziranja povezljivosti, znova zaženite napravo"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Lasersko tipalo fotoaparata"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Logični fotoaparat kot privzeta izbira"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Samodejne sistemske posodobitve"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Namesti posodobitve ob vnovičnem zagonu naprave"</string>
     <string name="usage" msgid="2977875522080448986">"Poraba"</string>
@@ -4238,8 +4235,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Storitev samodejnega izpolnjevanja"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"samodejno, izpolnjevanje, samoizpolnjevanje"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Prepričajte se, ali zaupate tej aplikaciji&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Samodejno izpolnjevanje&gt;%1$s&lt;/xliff:g&gt; iz elementov na zaslonu ugotovi, kaj je mogoče samodejno izpolniti."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Tema naprave"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Barvna tema"</string>
     <string name="default_theme" msgid="7085644992078579076">"Privzeto"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Tema naprave"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Samodejna (na podlagi ozadja)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Svetla"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Temna"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Ime omrežja"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Prikaži ime omrežja v vrstici stanja"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Upravitelj shrambe: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4251,7 +4252,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Podatki o omogočanju uporabe operaterja"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Sproži omogočanje uporabe operaterja"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Posodobitev načina »ne moti«"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Skrijte obvestila, da ostanete osredotočeni"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Začasno zaustavite prikazovanje obvestil, da ostanete osredotočeni"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Odkrijte zanimive novosti"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Oglejte si predstavitev novega telefona"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Oglejte si predstavitev novega tabličnega računalnika"</string>
diff --git a/res/values-sq/arrays.xml b/res/values-sq/arrays.xml
index ad99f90..b221c96 100644
--- a/res/values-sq/arrays.xml
+++ b/res/values-sq/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Gjithmonë aktiv"</item>
     <item msgid="6385301106124765323">"Gjithmonë joaktiv"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 45e2adf..546c65c 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Lejo që tableti yt të komunikojë me pajisjet me Bluetooth në afërsi"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Lejo që pajisja jote të komunikojë me pajisjet me Bluetooth në afërsi"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Lejo që telefoni yt të komunikojë me pajisjet me Bluetooth në afërsi"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Çaktivizo shkarkimin e harduerit të Bluetooth A2DP"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Të riniset pajisja?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Duhet të rinisësh pajisjen tënde për të ndryshuar këtë cilësim."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Rinis"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Anulo"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Pajisjet e ofruara për median"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Pajisjet e ofruara për telefonata"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Të lidhur aktualisht"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Preferencat e lidhjes"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Pajisjet e lidhura më parë"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Të lidhura më parë"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Data dhe ora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Zgjidh brezin orar"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Porta që shkrove nuk është e vlefshme."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Përfaqësuesi HTTP përdoret zakonisht nga shfletuesi. Ai mund të mos përdoret nga aplikacionet e tjera."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"URL-ja e përfaqësuesit: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Gjerësia e bandës DL (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Gjerësia e bandës UL (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Informacionet e vendndodhjes të rrjetit celular (e vjetruar):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Informacionet e rrjetit celular fqinj (e vjetruar):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Konfigurimi i kanalit fizik LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Shpejtësia e rifreskimit të informacioneve të rrjetit celular"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Të gjitha informacionet e matjes së rrjetit celular:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Informacionet në kohë reale të lidhjes së të dhënave:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Shërbimi i të dhënave:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Ndriçimi automatik"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ngrije për ta zgjuar"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Shfaqja e ambientit"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Gjithmonë aktive / Përdorim i rritur i baterisë"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Njoftimet e reja"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kur të shfaqet"</string>
     <string name="doze_title" msgid="2375510714460456687">"Njoftimet e reja"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Zgjoje ekranin kur të merren njoftime"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">Kodi PIN i kartës SIM është i pasaktë. Të ka mbetur edhe <xliff:g id="NUMBER_0">%d</xliff:g> tentativë para se të duhet të kontaktosh me operatorin tënd celular për të shkyçur pajisjen.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Operac. kodit PIN të kartës SIM dështoi!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Statusi i tabletit"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Statusi i telefonit"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Përditësimet e sistemit"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versioni i Android-it"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Përdorimi në sfond nuk mund të kufizohet"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Të kufizohet aktiviteti në sfond?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Nëse e kufizon aktivitetin në sfond për një aplikacion, mund të ketë çrregullime në funksionimin e tij"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Duke qenë se ky aplikacion nuk është caktuar për të optimizuar baterinë, nuk mund ta kufizosh atë.\n\nPër të kufizuar aplikacionin, në fillim aktivizo optimizimin e baterisë."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Përdorimi i ekranit që nga ngarkimi i plotë"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Konsumi i ekranit"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Skanimi i rrjetit celular"</string>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Sinjali i telefonimit të urgjencës"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Cakto sjelljen kur kryhet një telefonatë urgjence"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Rezervimi"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Aktiv"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Joaktiv"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Rezervo dhe restauro"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Të dhënat personale"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Rezervo të dhënat e mia"</string>
@@ -2761,6 +2766,12 @@
       <item quantity="one">Kontrollo certifikatën</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Disa përdorues"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Përdoruesit dhe profilet"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Shto një përdorues ose një profil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Shto përdorues"</string>
@@ -2943,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"përdorimi i të dhënave"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"zona e qasjes për internet"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Pajisje të lidhura"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, modaliteti \"me makinë\", NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, modaliteti \"me makinë\""</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apl. dhe njoftimet"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Lejet, apl. e parazgjedhura"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Llogaritë"</string>
@@ -2967,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"nisësi, i parazgjedhur, apl."</string>
     <string name="keywords_display" msgid="8910345814565493016">"ekran, ekran me prekje"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"zbeh ekranin, ekran me prekje, bateri, e ndritshme"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"zbeh ekranin, ekran me prekje, bateri"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"zbeh ekranin, natë, nuancë, orari i natës, ndriçimi, ngjyra e ekranit, ngjyrë, ngjyra"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"sfondi, personalizo, personalizo ekranin"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"madhësia e tekstit"</string>
@@ -3008,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"rrjeti, gjendja e rrjetit celular, gjendja e shërbimit, fuqia e sinjalit, lloji i rrjetit celular, roaming, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"numri i serisë, versioni i harduerit"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"niveli i korrigjimit të sigurisë së Android, versioni i brezit të bazës, versioni i bërthamës"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Shfaqja e ambientit, shfaqja e ekranit të kyçjes"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"gjurmë gishti"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"rrotullo, përmbys, rrotullim, portret, peizazh, orientimi, vertikal, horizontal"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"përmirëso, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"mos shqetëso, planifikimi, njoftimet, blloko, heshtje, dridhje, gjumë, punë, fokusi, tingull, hiq zërin, ditë, ditë jave, fundjavë, natë jave, ngjarje"</string>
@@ -3092,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Lejo sinjalet vizuale"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Kur modaliteti \"Mos shqetëso\" është i aktivizuar"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Njoftimet"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Shfaqi njoftimet në heshtje"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Njoftimet do të jenë në heshtje"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Asnjë tingull nga njoftimet"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Do të shikosh njoftime në ekranin tënd"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Kur mbërrijnë njoftime, telefoni nuk do të lëshojë tinguj apo dridhje."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Fshih njoftimet"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Nuk do të shikosh njoftime të reja ose ekzistuese"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Asnjë pamje apo tingull nga njoftimet"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Nuk do të shohësh apo dëgjosh njoftime"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Telefoni yt nuk do të shfaqë njoftime të reja ose ekzistuese dhe nuk do të lëshojë tinguj ose dridhje. Njoftimet nuk do të shfaqen kur rrëshqet shpejt poshtë nga kreu i ekranit.\n\nKi parasysh se njoftimet e rëndësishme për statusin dhe aktivitetin e telefonit do të shfaqen përsëri."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Personalizo"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Aktivizo cilësimin e personalizuar"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Hiq cilësimin e personalizuar"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Do të shfaqet"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Asnjë tingull nga njoftimet"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Pjesërisht i fshehur"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"I fshehur"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Asnjë pamje apo tingull nga njoftimet"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Personalizo kufizimet"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Kur ekrani është aktiv"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Kur ekrani është joaktiv"</string>
@@ -3162,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Pa zë, por lejo <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> dhe <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mesazhet, ngjarjet dhe alarmet rikujtuese"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Kur modaliteti \"Mos shqetëso\" është aktiv, mesazhet, alarmet rikujtuese dhe ngjarjet do të jenë në heshtje, përveçse për artikujt që lejon më sipër. Mund t\'i përshtatësh cilësimet e mesazheve për të lejuar shokët, familjen ose kontakte të tjera që të lidhen me ty."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"U krye"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Cilësimet"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Asnjë pamje apo tingull nga njoftimet"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Asnjë tingull nga njoftimet"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Nuk do të shohësh apo dëgjosh njoftime. Lejohen telefonatat nga kontaktet me yll dhe telefonuesit e përsëritur."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Cilësimet aktuale)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Të ndryshohen cilësimet e njoftimeve të modalitetit \"Mos shqetëso\"?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Tingujt e profilit të punës"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Përdor tingujt e profilit personal"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Tingujt janë të njëjtë për profilin tënd personal dhe atë të punës"</string>
@@ -3346,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Lejo telefonatat"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Kur modaliteti \"Mos shqetëso\" është aktiv, telefonatat hyrëse janë të bllokuara. Mund t\'i përshtatësh cilësimet për të lejuar shokët, familjen ose kontakte të tjera të lidhen me ty."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Kontaktet me yll"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">dhe <xliff:g id="NUM_PEOPLE">%d</xliff:g> të tjerë</item>
-      <item quantity="one">dhe 1 tjetër</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mesazhet"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Lejo mesazhet"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Mesazhet"</string>
@@ -3779,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura e ftohtë e ngjyrës"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Përdor ngjyra të ftohta të ekranit"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Për të zbatuar ndryshimin e ngjyrës, çaktivizoje ekranin"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Monitori i lidhshmërisë"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"\"Monitori i lidhshmërisë\" do të mbledhë regjistrat kur të zbulojë një problem të lidhshmërisë dhe do t\'i paraqesë një njoftim përdoruesit që të regjistrojë një defekt në kod"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Për të zbatuar ndryshimin e monitorit të lidhshmërisë, rindiz pajisjen"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensori me laser i kamerës"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"\"Kamera logjike\" si e parazgjedhur"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Përditësimet automatike të sistemit"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Zbato përditësimet kur të riniset pajisja"</string>
     <string name="usage" msgid="2977875522080448986">"Përdorimi"</string>
@@ -4092,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Shërbimi i plotësimit automatik"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"plotësim, automatik, plotësim automatik"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Sigurohu që ke besim te ky aplikacion&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=\"Plotësimi automatik i Google&gt;%1$s&lt;/xliff:g&gt; përdor atë që ndodhet në ekranin tënd për të përcaktuar se çfarë mund të plotësohet automatikisht."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Tema e pajisjes"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Tema e ngjyrës"</string>
     <string name="default_theme" msgid="7085644992078579076">"I parazgjedhur"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Tema e pajisjes"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automatike (në bazë të imazhit të sfondit)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"E ndriçuar"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"E errët"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Emri i rrjetit"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Shfaq emrin e rrjetit në shiritin e statusit"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Menaxheri i hapësirës ruajtëse: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4105,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Informacionet e përgatitjes së operatorit celular"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktivizo përgatitjen e operatorit celular"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Përditëso modalitetin \"Mos shqetëso\""</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Fshih njoftimet për të qëndruar i fokusuar"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Vendos njoftimet në pauzë për të qëndruar i fokusuar"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Çfarë ka të reja dhe emocionuese?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Zhvillo një turne të telefonit tënd të ri"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Zhvillo një turne të tabletit tënd të ri"</string>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 29245db..5bd8293 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Увек укључено"</item>
     <item msgid="6385301106124765323">"Увек искључено"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 67792a1..73efbbf 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -174,6 +174,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Омогућите таблету да комуницира са Bluetooth уређајима у близини"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Омогућите уређају да комуницира са Bluetooth уређајима у близини"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Омогућите телефону да комуницира са Bluetooth уређајима у близини"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Онемогући Bluetooth A2DP хардверско растерећење"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Рестартујете уређај?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Рестартујте уређај да бисте променили ово подешавање."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Рестартуј"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Откажи"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Доступни медијски уређаји"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Доступни уређаји за позивање"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Тренутно повезани"</string>
@@ -183,6 +188,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Подешавања везе"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Претходно повезани уређаји"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Претходно повезани"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Датум и време"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Избор временске зоне"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -208,11 +215,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Унели сте неважећи порт."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Прегледач користи HTTP прокси, али друге апликације не могу да га користе."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL пропусни опсег (kb/s):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL пропусни опсег (kb/s):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Информације о локацији предајника (застарело):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Информације о суседном предајнику (застарело):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Конфигурација LTE физичког канала:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Брзина освежавања информација о предајнику:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Све информације о мерењу за предајник:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Информације о вези за пренос података у реалном времену:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Услуга преноса података:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Роминг:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1162,8 +1170,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Аутоматски ниво осветљености"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Подигни за активацију"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Амбијентални екран"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Увек укључено/већа потрошња батерије"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Нова обавештења"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Када да се приказује"</string>
     <string name="doze_title" msgid="2375510714460456687">"Нова обавештења"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Пробуди екран када примим обавештења"</string>
@@ -1209,8 +1215,6 @@
       <item quantity="other">Нетачан SIM PIN кôд. Имате још <xliff:g id="NUMBER_1">%d</xliff:g> покушаја.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Радња са SIM PIN кодом није успела!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Статус таблета"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Статус телефона"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Ажурирања система"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android верзија"</string>
@@ -2140,8 +2144,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Апликације у позадини не можете да ограничите"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Желите ли да ограничите активности у позадини?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ако ограничите активности апликације у позадини, можда ће се понашати неочекивано."</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Апл. није подешена за оптимизацију батерије, па не можете да је ограничите. \n\nЗа огр. апл. укључите оптимизацију батерије."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Коришћење екрана од потпуног пуњења"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Потрошња за екран"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Скенирање мобилних мрежа"</string>
@@ -2468,6 +2471,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Сигнал за хитне позиве"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Подешавање понашања када се успоставља хитан позив"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Резервне копије"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Укључено"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Искључено"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Резервна копија и ресетовање"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Лични подаци"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Прављење резервних копија података"</string>
@@ -2798,6 +2803,12 @@
       <item quantity="other">Провери сертификате</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Више корисника"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Корисници и профили"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Додај корисника или профил"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Додај корисника"</string>
@@ -2981,14 +2992,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"потрошња података"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"хотспот"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Повезани уређаји"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, режим за вожњу, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, режим за вожњу"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aпликације и обавештења"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Дозволе, подразумеване апликације"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Налози"</string>
@@ -3005,7 +3012,6 @@
     <string name="keywords_home" msgid="294182527446892659">"покретач, подразумевано, апликације"</string>
     <string name="keywords_display" msgid="8910345814565493016">"екран, додирни екран"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"затамни екран, додирни екран, батерија, светло"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"затамнити екран, додирни екран, батерија"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"затамни екран, ноћ, сенка, трећа смена, осветљеност, боја екрана, боја"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"позадина, персонализовати, прилагодити екран"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"величина текста"</string>
@@ -3046,8 +3052,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"мрежа, стање мобилне мреже, стање услуге, јачина сигнала, тип мобилне мреже, роминг, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"серијски број, верзија хардвера"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"ниво безбедносне закрпе за android, верзија основног пропусног опсега, верзија језгра"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Амбијентални екран, приказ на закључаном екрану"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"дигитални отисак"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"ротирај, обрни, ротација, усправно, водоравно, положај, вертикално, хоризонтално"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"надоградња, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"не узнемиравај, распоред, обавештења, блокирај, тишина, вибрација, спавање, рад, концентрација, звук, искључи звук, дан, радни дан, викенд, радни дан увече, догађај"</string>
@@ -3131,18 +3141,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Дозволи визуелне сигнале"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Када је укључен режим Не узнемиравај"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Обавештења"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Приказуј обавештења без звука"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Звук обавештења ће бити искључен"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Без звучног сигнала за обавештења"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Видећете обавештења на екрану"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Телефон неће емитовати звук ни вибрирати када стигну обавештења."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Сакриј обавештења"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Нећете видети нова ни постојећа обавештења"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Без звучног сигнала или визуелног обавештења"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Нећете видети нити чути обавештења"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Телефон неће приказивати нова или постојећа обавештења и неће емитовати звук ни вибрирати. Обавештења се неће приказивати када превучете надоле од врха екрана.\n\nИмајте у виду да ће се важна обавештења о активностима и статусу телефона и даље приказивати."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Прилагођено"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Омогући прилагођено подешавање"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Уклони прилагођено подешавање"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Приказиваће се"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Без звучног сигнала за обавештења"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Делимично скривено"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Скривено"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Без звучног сигнала или визуелног обавештења"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Прилагођена ограничења"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Када је екран укључен"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Када је екран искључен"</string>
@@ -3203,19 +3213,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Звук је искључен, али дозволи за: <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> и <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Поруке, догађаји и подсетници"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Када је укључен режим Не узнемиравај, звукови обавештења за поруке, подсетнике и догађаје ће бити искључени, осим за ставке које сте дозволили изнад. Можете да прилагодите подешавања да бисте дозволили пријатељима, члановима породице или другим контактима да вас контактирају."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Готово"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Подешавања"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Без звучног сигнала или визуелног обавештења"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Без звучног сигнала за обавештења"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Нећете видети нити чути обавештења. Позиви од контаката са звездицом и поновних позивалаца су дозвољени."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(тренутно подешавање)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Желите ли да промените подешавања обавештења за режим Не узнемиравај?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Звуци за профил за Work"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Користи звуке личног профила"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Звукови профила за Work су исти као и звукови за личне профиле"</string>
@@ -3391,11 +3395,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Дозволи позиве"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Када је укључен режим Не узнемиравај, долазни позиви су блокирани. Можете да прилагодите подешавања да бисте дозволили пријатељима, члановима породице или другим контактима да вас контактирају."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Контакти са звездицом"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">и још <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="few">и још <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="other">и још <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Поруке"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Дозволи поруке"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Поруке"</string>
@@ -3838,10 +3838,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Хладна температура боје"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Користи хладније боје екрана"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Да бисте применили промену боје, искључите екран"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"ConnectivityMonitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor ће прикупљати евиденцију када открије проблем са повезивањем и затражиће од корисника да пријави грешку"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Рестартујте уређај да бисте применили промену ConnectivityMonitor-а"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Сензор ласера Камере"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Логичка камера као подразумевана"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Аутоматска ажурирања система"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Примени исправке кад се уређај поново покрене"</string>
     <string name="usage" msgid="2977875522080448986">"Потрошња"</string>
@@ -4165,8 +4163,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Услуга аутоматског попуњавања"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"аутоматски, попуњавање, аутоматско попуњавање"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Уверите се да је ова апликација поуздана&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google аутоматско попуњавање&gt;%1$s&lt;/xliff:g&gt; користи садржај екрана за утврђивање података који могу аутоматски да се попуне."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Тема уређаја"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Тема са бојом"</string>
     <string name="default_theme" msgid="7085644992078579076">"Подразумевана"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Тема уређаја"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Аутоматска (на основу позадине)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Светла"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Тамна"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Назив мреже"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Приказује назив мреже на статусној траци"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Менаџер меморијског простора: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4178,7 +4180,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Информације о додели мобилног оператера"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Покретање доделе мобилног оператера"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Ажурирајте режим Не узнемиравај"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Сакриј обавештења ради боље концентрације"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Паузирајте обавештења ради боље концентрације"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Шта је ново и узбудљиво?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Упознајте нови телефон"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Упознајте нови таблет"</string>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 486a4f3..bdcf737 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Alltid på"</item>
     <item msgid="6385301106124765323">"Alltid av"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 2273885..3587b57 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Tillåt att surfplattan kommunicerar med Bluetooth-enheter i närheten"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Tillåt att enheten kommunicerar med Bluetooth-enheter i närheten"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Tillåt att mobilen kommunicerar med Bluetooth-enheter i närheten"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Inaktivera maskinvaruavlastning för Bluetooth (A2DP)"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Vill du starta om enheten?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Du måste starta om enheten för att ändra den här inställningen."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Starta om"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Avbryt"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Tillgängliga mediaenheter"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Tillgängliga telefonenheter"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Anslutna just nu"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Anslutningsinställningar"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Tidigare anslutna enheter"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Tidigare anslutna enheter"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Datum och tid"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Välj tidszon"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Porten som du har angett är inte giltig."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP-proxyn används av webbläsaren men får inte användas av de andra apparna."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC-webbadress: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Bandbredd för nedladdning (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Bandbredd för uppladdning (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Platsinformation för mast (utfasad):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Information om grannmast (utfasad):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Fysisk kanalkonfiguration för LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Frekvens för uppdatering av mastinformation:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Alla information om mastmätning:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Information om dataanslutning i realtid:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Datatjänst:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI-kod:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk ljusstyrka"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Gå ur viloläget vid lyft"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Aktiv låsskärm"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Alltid på/Batterianvändningen ökar"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nya aviseringar"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"När den ska visas"</string>
     <string name="doze_title" msgid="2375510714460456687">"Nya aviseringar"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Aktivera skärmen när du får aviseringar"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">Du angav fel pinkod för SIM-kortet. <xliff:g id="NUMBER_0">%d</xliff:g> försök återstår innan du måste kontakta operatören för att låsa upp enheten.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Det gick inte att låsa upp med pinkoden för SIM-kortet."</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Pekdatorns status"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefonens status"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Systemuppdateringar"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android-version"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Bakgrundsanvändningen kan inte begränsas"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Vill du begränsa bakgrundsaktivitet?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Om du begränsar bakgrundaktiviteten för en app kanske den inte fungerar som den ska"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Appen kan inte begränsas eftersom batterioptimering inte har angetts.\n\nAktivera batterioptimering för att begränsa appen."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Skärmanvändning sedan fulladdning"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Skärmens förbrukning"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Genomsökning av mobilnätverk"</string>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Ringsignal vid nödsituationer"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Ange beteende vid nödsamtal"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Säkerhetskopiering"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"På"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Av"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Säkerhetskopiera och återställ"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personliga data"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Säkerhetskopiera data"</string>
@@ -2761,6 +2766,12 @@
       <item quantity="one">Kontrollera certifikatet</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Flera användare"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Användare och profiler"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Lägg till användare eller profil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Lägg till användare"</string>
@@ -2943,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"dataanvändning"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"surfzon"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Anslutna enheter"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, körläge, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, körläge"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Appar och aviseringar"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Behörigheter, standardappar"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Konton"</string>
@@ -2967,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"översikt, standard, appar"</string>
     <string name="keywords_display" msgid="8910345814565493016">"skärm, pekskärm"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"tona ned skärm, pekskärm, batteri, ljus"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"tona ned skärm, pekskärm, batteri"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"tona ned skärm, natt, ton, nattskift, ljusstyrka, skärmfärg, färg, färger"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"bakgrund, anpassa, anpassa skärm,"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"textstorlek"</string>
@@ -3008,8 +3014,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"nätverk, status för mobilt nätverk, status för tjänst, signalstyrka, mobilt nätverkstyp, roaming, iccid-nummer"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"serienummer, maskinvaruversion"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"nivå av programkorrigering för android, basbandsversion, kernel-version"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Aktiv låsskärm, visning av låsskärm"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"fingeravtryck"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"nedtonad skärm, pekskärm, batteri, intelligent ljusstyrka, dynamisk ljusstyrka"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"rotera, vänd, rotation, stående, liggande, orientering, lodrätt, vågrätt"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"uppgradera, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, schema, aviseringar, blockering, tystnad, vibration, viloläge, arbete, fokus, ljud, ljudlös, dag, veckodag, helg, vardagskväll, händelse"</string>
@@ -3092,18 +3101,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Tillåt synliga signaler"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"När Stör ej har aktiverats"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Aviseringar"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Visa aviseringar utan ljud"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Aviseringar döljs"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Aviseringar hörs inte"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Aviseringar visas på skärmen"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Inga ljud eller vibrationer används när du tar emot aviseringar på mobilen."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Dölj aviseringar"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Nya eller befintliga aviseringar visas inte"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Inga synliga eller hörbara aviseringar"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Aviseringar varken syns eller hörs"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Nya eller befintliga aviseringar visas inte på mobilen, och inga ljud eller vibrationer används. När du sveper nedåt från skärmens överkant visas inga aviseringar.\n\nDäremot visas viktiga aviseringar för mobilens aktivitet och status."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Anpassa"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Aktivera anpassad inställning"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Ta bort anpassad inställning"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Visas"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Aviseringar hörs inte"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Delvis dold"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Dold"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Inga synliga eller hörbara aviseringar"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Anpassade begränsningar"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"När skärmen är på"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"När skärmen är av"</string>
@@ -3162,19 +3171,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Stäng av ljudet men tillåt <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> och <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Meddelanden, händelser och påminnelser"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Meddelanden, påminnelser och händelser döljs när Stör ej har aktiverats, utom objekten du har tillåtit ovan. Du kan anpassa inställningarna så att dina vänner, familj eller andra kontakter ändå kan nå dig."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Klar"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Inställningar"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Inga synliga eller hörbara aviseringar"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Aviseringar hörs inte"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Aviseringar varken syns eller hörs. Samtal från stjärnmärkta kontakter och personer som ringer upp flera gånger släpps fram."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Aktuell inställning)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Vill du ändra aviseringsinställningarna för Stör ej?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Jobbprofilens ljud"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Använd pers. profilens ljud"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Samma ljud används i jobbprofilen och den personliga profilen"</string>
@@ -3346,10 +3349,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Tillåt samtal"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Inkommande samtal blockeras när Stör ej har aktiverats. Du kan anpassa inställningarna så att dina vänner, familj eller andra kontakter ändå kan nå dig."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Stjärnmärkta kontakter"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">och <xliff:g id="NUM_PEOPLE">%d</xliff:g> till</item>
-      <item quantity="one">och 1 till</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Meddelanden"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Tillåt meddelanden"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Meddelanden"</string>
@@ -3779,10 +3779,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Sval färgtemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Använd svalare färger på skärmen"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Stäng av skärmen om du vill tillämpa färgändringen"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor samlar in loggar när ett anslutningsproblem upptäcks och uppmanar användaren att skicka in en felrapport"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Starta om enheten om du vill tillämpa ändringen för Connectivity Monitor"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Lasersensor för kamera"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Logisk kamera som standardinställning"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatiska systemuppdateringar"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Tillämpa uppdateringar när enheten startas om"</string>
     <string name="usage" msgid="2977875522080448986">"Användning"</string>
@@ -4092,8 +4090,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Tjänsten Autofyll"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"auto, fyll, autofyll"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Kontrollera att du litar på den här appen&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofyll&gt;%1$s&lt;/xliff:g&gt; identifierar vad som kan fyllas i automatiskt utifrån vad som visas på skärmen."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Enhetstema"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Färgtema"</string>
     <string name="default_theme" msgid="7085644992078579076">"Standard"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Enhetstema"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Automatiskt (utifrån bakgrunden)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Ljust"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Mörkt"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Nätverksnamn"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Visa nätverksnamnet i statusfältet"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Lagringshanteraren: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4105,7 +4107,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Information om operatörsadministration"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktivera operatörsadministration"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Uppdatera Stör ej"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Dölj aviseringar för färre störningsmoment"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Pausa aviseringar så du kan behålla ditt fokus"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Vad är nytt?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Ta en rundtur på din nya mobil"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Ta en rundtur på din nya surfplatta"</string>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index fd72a81..f7828c8 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -61,7 +61,7 @@
   </string-array>
   <string-array name="entries_font_size">
     <item msgid="8166647333858618801">"Ndogo"</item>
-    <item msgid="6986443533756848935">"Chaguo-msingi"</item>
+    <item msgid="6986443533756848935">"Chaguo msingi"</item>
     <item msgid="38373998008112077">"Kubwa"</item>
     <item msgid="7635254317531872272">"Kubwa zaidi"</item>
   </string-array>
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -370,7 +376,7 @@
     <item msgid="2372711992605524591">"Muda mrefu"</item>
   </string-array>
   <string-array name="captioning_typeface_selector_titles">
-    <item msgid="1319652728542138112">"Chaguo-msingi"</item>
+    <item msgid="1319652728542138112">"Chaguo msingi"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif iliyofupishwa"</item>
     <item msgid="7247838127505318669">"Sans-serif monospace"</item>
@@ -388,7 +394,7 @@
     <item msgid="9044232017390975191">"Makubwa sana"</item>
   </string-array>
   <string-array name="captioning_edge_type_selector_titles">
-    <item msgid="4733815704128258753">"Chaguo-msingi"</item>
+    <item msgid="4733815704128258753">"Chaguo msingi"</item>
     <item msgid="3217099060748617005">"Hamna"</item>
     <item msgid="7467615139904599420">"Mistari"</item>
     <item msgid="5623165557468608975">"Angusha kivuli"</item>
@@ -402,7 +408,7 @@
     <item msgid="8342334626783983353">"100%"</item>
   </string-array>
   <string-array name="captioning_preset_selector_titles">
-    <item msgid="7009918361545506251">"Tumia programu chaguo-msingi"</item>
+    <item msgid="7009918361545506251">"Tumia programu chaguo msingi"</item>
     <item msgid="1770533843436933500">"Nyeupe kwenye nyeusi"</item>
     <item msgid="758587126802411846">"Nyeusi kwenye nyeupe"</item>
     <item msgid="1495307195241623402">"Manjano kwenye nyeusi"</item>
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Ikae ikiwa imewashwa"</item>
     <item msgid="6385301106124765323">"Imezimwa kila wakati"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 164e9c8..2512299 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Ruhusu kompyuta yako kibao itumie vifaa vya karibu vya Bluetooth"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Ruhusu kifaa chako kiwasiliane na vifaa vya karibu vya Bluetooth"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Ruhusu simu yako iwasiliane na vifaa vilivyo karibu vyenye Bluetooth"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Zima upakiaji wa maunzi kwa Bluetooth A2DP"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Utazima kisha uwashe?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Washa upya kifaa chako ili ubadilishe mipangilio."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Zima kisha uwashe"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Ghairi"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Vifaa vya maudhui vinavyopatikana"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Vifaa vya simu vinavyopatikana"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Ambavyo vimeunganishwa kwa sasa"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Mapendeleo ya muunganisho"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Vifaa ulivyounganisha awali"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Vilivyounganishwa awali"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Tarehe na saa"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Chagua saa za eneo"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Lango uliloandika si halali."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proksi ya HTTP inayotumiwa na kivinjari lakini haiwezi kutumika na programu zingine."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"URL ya PAC: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Kipimo Data cha DL (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Kipimo Data cha UL (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Maelezo ya Mahali Ilipo Simu ya Mkononi (iliacha kuendesha huduma):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Maelezo ya Simu iliyo Karibu (imeacha kuendesha huduma)"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Mipangilio ya Kituo Halisi cha LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Kadirio la Kuonyesha Upya Maelezo ya Simu:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Maelezo Yote ya Vipimo vya Simu:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Maelezo ya Wakati Halisi ya Muunganisho wa Data:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Huduma ya Data:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"urandaji:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -327,7 +335,7 @@
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Tumia saa za eneo kutoka kwa mtandao"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Tumia saa za eneo kutoka kwa mtandao"</string>
     <string name="date_time_24hour_auto" msgid="2117383168985653422">"Muundo wa saa 24 kiotomatiki"</string>
-    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Tumia mipangilio chaguo-msingi ya eneo la lugha"</string>
+    <string name="date_time_24hour_auto_summary" msgid="6351812925651480277">"Tumia mipangilio chaguo msingi ya eneo la lugha"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"Mfumo wa saa 24"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Tumia mpangilio wa saa 24"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Muda"</string>
@@ -376,7 +384,7 @@
     <string name="decryption_settings_summary" product="default" msgid="5671817824042639849">"Simu haijasimbwa"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Kifaa kimesimbwa kwa njia fiche"</string>
     <string name="decryption_settings_summary" product="tablet" msgid="5794135636155570977">"Kifaa hakijasimbwa"</string>
-    <string name="lockscreen_settings_title" msgid="1099738951060387656">"Onyesho la skrini iliyofungwa"</string>
+    <string name="lockscreen_settings_title" msgid="1099738951060387656">"Mwonekano kwenye skrini iliyofungwa"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="278055252361575926">"Cha kuonyesha"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Weka Mahali Pangu, fungua skrini, funga SIM kadi, funga hifadhi ya hati-tambulishi"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Weka Mahali Pangu, fungua skrini, funga hifadhi ya hati-tambulishi"</string>
@@ -1084,13 +1092,13 @@
     <string name="auto_brightness_summary_off" msgid="2802336459335410626">"Kimezimwa"</string>
     <string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Kiwango cha ung\'avu ni cha chini zaidi"</string>
     <string name="auto_brightness_summary_low" msgid="5609877905833960427">"Kiwango cha ung\'avu ni cha chini"</string>
-    <string name="auto_brightness_summary_default" msgid="7225666614394726845">"Kiwango cha ung\'avu kimewekwa kulingana na mipangilio chaguo-msingi"</string>
+    <string name="auto_brightness_summary_default" msgid="7225666614394726845">"Kiwango cha ung\'avu kimewekwa kulingana na mipangilio chaguo msingi"</string>
     <string name="auto_brightness_summary_high" msgid="7172304165631136027">"Kiwango cha ung\'avu ni cha juu"</string>
     <string name="auto_brightness_summary_very_high" msgid="979277812582279078">"Kiwango cha ung\'avu ni cha juu zaidi"</string>
     <string name="auto_brightness_off_title" msgid="2996864829946190795">"Zima"</string>
     <string name="auto_brightness_very_low_title" msgid="8252988638614126320">"Chini sana"</string>
     <string name="auto_brightness_low_title" msgid="1632186441514863377">"Chini"</string>
-    <string name="auto_brightness_default_title" msgid="936771997353506620">"Chaguo-msingi"</string>
+    <string name="auto_brightness_default_title" msgid="936771997353506620">"Chaguo msingi"</string>
     <string name="auto_brightness_high_title" msgid="2527853305981497345">"Juu"</string>
     <string name="auto_brightness_very_high_title" msgid="8867164854439331022">"Juu sana"</string>
     <string name="auto_brightness_subtitle" msgid="6454652530864093466">"Kiwango cha ung\'avu unachopendelea"</string>
@@ -1126,7 +1134,7 @@
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skrini huzima"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Baada ya <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> za kutokuwa na shughuli"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Mandhari"</string>
-    <string name="wallpaper_settings_summary_default" msgid="3395741565658711416">"Chaguo-msingi"</string>
+    <string name="wallpaper_settings_summary_default" msgid="3395741565658711416">"Chaguo msingi"</string>
     <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"Maalum"</string>
     <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Badilisha mandhari"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Weka mapendeleo ya skrini yako"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Mwangaza wa kiotomatiki"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Inua ili uondoe kifaa katika hali tuli"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Onyesho tulivu"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Ikae ikiwa imewashwa / Inatumia chaji nyingi"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Arifa mpya"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Wakati wa kuonyesha"</string>
     <string name="doze_title" msgid="2375510714460456687">"Arifa mpya"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Skrini iwake arifa zinapoingia"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">Nambari ya PIN ya SIM si sahihi. Una nafasi zingine <xliff:g id="NUMBER_0">%d</xliff:g> za kujaribu kabla ulazimike kuwasiliana na mtoa huduma wako ili afungue kifaa chako.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Utendakazi wa PIN ya SIM umeshindwa!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Hali ya kompyuta kibao"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Hali ya simu"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Masasisho ya mfumo"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Toleo la Android"</string>
@@ -1448,7 +1452,7 @@
     <string name="error_mnc_not23" msgid="8418177072458379439">"Sehemu ya MNC lazima iwe na nambari 2 au 3."</string>
     <string name="error_adding_apn_type" msgid="4181334016628549645">"Mtoa huduma haruhusu kuongeza APN za aina ya %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Inarejesha mipangilio mbadala ya APN"</string>
-    <string name="menu_restore" msgid="8260067415075573273">"Rudisha kwenye chaguo-msingi"</string>
+    <string name="menu_restore" msgid="8260067415075573273">"Rudisha kwenye chaguo msingi"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Kuweka upya kwa mipangilio mbadala ya APN kumekamilika"</string>
     <string name="reset_dashboard_title" msgid="6254873816990678620">"Chaguo za kubadilisha mipangilio"</string>
     <string name="reset_dashboard_summary" msgid="4851012632493522755">"Unaweza kubadilisha mipangilio ya mtandao, programu au kifaa"</string>
@@ -1674,7 +1678,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"Maelezo ya programu"</string>
     <string name="storage_label" msgid="8700867073480107253">"Hifadhi"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"Fungua moja kwa moja"</string>
-    <string name="auto_launch_label_generic" msgid="3230569852551968694">"Chaguo-msingi"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"Chaguo msingi"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"Utangamanifu wa skrini"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Ruhusa"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Akiba"</string>
@@ -1703,7 +1707,7 @@
     <string name="auto_launch_enable_text" msgid="4275746249511874845">"Umechagua kuzindua programu hii kwa mbadala kwa baadhi ya vitendo."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"Umechagua kuruhusu programu hii kuunda wijeti na kufikia data yao."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Hakuna chaguo-misingi zilizowekwa."</string>
-    <string name="clear_activities" msgid="7408923511535174430">"Futa chaguo-msingi"</string>
+    <string name="clear_activities" msgid="7408923511535174430">"Futa chaguo msingi"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"Programu hii haiwezi kuundwa kwa skrini yako: Unaweza kudhibiti jinsi inavyojirekebidhwa kwa skrini yako hapa."</string>
     <string name="ask_compatibility" msgid="7225195569089607846">"Uliza wakati imezinduliwa"</string>
     <string name="enable_compatibility" msgid="5806819252068617811">"Pima programu"</string>
@@ -1717,7 +1721,7 @@
     <string name="default_emergency_app" msgid="1951760659640369980">"Programu ya dharura"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Badilisha mapendeleo ya programu"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Ungependa kuweka upya mapendeleo ya programu?"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Hii itaweka upya mapendeleo yote ya: \n\n "<li>"Programu zilizozimwa"</li>\n" "<li>" Arifa za programu zilizozimwa"</li>\n" "<li>"Programu chaguo-msingi kwa vitendo"</li>\n" "<li>"Vikwazo vya chinichini vya data ya programu"</li>\n" "<li>"Vikwazo vyovyote vya ruhusa"</li>\n\n"Hutapoteza data yoyote ya programu."</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Hii itaweka upya mapendeleo yote ya: \n\n "<li>"Programu zilizozimwa"</li>\n" "<li>" Arifa za programu zilizozimwa"</li>\n" "<li>"Programu chaguo msingi kwa vitendo"</li>\n" "<li>"Vikwazo vya chinichini vya data ya programu"</li>\n" "<li>"Vikwazo vyovyote vya ruhusa"</li>\n\n"Hutapoteza data yoyote ya programu."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Weka upya"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Dhibiti nafasi"</string>
     <string name="filter" msgid="2018011724373033887">"Kichujio"</string>
@@ -1787,7 +1791,7 @@
     <string name="instant_app_details_summary" msgid="4529934403276907045">"Maelezo zaidi kwenye <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Inatumika"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Haijawahi kutumiwa)"</string>
-    <string name="no_default_apps" msgid="2915315663141025400">"Hakuna programu chaguo-msingi."</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"Hakuna programu chaguo msingi."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Matumizi ya hifadhi"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Tazama hifadhi iliyotumika na programu"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Inawasha upya"</string>
@@ -1864,7 +1868,7 @@
     <string name="show_ime_summary" msgid="8164993045923240698">"Ionyeshe kwenye skrini wakati kibodi halisi inatumika"</string>
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Kisaidizi cha njia za mkato"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Onyesha njia za mkato zilizoko"</string>
-    <string name="default_keyboard_layout" msgid="4172606673510531271">"Chaguo-msingi"</string>
+    <string name="default_keyboard_layout" msgid="4172606673510531271">"Chaguo msingi"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Kasi ya kiashiria"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Kidhibiti cha Mchezo"</string>
     <string name="vibrate_input_devices" msgid="421936611134697943">"Elekeza mtetemo"</string>
@@ -1872,7 +1876,7 @@
     <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Chagua mpangilio wa kibodi"</string>
     <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"sanidi mipangilio ya kibodi"</string>
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Ili kubadili, bonyeza Dhibiti-Kiweka nafasi"</string>
-    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Chaguo-msingi"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Chaguo msingi"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Mpangilio wa kibodi"</string>
     <string name="user_dict_settings_title" msgid="3427169369758733521">"Kamusi binafsi"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
@@ -2038,9 +2042,9 @@
     <string name="captioning_typeface" msgid="1826169240566563259">"Jamii ya Fonti"</string>
     <string name="captioning_preview_text" msgid="4067935959797375065">"Manukuu yataonekana hivi"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
-    <string name="locale_default" msgid="2593883646136326969">"Chaguo-msingi"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Chaguo msingi"</string>
     <string name="color_title" msgid="4258931051732243983">"Rangi"</string>
-    <string name="color_unspecified" msgid="5179683785413568326">"Chaguo-msingi"</string>
+    <string name="color_unspecified" msgid="5179683785413568326">"Chaguo msingi"</string>
     <string name="color_none" msgid="3475640044925814795">"Hakuna"</string>
     <string name="color_white" msgid="8045195170201590239">"Nyeupe"</string>
     <string name="color_gray" msgid="9192312087142726313">"Kijivu"</string>
@@ -2434,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Ishara ya simu ya dharura"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Weka tabia wakati simu ya dharura imepigwa"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Hifadhi nakala"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Imewashwa"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Imezimwa"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Hifadhi nakala na uzirejeshe"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Data za kibinafsi"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Hifadhi nakala ya data yangu"</string>
@@ -2760,6 +2766,12 @@
       <item quantity="one">Angalia cheti</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Watumiaji wengi"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Watumiaji na wasifu"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Ongeza mtumiaji au wasifu"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Ongeza mtumiaji"</string>
@@ -2826,10 +2838,10 @@
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Gusisha ili ulipe"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"Jinsi inavyofanya kazi"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"Tumia simu yako kulipa katika maduka"</string>
-    <string name="nfc_payment_default" msgid="8648420259219150395">"Chaguo-msingi la malipo"</string>
+    <string name="nfc_payment_default" msgid="8648420259219150395">"Chaguo msingi la malipo"</string>
     <string name="nfc_payment_default_not_set" msgid="7485060884228447765">"Haijawekwa"</string>
     <string name="nfc_payment_app_and_desc" msgid="7942415346564794258">"<xliff:g id="APP">%1$s</xliff:g> - <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
-    <string name="nfc_payment_use_default" msgid="3234730182120288495">"Tumia chaguo-msingi"</string>
+    <string name="nfc_payment_use_default" msgid="3234730182120288495">"Tumia chaguo msingi"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Kila wakati"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Isipokuwa wakati programu nyingine ya malipo imefunguliwa"</string>
     <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Unapolipa ukitumia chaguo la Gusisha ili ulipe, tumia:"</string>
@@ -2917,7 +2929,7 @@
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"Hakuna SIM kadi zilizoingizwa"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"Hali ya SIM"</string>
     <string name="sim_status_title_sim_slot" msgid="5725659316463979194">"Hali ya SIM (nafasi ya sim ya %1$d)"</string>
-    <string name="sim_call_back_title" msgid="5181549885999280334">"Piga simu kwa kutumia SIM kadi chaguo-msingi"</string>
+    <string name="sim_call_back_title" msgid="5181549885999280334">"Piga simu kwa kutumia SIM kadi chaguo msingi"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM ya kutumia kupiga simu"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Mipangilio mingine ya simu"</string>
     <string name="preferred_network_offload_title" msgid="1605829724169550275">"Mtandao wa Upakuaji unaopendelewa"</string>
@@ -2942,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"matumizi ya data"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"mtandao-hewa"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Vifaa vilivyounganishwa"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, hali ya kuendesha gari, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, hali ya kuendesha gari"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Programu na arifa"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Ruhusa, programu chaguo msingi"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Akaunti"</string>
@@ -2966,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"kifungua programu, chaguomsingi, programu"</string>
     <string name="keywords_display" msgid="8910345814565493016">"skrini, skrini ya kugusa"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"punguza mwangaza wa skrini, skrini ya kugusa, betri, ng\'aa"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"punguza mwanga wa skrini, skrini ya kugusa, betri"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"punguza mwangaza wa skrini, usiku, kivulivuli, awamu ya usiku, mwangaza, rangi ya skrini, rangi"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"mandhari, weka mapendeleo, badilisha skrini ikufae"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ukubwa wa maandishi"</string>
@@ -2975,7 +2982,7 @@
     <string name="keywords_battery" msgid="1173830745699768388">"matumizi ya nishati, chaji"</string>
     <string name="keywords_spell_checker" msgid="1399641226370605729">"tahajia, kamusi, kagua maendelezo, sahihisha kiotomatiki"</string>
     <string name="keywords_voice_input" msgid="769778245192531102">"king\'amuzi, vifaa vya kuingiza sauti, matamshi, ongea, lugha, tumia bila kugusa, utambuzi, la kukera, neno, sauti, historia, vifaa vya sauti, bluetooth"</string>
-    <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"kadiria, lugha, chaguo-msingi, zungumza, kuzungumza, tts, zana za walio na matatizo ya kuona na kusikia, kisoma skrini, kipofu"</string>
+    <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"kadiria, lugha, chaguo msingi, zungumza, kuzungumza, tts, zana za walio na matatizo ya kuona na kusikia, kisoma skrini, kipofu"</string>
     <string name="keywords_date_and_time" msgid="758325881602648204">"saa, jeshi"</string>
     <string name="keywords_network_reset" msgid="6024276007080940820">"weka upya, rejesha, kiwandani"</string>
     <string name="keywords_factory_data_reset" msgid="2261491208836438871">"futa data yote, futa, rejesha, ondoa, weka mipangilio ya kiwandani"</string>
@@ -2987,9 +2994,9 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"akaunti"</string>
     <string name="keywords_users" msgid="3434190133131387942">"vikwazo, weka vikwazo, imewekewa vikwazo"</string>
     <string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"kusahihisha maandishi, sahihisha, sauti, tetema, otomatiki, lugha, ishara, pendekeza, pendekezo, mandhari, ya kukera, neno, andika, emoji, ya kimataifa"</string>
-    <string name="keywords_reset_apps" msgid="5293291209613191845">"weka upya, mapendeleo, chaguo-msingi"</string>
-    <string name="keywords_emergency_app" msgid="3143078441279044780">"dharura, samawati, programu, chaguo-msingi"</string>
-    <string name="keywords_default_phone_app" msgid="4213090563141778486">"simu, kipiga simu, chaguo-msingi"</string>
+    <string name="keywords_reset_apps" msgid="5293291209613191845">"weka upya, mapendeleo, chaguo msingi"</string>
+    <string name="keywords_emergency_app" msgid="3143078441279044780">"dharura, samawati, programu, chaguo msingi"</string>
+    <string name="keywords_default_phone_app" msgid="4213090563141778486">"simu, kipiga simu, chaguo msingi"</string>
     <string name="keywords_all_apps" msgid="7814015440655563156">"programu, kupakua, programu, mfumo"</string>
     <string name="keywords_app_permissions" msgid="4229936435938011023">"programu, ruhusa, usalama"</string>
     <string name="keywords_default_apps" msgid="223872637509160136">"programu, chaguomsingi"</string>
@@ -3007,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"mtandao, hali ya mtandao wa simu, hali ya huduma, uthabiti wa mtandao, aina ya mtandao wa simu, matumizi ya mitandao mingine, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"nambari ya ufuatiliaji, toleo la maunzi"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"kiwango cha rekebisho la usalama wa android, toleo la mitambo ya redio, toleo la kiini"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Onyesho tulivu, Skrini iliyofungwa"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"alama ya kidole"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"zungusha, gueza, kuzungusha, wima, mlalo, mkao"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"pata toleo jipya, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, ratiba, arifa, zuia, nyamazisha, tetema, lala, kazini, angazia, sauti, zima sauti, siku, siku ya kazi, wikiendi, usiku wa siku za wiki, tukio"</string>
@@ -3031,7 +3042,7 @@
     <string name="status_write_success" msgid="5228419086308251169">"Imefanikiwa!"</string>
     <string name="status_failed_to_write" msgid="8072752734686294718">"Haiwezi kuandika data kwenye tagi ya NFC. Kama tatizo litaendelea, jaribu tagi tofauti"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Tagi ya NFC haiandikiki. Tafadhali tumia tagi tofauti."</string>
-    <string name="default_sound" msgid="8821684447333687810">"Sauti chaguo-msingi"</string>
+    <string name="default_sound" msgid="8821684447333687810">"Sauti chaguo msingi"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Kiwango cha sauti ya mlio ni <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="3402435125958012986">"Kiwango cha sauti, mtetemo, Usinisumbue"</string>
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Programu inayotoa milio ya simu imewekwa katika hali ya kutetema"</string>
@@ -3046,7 +3057,7 @@
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Sauti chaguomsingi ya arifa"</string>
     <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Sauti iliyotolewa na programu"</string>
     <string name="notification_sound_default" msgid="565135733949733766">"Sauti chaguomsingi ya arifa"</string>
-    <string name="alarm_ringtone_title" msgid="6344025478514311386">"Sauti chaguo-msingi ya kengele"</string>
+    <string name="alarm_ringtone_title" msgid="6344025478514311386">"Sauti chaguo msingi ya kengele"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Pia tetema simu zinapoingia"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Sauti nyingine"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Sauti za vitufe vya kupiga simu"</string>
@@ -3091,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Ruhusu ishara zinazoonekena"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Wakati umewasha mipangilio ya Usinisumbue"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Arifa"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Onyesha arifa bila sauti"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Arifa zitakomeshwa"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Arifa zisitoe sauti"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Utaona arifa kwenye skrini yako"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Unapopokea arifa mpya, simu yako haitatoa mlio wala mtetemo."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Ficha arifa"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Hutaona arifa mpya au zilizopo"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Arifa zisionekane wala zisitoe sauti"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Hutasikia wala kuona arifa"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Simu yako haitaonyesha arifa zilizopo au mpya na haitatoa mlio wala mtetemo. Arifa hazitaonekana utakapotelezesha kidole chini kuanzia sehemu ya juu ya skrini.\n\nKumbuka kuwa arifa muhimu zaidi za hali na shughuli za simu zitaonekana."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Maalum"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Washa mipangilio maalum"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Ondoa mipangilio maalum"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Zitaonekana"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Arifa zisitoe sauti"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Imefichwa kiasi"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Imefichwa"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Arifa zisionekane wala zisitoe sauti"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Vikwazo maalum"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Wakati skrini imewashwa"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Wakati skrini imezimwa"</string>
@@ -3161,25 +3172,19 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Imezimwa, lakini ruhusu <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> na <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Ujumbe, matukio na vikumbusho"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Wakati umewasha mipangilio ya Usinisumbue, ujumbe, vikumbusho na matukio yatakomeshwa, isipokuwa yanayotoka kwenye vipengee unavyoruhusu hapo juu. Unaweza kubadilisha mipangilio ya ujumbe ili uwaruhusu marafiki, familia na watu wengine wawasiliane nawe."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Nimemaliza"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Mipangilio"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Arifa zisionekane wala zisitoe sauti"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Arifa zisitoe sauti"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Hutaona wala kusikia arifa. Simu kutoka anwani zenye nyota na wanaorudia kupiga simu zinaruhusiwa."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Mipangilio ya sasa)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Ungependa kubadilisha mipangilio ya arifa za Usinisumbue?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Sauti za wasifu wa kazi"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Tumia sauti za wasifu wako binafsi"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Sauti za wasifu wa binafsi na wa kazini ni sawa"</string>
     <string name="work_ringtone_title" msgid="5806657896300235315">"Mlio wa simu ya kazini"</string>
-    <string name="work_notification_ringtone_title" msgid="6081247402404510004">"Sauti chaguo-msingi ya arifa ya kazini"</string>
-    <string name="work_alarm_ringtone_title" msgid="1441926676833738891">"Sauti chaguo-msingi ya kengele ya kazini"</string>
+    <string name="work_notification_ringtone_title" msgid="6081247402404510004">"Sauti chaguo msingi ya arifa ya kazini"</string>
+    <string name="work_alarm_ringtone_title" msgid="1441926676833738891">"Sauti chaguo msingi ya kengele ya kazini"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Sawa na wasifu binafsi"</string>
     <string name="work_sync_dialog_title" msgid="7123973297187354813">"Ungependa kubadilisha sauti?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Badilisha"</string>
@@ -3345,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Ruhusu simu"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Ukiwasha mipangilio ya Usinisumbue, itazuia simu zinazoingia. Unaweza kubadilisha mipangilio ili uruhusu marafiki, familia na watu wengine wawasiliane nawe."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Anwani zenye nyota"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">na wengine <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="one">na mwingine 1</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Ujumbe"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Ruhusu ujumbe"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Ujumbe"</string>
@@ -3441,7 +3443,7 @@
     <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"Fungua viungo vinavyoweza kutumika"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Fungua bila kuuliza"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"Viungo vinavyoweza kutumika"</string>
-    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Chaguo-msingi nyingine"</string>
+    <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Chaguo msingi nyingine"</string>
     <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> zimetumika katika <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="6042049833565674948">"Hifadhi ya mfumo"</string>
     <string name="storage_type_external" msgid="7738894330670001898">"Hifadhi ya nje"</string>
@@ -3511,8 +3513,8 @@
     <string name="app_link_open_ask" msgid="7800878430190575991">"Uliza kila wakati"</string>
     <string name="app_link_open_never" msgid="3407647600352398543">"Usifungue katika programu hii"</string>
     <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Haitambuliwi"</string>
-    <string name="default_apps_title" msgid="1660450272764331490">"Chaguo-msingi"</string>
-    <string name="default_for_work" msgid="9152194239366247932">"Chaguo-msingi ya kazini"</string>
+    <string name="default_apps_title" msgid="1660450272764331490">"Chaguo msingi"</string>
+    <string name="default_for_work" msgid="9152194239366247932">"Chaguo msingi ya kazini"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Maagizo na usaidizi kwa kutamka"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Programu ya usaidizi"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Ungetaka kuweka <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> kuwa mratibu wako?"</string>
@@ -3521,11 +3523,11 @@
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"Kataa"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"Chagua kuweka data kwa kutamka"</string>
     <string name="default_browser_title" msgid="8101772675085814670">"Programu ya kivinjari"</string>
-    <string name="default_browser_title_none" msgid="2124785489953628553">"Hakuna Kivinjari chaguo-msingi"</string>
+    <string name="default_browser_title_none" msgid="2124785489953628553">"Hakuna Kivinjari chaguo msingi"</string>
     <string name="default_phone_title" msgid="282005908059637350">"Programu ya simu"</string>
-    <string name="default_app" msgid="6864503001385843060">"(Chaguo-msingi)"</string>
+    <string name="default_app" msgid="6864503001385843060">"(Chaguo msingi)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Mfumo)"</string>
-    <string name="system_default_app" msgid="3091113402349739037">"(Programu chaguo-msingi ya mfumo)"</string>
+    <string name="system_default_app" msgid="3091113402349739037">"(Programu chaguo msingi ya mfumo)"</string>
     <string name="apps_storage" msgid="4353308027210435513">"Hifadhi ya programu"</string>
     <string name="usage_access" msgid="5479504953931038165">"Kufikia matumizi"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"Idhinisha ufikiaji wa matumizi"</string>
@@ -3643,7 +3645,7 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Itaondoa sheria zote za Usinisumbue ambazo zimetengenezwa na programu hii."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Usiboreshe"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Boresha"</string>
-    <string name="ignore_optimizations_on_desc" msgid="3549930955839111652">"Huenda ikamaliza chaji ya betri yako haraka zaidi. Programu haitanyimwa tena ruhusa ya kutumia betri chinichini."</string>
+    <string name="ignore_optimizations_on_desc" msgid="3549930955839111652">"Huenda ikamaliza chaji ya betri yako haraka zaidi. Programu haitazuiwa tena kutumia betri chinichini."</string>
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Imependekezwa kwa muda bora wa matumizi ya betri"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Ungetaka kuruhusu <xliff:g id="APP">%s</xliff:g> ipuuze uimarishaji wa betri?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Hamna"</string>
@@ -3714,7 +3716,7 @@
     <string name="display_summary_example" msgid="9102633726811090523">"Iweke katika hali tuli baada ya dakika 10 za kutokuwa na shughuli"</string>
     <string name="memory_summary" msgid="8080825904671961872">"Takriban <xliff:g id="USED_MEMORY">%1$s</xliff:g> kati ya <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> za hifadhi zimetumika"</string>
     <string name="users_summary" msgid="1674864467098487328">"Umeingia katika akaunti ukitumia <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
-    <string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> ni chaguo-msingi"</string>
+    <string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> ni chaguo msingi"</string>
     <string name="location_on_summary" msgid="3637699010986988970">"Imewashwa"</string>
     <string name="location_off_summary" msgid="7217264690673949107">"Imezimwa"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Kipengee cha kuhifadhi nakala kimezimwa"</string>
@@ -3778,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Halijoto ya rangi ya baridi"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Tumia rangi yenye halijoto ya baridi zaidi kwenye onyesho"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Zima skrini ili uweze kutekeleza ubadilishaji wa rangi"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Kichunguzi cha Muunganisho"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Kichunguzi cha Muunganisho hukusanya kumbukumbu kinapotambua tatizo la muunganisho na kumkumbusha mtumiaji kuwasilisha ripoti ya hitilafu"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Ili kuweka mabadiliko ya kichunguzi cha muunganisho, washa kifaa tena"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kitambuzi cha Leza cha Kamera"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Weka Kamera Mahiri iwe Chaguomsingi"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Masasisho ya mfumo kiotomatiki"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Weka masasisho kifaa kitakapozimwa na kuwashwa"</string>
     <string name="usage" msgid="2977875522080448986">"Matumizi"</string>
@@ -3848,7 +3848,7 @@
     <string name="unrestricted_app_title" msgid="4465437191723332066">"Matumizi ya data bila vikwazo"</string>
     <string name="unrestricted_app_summary" msgid="6458008993501723912">"Ruhusu ufikiaji wa data bila vikwazo wakati Kiokoa Data kimewashwa"</string>
     <string name="home_app" msgid="4066188520886810030">"Programu ya ukurasa wa mwanzo"</string>
-    <string name="no_default_home" msgid="7184117487704520238">"Hakuna mipangilio chaguo-msingi ya Mwanzo"</string>
+    <string name="no_default_home" msgid="7184117487704520238">"Hakuna mipangilio chaguo msingi ya Mwanzo"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"Uanzishaji salama"</string>
     <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"Weka mchoro ili kuwasha kifaa chako. Kifaa hiki hakiwezi kupokea simu, ujumbe, arifa wala kengele kikiwa kimezimwa."</string>
     <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"Weka PIN ili kuwasha kifaa chako. Kifaa hiki hakiwezi kupokea simu, ujumbe, arifa wala kengele kikiwa kimezimwa."</string>
@@ -3862,7 +3862,7 @@
     <string name="battery_saver_button_turn_off" msgid="5916996792004611890">"Izime sasa"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"Haitumii kipengele cha kuboresha matumizi ya betri"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"Ikiwa kifaa kimefungwa, usiruhusu uchapaji wa majibu au maandishi mengine kwenye arifa"</string>
-    <string name="default_spell_checker" msgid="8506899870026026660">"Kikagua maendelezo chaguo-msingi"</string>
+    <string name="default_spell_checker" msgid="8506899870026026660">"Kikagua maendelezo chaguo msingi"</string>
     <string name="choose_spell_checker" msgid="6596539862291699367">"Chagua kikagua maendelezo"</string>
     <string name="spell_checker_master_switch_title" msgid="8763132750954344372">"Tumia kikagua maendelezo"</string>
     <string name="spell_checker_not_selected" msgid="8871083796179200696">"Hakijachaguliwa"</string>
@@ -3891,7 +3891,7 @@
     <string name="notification_log_details_ashmem" msgid="7241814108477320636">"hifadhi inayoshirikiwa katika Android"</string>
     <string name="notification_log_details_sound" msgid="5506232879598808099">"sauti"</string>
     <string name="notification_log_details_vibrate" msgid="6890065466625335940">"tetema"</string>
-    <string name="notification_log_details_default" msgid="2345249399796730861">"chaguo-msingi"</string>
+    <string name="notification_log_details_default" msgid="2345249399796730861">"chaguo msingi"</string>
     <string name="notification_log_details_none" msgid="184131801230614059">"hamna"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Haina kipengele cha kuorodhesha."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Kipengele cha kuorodhesha hakina ufunguo huu."</string>
@@ -4029,7 +4029,7 @@
       <item quantity="other">Programu <xliff:g id="COUNT_1">%d</xliff:g></item>
       <item quantity="one">Programu <xliff:g id="COUNT_0">%d</xliff:g></item>
     </plurals>
-    <string name="enterprise_privacy_input_method" msgid="6531350246850814920">"Kibodi chaguo-msingi"</string>
+    <string name="enterprise_privacy_input_method" msgid="6531350246850814920">"Kibodi chaguo msingi"</string>
     <string name="enterprise_privacy_input_method_name" msgid="4941106433683067953">"Weka kuwa <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="enterprise_privacy_always_on_vpn_device" msgid="4409098287763221215">"VPN iwe imewashwa kila wakati"</string>
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Kila mara VPN iwe imewashwa kwenye wasifu wako wa binafsi"</string>
@@ -4091,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Huduma ya kujaza kiotomatiki"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"otomatiki, jaza, kujaza kiotomatiki"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Hakikisha kuwa unaamini programu hii&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; hutumia kilicho kwenye skrini yako kubaini kinachoweza kujazwa kiotomatiki."</string>
+    <string name="color_theme" msgid="1535685696756738324">"Mandhari ya rangi"</string>
+    <string name="default_theme" msgid="7085644992078579076">"Chaguo msingi"</string>
     <string name="device_theme" msgid="4571803018917608588">"Mandhari ya kifaa"</string>
-    <string name="default_theme" msgid="7085644992078579076">"Chaguo-msingi"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Otomatiki (kulingana na mandhari)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Meupe"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Meusi"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Jina la mtandao"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Onyesha jina la mtandao kwenye sehemu ya arifa"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Kidhibiti Hifadhi: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4104,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Maelezo ya Utaratibu wa Mtoa Huduma"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Anzisha Utaratibu wa Mtoa Huduma"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Sasisha kipengele cha Usinisumbue"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Ficha arifa ili uendelee kuangazia"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Sitisha arifa ili uendelee kumakinika"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Nini kipya na cha kusisimua?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Kagua simu yako mpya"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Kagua kompyuta yako kibao mpya"</string>
diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml
index ba5eba6..01e2a1a 100644
--- a/res/values-ta/arrays.xml
+++ b/res/values-ta/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"எப்போதும் ஆனில் வைத்திரு"</item>
     <item msgid="6385301106124765323">"எப்போதும் ஆஃபில் வைத்திரு"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 85fb441..93d2496 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"அருகிலுள்ள புளூடூத் சாதனங்களுடன் தொடர்புகொள்ள, உங்கள் டேப்லெட்டை அனுமதிக்கவும்"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"அருகிலுள்ள புளூடூத் சாதனங்களுடன் தொடர்புகொள்ள, உங்கள் சாதனத்தை அனுமதிக்கவும்"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"அருகிலுள்ள புளூடூத் சாதனங்களுடன் தொடர்புகொள்ள, உங்கள் மொபைலை அனுமதிக்கவும்"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"புளூடூத் A2DP வன்பொருள் ஆஃப்லோடை முடக்கு"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"மீண்டும் தொடங்கவா?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"இந்த அமைப்பை மாற்ற, சாதனத்தை மீண்டும் தொடங்க வேண்டும்."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"தொடங்கு"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"வேண்டாம்"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"மீடியா வசதியைக் கொண்ட சாதனங்கள்"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"அழைப்பு வசதியைக் கொண்ட சாதனங்கள்"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"தற்போது இணைக்கப்பட்டுள்ளது"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"இணைப்பு விருப்பத்தேர்வுகள்"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"இதற்கு முன்னர் இணைத்த சாதனங்கள்"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"ஏற்கனவே இணைத்தவை"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"தேதி &amp; நேரம்"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"நேரமண்டலத்தைத் தேர்வுசெய்க"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"நீங்கள் உள்ளிட்ட போர்ட் தவறானது."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP ப்ராக்ஸியை உலாவி பயன்படுத்தும் ஆனால் பிற பயன்பாடுகள் பயன்படுத்தாமல் போகலாம்."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL இணைய வேகம் (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL இணைய வேகம் (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"மொபைலின் இருப்பிடத் தகவல் (தடுக்கப்பட்டது):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"அருகிலுள்ள மொபைலின் தகவல் (தடுக்கப்பட்டது):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE ஃபிசிக்கல் சேனல் உள்ளமைவு:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"மொபைல் தகவலின் புதுப்பிப்பு விகிதம்:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"அனைத்து மொபைல் அளவீட்டுத் தகவல்:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"தரவு இணைப்பின் நிகழ்நேரத் தகவல்:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"டேட்டா சேவை:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"ரோமிங்:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"தானாக ஒளிர்வைச் சரிசெய்தல்"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"விரலை எடுக்கும் போது இயங்கு"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"சூழல்சார் திரை"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"எப்போதும் இயக்கத்தில் வை / பேட்டரியை அதிகமாகப் பயன்படுத்தும்"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"புதிய அறிவிப்புகள்"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"காட்டுவதற்கான நேரம்"</string>
     <string name="doze_title" msgid="2375510714460456687">"புதிய அறிவிப்புகள்"</string>
     <string name="doze_summary" msgid="3846219936142814032">"அறிவிப்புகளைப் பெறும் போது திரையை இயக்கு"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">சிம்மின் பின் குறியீடு தவறானது, மேலும் <xliff:g id="NUMBER_0">%d</xliff:g> முயற்சிக்குப் பின்னர், சாதனத்தைத் திறக்க, கண்டிப்பாக உங்கள் மொபைல் நிறுவனத்தைத் தொடர்புகொள்ள வேண்டும்.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"சிம் பின் செயல்பாடு தோல்வி!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"டேப்லெட் நிலை"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"மொபைலின் நிலை"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"புதிய பதிப்பு"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android பதிப்பு"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"பின்னணி உபயோகத்தைக் கட்டுப்படுத்த முடியவில்லை"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"பின்னணி செயல்பாட்டைக் கட்டுப்படுத்தவா?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"பயன்பாட்டின் பின்னணி செயல்பாட்டைக் கட்டுப்படுத்தினால், சரியாக வேலை செய்யாது."</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"பேட்டரியை மேம்படுத்த அமைக்கப்படவில்லை, எனவே கட்டுப்படுத்த முடியாது.\n\nஆப்ஸை கட்டுப்படுத்த, பேட்டரி மேம்படுத்தலை ஆன் செய்க."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"திரையின் பயன்பாடு (முழு சார்ஜ் ஆன பிறகு)"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"திரை நுகர்வு"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"மொபைல் நெட்வொர்க்கை ஸ்கேன் செய்தல்"</string>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"அவசரகால டயலிங் சிக்னல்"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"அவசர அழைப்பு இயக்கப்பட்டிருக்கும்போது நடத்தையை அமை"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"காப்புப் பிரதி"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"ஆன் செய்யப்பட்டுள்ளது"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"ஆஃப் செய்யப்பட்டுள்ளது"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"காப்புப் பிரதி &amp; மீட்டெடுத்தல்"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"தனிப்பட்ட தரவு"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"தரவை காப்புப்பிரதியெடு"</string>
@@ -2761,6 +2766,12 @@
       <item quantity="one">சான்றிதழைச் சரிபார்</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"பல பயனர்கள்"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"பயனர்கள் &amp; சுயவிவரங்கள்"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"பயனர் அல்லது சுயவிவரத்தைச் சேர்"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"பயனரைச் சேர்"</string>
@@ -2943,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"டேட்டா உபயோகம்"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"ஹாட்ஸ்பாட்"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"இணைத்த சாதனங்கள்"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"புளூடூத், வாகனம் ஓட்டும் பயன்முறை, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"புளூடூத், வாகனம் ஓட்டும் பயன்முறை"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"புளூடூத், NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"புளூடூத்"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ஆப்ஸ் &amp; அறிவிப்புகள்"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"அனுமதிகள், இயல்பு ஆப்ஸ்"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"கணக்குகள்"</string>
@@ -2967,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"தொடக்கி, இயல்பு, ஆப்ஸ்"</string>
     <string name="keywords_display" msgid="8910345814565493016">"திரை, டச்ஸ்கிரீன்"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"ஒளிமங்கல் திரை, டச்ஸ்கிரீன், பேட்டரி, பிரகாசம்"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"ஒளிமங்கல் திரை, டச்ஸ்கிரீன், பேட்டரி"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"ஒளிமங்கல் திரை, இரவு, மென்னிறம், இரவு ஷிஃப்ட், ஒளிர்வு, திரை வண்ணம், நிறம், வண்ணம்"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"பின்னணி, தனிப்படுத்து, தனிப்பயனாக்கு திரை"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"உரை அளவு"</string>
@@ -3008,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"நெட்வொர்க், மொபைல் நெட்வொர்க் நிலை, சேவை நிலை, சிக்னலின் வலிமை, மொபைல் நெட்வொர்க் வகை, ரோமிங், iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"வரிசை எண், வன்பொருள் பதிப்பு"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android பாதுகாப்பு பேட்ச் நிலை, பேஸ்பேண்ட் பதிப்பு, கர்னல் பதிப்பு"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"சூழல்சார் திரை, லாக் ஸ்கிரீன்"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"கைரேகை"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"சுழற்று, ஃபிலிப், சுழற்சி, போர்ட்ரெய்ட், லேண்ட்ஸ்கேப், திசையமைப்பு, நீளவாக்கு, அகலவாக்கு"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"மேம்படுத்து, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, திட்டமிடு, அறிவிப்புகள், தடு, நிசப்தம், அதிர்வு, உறங்கு, பணி, ஒலி, ஒலியடக்கு, நாள், வார நாள், வாரயிறுதி, வார நாளின் இரவு, நிகழ்வு"</string>
@@ -3092,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"விஷுவல் சிக்னல்களை அனுமதி"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"\'தொந்தரவு செய்ய வேண்டாம்\' ஆன் செய்யப்பட்டிருக்கும்போது"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"அறிவிப்புகள்"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"ஒலியின்றி அறிவிப்புகளைக் காட்டு"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"அறிவிப்புகள் ஒலியடக்கப்படும்"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"அறிவிப்புகள் வரும்போது ஒலியெழுப்ப வேண்டாம்"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"உங்கள் திரையில் அறிவிப்புகளைக் காண்பீர்கள்"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"அறிவிப்புகள் வரும்போது, உங்கள் மொபைல் ஒலியையும் எழுப்பாது, அதிர்வுறவும் செய்யாது."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"அறிவிப்புகளை மறை"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"புதிய அறிவிப்புகளோ ஏற்கனவே உள்ள அறிவிப்புகளோ காட்டப்படாது"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"அறிவிப்புகள் வரும்போது காட்டவோ ஒலியெழுப்பவோ வேண்டாம்"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"அறிவிப்புகளைப் பார்க்கவோ கேட்கவோ மாட்டீர்கள்"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"புதிய அல்லது ஏற்கனவே இருக்கும் அறிவிப்புகளை உங்கள் மொபைல் காட்டாது. அத்துடன் அறிவிப்புகளுக்கு, ஒலியையோ அதிர்வையோ எழுப்பாது. உங்கள் திரையில் மேலிருந்து கீழே ஸ்வைப் செய்தால், அறிவிப்புகள் தெரியாது.\n\nகவனத்திற்கு: மொபைல் செயல்பாடு மற்றும் அதன் நிலை குறித்த முக்கிய அறிவிப்புகள் எப்போதும்போல் காட்டப்படும்."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"தனிப்பயன்"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"தனிப்பயன் அமைப்பை இயக்கு"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"தனிப்பயன் அமைப்பை அகற்று"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"தோன்றுபவை"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"அறிவிப்புகள் வரும்போது ஒலியெழுப்ப வேண்டாம்"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"பகுதியளவு மறைக்கப்பட்டவை"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"மறைக்கப்பட்டவை"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"அறிவிப்புகள் வரும்போது காட்டவோ ஒலியெழுப்பவோ வேண்டாம்"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"தனிப்பயன் கட்டுப்பாடுகள்"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"திரை ஆன் செய்யப்பட்டிருக்கும்போது"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"திரை ஆஃப் செய்யப்பட்டிருக்கும்போது"</string>
@@ -3162,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"ஒலியடக்கப்பட்டது, ஆனால் <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> மற்றும் <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> அனுமதிக்கப்பட்டுள்ளன"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"மெசேஜஸ், நிகழ்வுகள் &amp; நினைவூட்டல்கள்"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"\'தொந்தரவு செய்ய வேண்டாம்\' ஆன் செய்யப்பட்டிருக்கும் போது நீங்கள் அனுமதித்தவை தவிர்த்து, மெசேஜஸ், நினைவூட்டல்கள், நிகழ்வுகள் ஆகியவை ஒலியடக்கப்படும். நண்பர்கள், குடும்பத்தினர் அல்லது வேறு தொடர்புகள் உங்களைத் தொடர்புகொள்வதை அனுமதிக்க, நீங்கள் மெசேஜஸ் அமைப்புகளை மாற்றிக்கொள்ளலாம்."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"முடிந்தது"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"அமைப்புகள்"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"அறிவிப்புகள் வரும்போது காட்டவோ ஒலியெழுப்பவோ வேண்டாம்"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"அறிவிப்புகள் வரும்போது ஒலியெழுப்ப வேண்டாம்"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"அறிவிப்புகளைப் பார்க்கவோ கேட்கவோ மாட்டீர்கள். நட்சத்திரமிட்ட தொடர்புகள் மற்றும் மீண்டும் அழைப்பவர்களிடமிருந்து வரும் அழைப்புகள் அனுமதிக்கப்படும்."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(தற்போதைய அமைப்பு)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"\'தொந்தரவு செய்ய வேண்டாம்\' அறிவிப்பு அமைப்புகளை மாற்றவா?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"பணி விவர ஒலிகள்"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"தனிப்பட்ட சுயவிவர ஒலிகளைப் பயன்படுத்து"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"பணி மற்றும் தனிப்பட்ட சுயவிவரங்களுக்கு ஒரே ஒலிகள்"</string>
@@ -3346,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"அழைப்புகளை அனுமதி"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"\'தொந்தரவு செய்ய வேண்டாம்\' ஆனில் இருக்கும்போது, உள்வரும் அழைப்புகள் தடுக்கப்படும். உங்களை நண்பர்களோ, குடும்பத்தினரோ, வேறு தொடர்புகளோ தொடர்புகொள்வதற்கு அனுமதிக்க, நீங்கள் அமைப்புகளை மாற்றிக்கொள்ளலாம்."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"நட்சத்திரமிட்ட தொடர்புகள்"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">மற்றும் <xliff:g id="NUM_PEOPLE">%d</xliff:g> பேர்</item>
-      <item quantity="one">மற்றும் ஒருவர்</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"மெசேஜஸ்"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"மெசேஜஸை அனுமதி"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"மெசேஜஸ்"</string>
@@ -3654,7 +3655,7 @@
     <string name="system_alert_window_settings" msgid="8466613169103527868">"பிற ஆப்ஸின் மேலே காட்டு"</string>
     <string name="system_alert_window_apps_title" msgid="7005760279028569491">"ஆப்ஸ்"</string>
     <string name="system_alert_window_access_title" msgid="6297115362542361241">"பிற ஆப்ஸின் மேலே காட்டு"</string>
-    <string name="permit_draw_overlay" msgid="7456536798718633432">"பிற பயன்பாடுகளின் மேலே காட்டுவதை அனுமதி"</string>
+    <string name="permit_draw_overlay" msgid="7456536798718633432">"பிற ஆப்ஸின் மேலே காட்டுவதை அனுமதி"</string>
     <string name="allow_overlay_description" msgid="8961670023925421358">"நீங்கள் பயன்படுத்தும் பிற ஆப்ஸின் மேலே உள்ளடக்கத்தைக் காட்ட, இந்தப் பயன்பாட்டை அனுமதிக்கும். மேலும், அந்த ஆப்ஸை நீங்கள் பயன்படுத்தும் போது இது குறுக்கிடக்கூடும் அல்லது அவை தோன்றும் அல்லது செயல்படும் விதத்தை மாற்றக்கூடும்."</string>
     <string name="keywords_vr_listener" msgid="7441221822576384680">"vr விர்ச்சுவல் ரியாலிட்டி லிஷனர் ஸ்டீரியோ உதவிச் சேவை"</string>
     <string name="keywords_system_alert_window" msgid="5049498015597864850">"சாதனம் விழிப்பூட்டல் சாளரம் உரையாடல் காட்டு பிற பயன்பாடுகளின் மேல்"</string>
@@ -3779,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"நீல நிற வெப்பநிலை"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"நீல வண்ணங்களைத் திரைக்குப் பயன்படுத்து"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"வண்ண மாற்றத்தைப் பயன்படுத்த, திரையை முடக்கவும்"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"இணைப்புக் கண்காணிப்பான்"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"இணைப்புக் கண்காணிப்பான், இணைப்பில் உள்ள சிக்கலைக் கண்டறிந்தவுடன், பதிவுகளைச் சேகரித்து, பிழையைப் புகாரளிக்கும்படி பயனருக்கு அறிவிக்கும்"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"இணைப்புக் கண்காணிப்பானில் செய்த மாற்றத்தைச் செயல்படுத்த, சாதனத்தை மறுதொடக்கம் செய்யவும்"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"கேமராவின் லேசர் சென்சார்"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"இயல்பான அமைப்பாக லாஜிக்கல் கேமரா"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"தானியங்கு முறைமை புதுப்பிப்புகள்"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"சாதனம் மீண்டும் தொடங்கும்போது, புதுப்பிப்புகள் பயன்படுத்தப்படும்"</string>
     <string name="usage" msgid="2977875522080448986">"பயன்பாடு"</string>
@@ -4092,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"தன்னிரப்பிச் சேவை"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"தானாக, நிரப்பு, தானாக நிரப்பு, தன்னிரப்பி"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;இந்தப் பயன்பாட்டை நம்புகிறீர்கள் என்பதை உறுதிப்படுத்திக்கொள்ளவும்&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; உங்கள் திரையில் இருப்பதைப் பயன்படுத்தி, எவற்றையெல்லாம் தன்னிரப்ப முடியும் என்பதைத் தீர்மானிக்கும்."</string>
-    <string name="device_theme" msgid="4571803018917608588">"சாதனத்தின் தீம்"</string>
+    <string name="color_theme" msgid="1535685696756738324">"கலர் தீம்"</string>
     <string name="default_theme" msgid="7085644992078579076">"இயல்பு"</string>
+    <string name="device_theme" msgid="4571803018917608588">"சாதனத்தின் தீம்"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"தானியங்கு தீம் (வால்பேப்பர் அடிப்படையில்)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"லைட்"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"டார்க்"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"நெட்வொர்க் பெயர்"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"நிலைப் பட்டியில் நெட்வொர்க் பெயரைக் காட்டு"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"சேமிப்பக நிர்வாகி: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4105,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Carrier Provisioning Info"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Carrier Provisioning"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"தொந்தரவு செய்ய வேண்டாம் அமைப்பைப் புதுப்பிக்கவும்"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"கவனம் தவறாமல் இருக்க, அறிவிப்புகளை மறைக்கவும்"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"கவனம் சிதறாமல் இருக்க, அறிவிப்புகளை இடைநிறுத்தவும்"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"புதியதாகவும் உற்சாகமூட்டும் விதமாகவும் என்ன உள்ளது?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"உங்கள் புதிய மொபைலைப் பற்றி அறிக"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"உங்கள் புதிய டேப்லெட்டைப் பற்றி அறிக"</string>
diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml
index aea1c8b..09dcb2d 100644
--- a/res/values-te/arrays.xml
+++ b/res/values-te/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"ఎల్లప్పుడూ ఆన్ చేయి"</item>
     <item msgid="6385301106124765323">"ఎల్లప్పుడూ ఆఫ్‌ చేయి"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 9563d61..5056e7d 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"సమీపంలోని బ్లూటూత్ పరికరాలతో కమ్యూనికేట్ చేయడం కోసం మీ టాబ్లెట్‌ని అనుమతించండి"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"సమీపంలోని బ్లూటూత్ పరికరాలతో కమ్యూనికేట్ చేయడం కోసం మీ పరికరాన్ని అనుమతించండి"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"సమీపంలోని బ్లూటూత్ పరికరాలతో కమ్యూనికేట్ చేయడం కోసం మీ ఫోన్‌ని అనుమతించండి"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"బ్లూటూత్ A2DP హార్డ్‌వేర్ ఆఫ్‌లోడ్‌ని నిలిపివేయి"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"పరికరాన్ని మళ్లీ ప్రారంభించాలా?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"మీరు ఈ సెట్టింగ్‌ను మార్చడానికి మీ పరికరాన్ని మళ్లీ ప్రారంభించాలి."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"మళ్లీ ప్రారంభించు"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"రద్దు చేయి"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"అందుబాటులో ఉన్న మీడియా పరికరాలు"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"అందుబాటులో ఉన్న కాల్ పరికరాలు"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"ప్రస్తుతం కనెక్ట్ చేయబడింది"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"కనెక్షన్ ప్రాధాన్యతలు"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"మునుపు కనెక్ట్ చేసిన పరికరాలు"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"ఇంతకు మునుపు కనెక్ట్ చేయబడినవి"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"తేదీ &amp; సమయం"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"సమయ మండలిని ఎంచుకోండి"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"మీరు టైప్ చేసిన పోర్ట్ చెల్లదు."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP ప్రాక్సీని బ్రౌజరే ఉపయోగిస్తుంది, ఇతర అనువర్తనాల ఉపయోగించకపోవచ్చు."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL బ్యాండ్‌విడ్త్ (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL బ్యాండ్‌విడ్త్ (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"సెల్ స్థాన సమాచారం (నిలిపివేయబడింది):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"సమీప సెల్ సమాచారం (నిలిపివేయబడింది):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE భౌతిక ఛానెల్ కాన్ఫిగరేషన్:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"సెల్ సమాచార రిఫ్రెష్ సగటు:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"మొత్తం సెల్ పరిమాణ సమాచారం:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"డేటా కనెక్షన్ నిజ-సమయ సమాచారం:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"డేటా సేవ:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"రోమింగ్:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1007,16 +1015,11 @@
     <string name="emergency_address_title" msgid="932729250447887545">"అత్యవసర చిరునామా"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Wi-Fi ద్వారా అత్యవసర కాల్ చేసినప్పుడు మీ స్థానాన్ని ఉపయోగించబడుతుంది"</string>
     <string name="private_dns_help_message" msgid="3299567069152568958">"ప్రైవేట్ DNS ఫీచర్‌ల గురించి "<annotation id="url">"మరింత తెలుసుకోండి"</annotation></string>
-    <!-- no translation found for wifi_calling_pref_managed_by_carrier (6845711858866828986) -->
-    <skip />
-    <!-- no translation found for wifi_calling_settings_activation_instructions (7492509632478260955) -->
-    <skip />
-    <!-- no translation found for wifi_calling_turn_on (1171403510313983983) -->
-    <skip />
-    <!-- no translation found for wifi_calling_not_supported (7878640438907807754) -->
-    <skip />
-    <!-- no translation found for carrier (5264014738689761132) -->
-    <skip />
+    <string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"క్యారియర్ ద్వారా నిర్వహించబడుతున్న సెట్టింగ్"</string>
+    <string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Wi-Fi కాలింగ్‌ను సక్రియం చేయండి"</string>
+    <string name="wifi_calling_turn_on" msgid="1171403510313983983">"Wi-Fi కాలింగ్‌ను ఆన్ చేయండి"</string>
+    <string name="wifi_calling_not_supported" msgid="7878640438907807754">"%1$sలో Wi‑Fi కాలింగ్‌కు మద్దతు లేదు"</string>
+    <string name="carrier" msgid="5264014738689761132">"క్యారియర్"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ప్రదర్శన"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ధ్వని"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"వాల్యూమ్‌లు"</string>
@@ -1151,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"స్వయంచాలక ప్రకాశం"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"సక్రియం చేయడానికి వేళ్లను తీసివేయండి"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"యాంబియంట్ డిస్‌ప్లే"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"ఎల్లప్పుడూ ఆన్‌లో ఉంచు / బ్యాటరీ వినియోగం పెరుగుతుంది"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"కొత్త నోటిఫికేషన్‌లు"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ఎప్పుడు చూపాలి"</string>
     <string name="doze_title" msgid="2375510714460456687">"కొత్త నోటిఫికేషన్‌లు"</string>
     <string name="doze_summary" msgid="3846219936142814032">"మీరు నోటిఫికేషన్‌లను స్వీకరించినప్పుడు స్క్రీన్‌ను యాక్టివేట్ చేస్తుంది"</string>
@@ -1197,8 +1198,6 @@
       <item quantity="one">SIM పిన్ కోడ్ చెల్లదు, మీరు మీ డివైజ్‌ను అన్‌లాక్ చేయడానికి తప్పనిసరిగా మీ క్యారియర్‌ను సంప్రదించడానికి ముందు మీకు <xliff:g id="NUMBER_0">%d</xliff:g> ప్రయత్నం మిగిలి ఉంది.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"సిమ్ పిన్ చర్య విఫలమైంది!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"టాబ్లెట్ స్థితి"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"ఫోన్ స్థితి"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"సిస్టమ్ అప్‌డేట్‌లు"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android వెర్షన్"</string>
@@ -2119,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"నేపథ్య వినియోగం పరిమితం చేయబడదు"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"నేపథ్య కార్యకలాపాన్ని పరిమితం చేయాలా?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"మీరు యాప్ నేపథ్య కార్యకలాపాన్ని పరిమితం చేస్తే, అది సరిగ్గా పని చేయకపోవచ్చు."</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"ఈ యాప్ బ్యాటరీని ఆప్టిమైజ్ చేయికి సెట్ చేయబడలేదు కనుక, దీన్ని మీరు పరిమితం చేయలేరు.\n\nయాప్‌ను పరిమితం చేయడానికి, మొదట బ్యాటరీ ఆప్టిమైజేషన్‌ను ఆన్ చేయండి."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"పూర్తిగా ఛార్జ్ చేసినప్పటి నుండి స్క్రీన్ వినియోగం"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"స్క్రీన్ ఉపయోగం"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"మొబైల్ నెట్‌వర్క్ స్కానింగ్"</string>
@@ -2440,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"అత్యవసర డయలింగ్ సిగ్నల్"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"అత్యవసర కాల్ వచ్చినప్పుడు చేయాల్సిన విధిని సెట్ చేయండి"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"బ్యాకప్"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"ఆన్‌లో ఉంది"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"ఆఫ్‌లో ఉంది"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"బ్యాకప్ &amp; పునరుద్ధరణ"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"వ్యక్తిగత డేటా"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"నా డేటాను బ్యాకప్ చేయి"</string>
@@ -2766,6 +2766,12 @@
       <item quantity="one">ప్రమాణపత్రాన్ని తనిఖీ చేయి</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"బహుళ వినియోగదారులు"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"వినియోగదారులు &amp; ప్రొఫైల్‌లు"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"వినియోగదారు లేదా ప్రొఫైల్‌ను జోడించు"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"వినియోగదారును జోడించు"</string>
@@ -2948,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"డేటా వినియోగం"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"హాట్‌స్పాట్"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"కనెక్ట్ చేసిన పరికరాలు"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"బ్లూటూత్, డ్రైవింగ్ మోడ్, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"బ్లూటూత్, డ్రైవింగ్ మోడ్"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"బ్లూటూత్, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"బ్లూటూత్"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"యాప్‌లు &amp; నోటిఫికేషన్‌లు"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"అనుమతులు, డిఫాల్ట్ యాప్‌లు"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"ఖాతాలు"</string>
@@ -2972,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"లాంచర్, డిఫాల్ట్, యాప్‌లు"</string>
     <string name="keywords_display" msgid="8910345814565493016">"స్క్రీన్, టచ్‌స్క్రీన్"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"స్క్రీన్ ప్రకాశాన్ని తగ్గించు, టచ్‌స్క్రీన్, బ్యాటరీ, ప్రకాశవంతం"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"కాంతివిహీన స్క్రీన్, టచ్‌స్క్రీన్, బ్యాటరీ"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"స్క్రీన్ ప్రకాశాన్ని తగ్గించు, రాత్రి, వంచు, రాత్రి షిఫ్ట్, ప్రకాశవంతం, స్క్రీన్ రంగు, రంగు"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"నేపథ్యం, వ్యక్తిగతీకరించు, డిస్‌ప్లేని అనుకూలీకరించు"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"వచన పరిమాణం"</string>
@@ -3013,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"నెట్‌వర్క్, మొబైల్ నెట్‌వర్క్ స్థితి, సేవ స్థితి, సిగ్నల్ సామర్థ్యం, మొబైల్ నెట్‌వర్క్ రకం, రోమింగ్, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"క్రమ సంఖ్య, హార్డ్‌వేర్ వెర్షన్"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android భద్రతా అతికింపు స్థాయి, బేస్‌బ్యాండ్ వెర్షన్, కెర్నెల్ వెర్షన్"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"విస్తార ప్రదర్శన, లాక్ స్క్రీన్ ప్రదర్శన"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"వేలిముద్ర"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"తిప్పండి, తిప్పు, పరిభ్రమణం, పోర్ట్రెయిట్, ల్యాండ్‌స్కేప్, ఓరియంటేషన్, నిలువు, అడ్డం"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"అప్‌గ్రేడ్, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, షెడ్యూల్, నోటిఫికేషన్‌లు, బ్లాక్ చేయి, నిశ్శబ్దం, వైబ్రేట్, స్లీప్, కార్యాలయం, దృష్టి సారించడం, ధ్వని, మ్యూట్, రోజు, వారంలో రోజు, వారాంతం, వారంలో రాత్రి, ఈవెంట్"</string>
@@ -3097,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"దృశ్యమానత సంకేతాలను అనుమతించండి"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"అంతరాయం కలిగించవద్దు అనే ఎంపిక ఆన్‌లో ఉన్నప్పుడు"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"నోటిఫికేషన్‌లు"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"నోటిఫికేషన్‌లను శబ్దం లేకుండా చూపు"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"నోటిఫికేషన్‌లు మ్యూట్ చేయబడతాయి"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"నోటిఫికేషన్‌ల నుండి శబ్దం లేదు"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"మీ స్క్రీన్‌పై మీకు నోటిఫికేషన్‌లు కనిపిస్తాయి"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"నోటిఫికేషన్‌లు వచ్చినప్పుడు మీ ఫోన్ శబ్దం చేయదు లేదా వైబ్రేషన్ అవదు"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"నోటిఫికేషన్‌లను దాచు"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"మీరు కొత్త లేదా ఇప్పటికే ఉన్న నోటిఫికేషన్‌లను చూడలేరు"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"నోటిఫికేషన్‌ల నుండి దృశ్య జాబితాలు లేదా శబ్దం లేవు"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"మీరు నోటిఫికేషన్‌లను చూడలేరు లేదా వినలేరు"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"మీ ఫోన్, కొత్త లేదా ఇప్పటికే ఉన్న నోటిఫికేషన్‌లను చూపదు మరియు శబ్దం చేయదు లేదా వైబ్రేట్ అవదు. మీ స్క్రీన్ ఎగువ నుండి మీరు దిగువకు స్వైప్ చేసినప్పుడు నోటిఫికేషన్‌లు కనిపించవు. \n\nఫోన్ కార్యకలాపం మరియు స్థితికి సంబంధించిన క్లిష్టమైన నోటిఫికేషన్‌లు ఇప్పటికీ కనిపిస్తాయి అని గుర్తుంచుకోండి."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"అనుకూలం"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"అనుకూల సెట్టింగ్‌ని ప్రారంభించండి"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"అనుకూల సెట్టింగ్‌ని తీసివేయండి"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"కనిపిస్తుంది"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"నోటిఫికేషన్‌ల నుండి శబ్దం లేదు"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"పాక్షికంగా దాచబడింది"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"దాచబడింది"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"నోటిఫికేషన్‌ల నుండి దృశ్య జాబితాలు లేదా శబ్దం లేవు"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"అనుకూల పరిమితులు"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"స్క్రీన్ ఆన్‌లో ఉన్నప్పుడు"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"స్క్రీన్ ఆఫ్‌లో ఉన్నప్పుడు"</string>
@@ -3167,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"మ్యూట్ చేయబడింది, కాని <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> మరియు <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>ను అనుమతించు"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"సందేశాలు, ఈవెంట్‌లు &amp; రిమైండర్‌లు"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"అంఅంతరాయం కలిగించవద్దు ఆన్‌లో ఉన్నప్పుడు, మీరు పైన అనుమతించే అంశాలు మినహా, సందేశాలు, రిమైండర్‌లు మరియు ఈవెంట్‌లు మ్యూట్ చేయబడతాయి. మీ స్నేహితులు, కుటుంబం లేదా ఇతర పరిచయాలు మిమ్మల్ని చేరుకోవడానికి అనుమతించడానికి సందేశాలు అమర్పులను మీరు సర్దుబాటు చేయవచ్చు."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"పూర్తయింది"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"సెట్టింగ్‌లు"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"నోటిఫికేషన్‌ల నుండి దృశ్య జాబితాలు లేదా శబ్దం లేవు"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"నోటిఫికేషన్‌ల నుండి శబ్దం లేదు"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"మీరు నోటిఫికేషన్‌లను చూడలేరు లేదా వినలేరు. నక్షత్రం గుర్తు ఉన్న పరిచయాల మరియు రిపీట్ కాలర్‌‌ల నుండి కాల్‌లు అనుమతించబడతాయి."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(ప్రస్తుత సెట్టింగ్)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"అంతరాయం కలిగించవద్దు నోటిఫికేషన్‌ సెట్టింగ్‌లను మార్చాలా?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"కార్యాలయ ప్రొఫైల్ శబ్దాలు"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"వ్యక్తిగత ప్రొఫైల్ శబ్దాలు ఉంచు"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"కార్యాలయ మరియు వ్యక్తిగత ప్రొఫైల్‌లకు ఒకే ధ్వనులు ఉపయోగించబడతాయి"</string>
@@ -3348,17 +3347,12 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> నుండి <xliff:g id="END">%2$s</xliff:g> వరకు"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"కాల్‌లు"</string>
-    <!-- no translation found for zen_mode_calls_title (623395033931747661) -->
-    <skip />
+    <string name="zen_mode_calls_title" msgid="623395033931747661">"కాల్‌లను అనుమతించండి"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"అంఅంతరాయం కలిగించవద్దు ఆన్‌లో ఉన్నప్పుడు, ఇన్‌కమింగ్ కాల్‌లు బ్లాక్ చేయబడతాయి. మీ స్నేహితులు, కుటుంబం లేదా ఇతర పరిచయాలు మిమ్మల్ని చేరుకునేందుకు అనుమతించడానికి మీరు సెట్టింగ్‌లను సర్దుబాటు చేయవచ్చు."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"నక్షత్రం గుర్తు ఉన్న పరిచయాలు"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">మరియు <xliff:g id="NUM_PEOPLE">%d</xliff:g> ఇతర వ్యక్తులు</item>
-      <item quantity="one">మరియు 1 ఇతర వ్యక్తి</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"సందేశాలు"</string>
-    <!-- no translation found for zen_mode_messages_title (7729380010396411129) -->
-    <skip />
+    <string name="zen_mode_messages_title" msgid="7729380010396411129">"సందేశాలను అనుమతించు"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"సందేశాలు"</string>
     <string name="zen_mode_selected_messages" msgid="1047355526202106114">"కొన్ని సందేశాలు"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"ఎవరి నుండైనా"</string>
@@ -3372,19 +3366,15 @@
     <string name="zen_mode_media" msgid="8808264142134422380">"మీడియా"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"తాకినప్పుడు ధ్వనులు"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"రిమైండర్‌లు"</string>
-    <!-- no translation found for zen_mode_reminders_title (2345044406347406902) -->
-    <skip />
+    <string name="zen_mode_reminders_title" msgid="2345044406347406902">"రిమైండర్‌లను అనుమతించు"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ఈవెంట్‌లు"</string>
-    <!-- no translation found for zen_mode_events_title (5597241655883329085) -->
-    <skip />
+    <string name="zen_mode_events_title" msgid="5597241655883329085">"ఈవెంట్‌లను అనుమతించు"</string>
     <string name="zen_mode_all_callers" msgid="2378065871253871057">"ఎవరైనా"</string>
     <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"పరిచయాలు"</string>
     <string name="zen_mode_starred_callers" msgid="1023167821338514140">"నక్షత్రం గుర్తు ఉన్న పరిచయాలు"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"పునరావృత కాలర్‌లను అనుమతించు"</string>
-    <!-- no translation found for zen_mode_repeat_callers_title (8553876328249671783) -->
-    <skip />
-    <!-- no translation found for zen_mode_calls_summary_one (3972333792749874863) -->
-    <skip />
+    <string name="zen_mode_repeat_callers_title" msgid="8553876328249671783">"పునరావృత కాలర్‌లను అనుమతించు"</string>
+    <string name="zen_mode_calls_summary_one" msgid="3972333792749874863">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> నుండి"</string>
     <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> మరియు <xliff:g id="CALLERT_TPYE">%2$s</xliff:g> నుండి మాత్రమే"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"<xliff:g id="MINUTES">%d</xliff:g> నిమిషాల వ్యవధిలో అదే వ్యక్తి రెండో సారి కాల్ చేస్తే"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"అనుకూలం"</string>
@@ -3791,10 +3781,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"ప్రశాంత వర్ణము ఉష్ణోగ్రత"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ప్రశాంత భావనను కలిగించే ప్రదర్శన రంగులను ఉపయోగిస్తుంది"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"రంగు మార్పును వర్తింపజేయడానికి, స్క్రీన్‌ను ఆఫ్ చేయండి"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"కనెక్టివిటీ మానిటర్"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"కనెక్టివిటీ మానిటర్ కనెక్టివిటీ సమస్యను గుర్తించినప్పుడు లాగ్‌లను సేకరిస్తుంది మరియు ఒక బగ్‌ను ఫైల్ చేయడానికి వినియోగదారుకి నోటిఫికేషన్‌ను ప్రాంప్ట్ చేస్తుంది"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"కనెక్టివిటీ మానిటర్ మార్పును వర్తింపజేయాలంటే, పరికరాన్ని రీబూట్ చేయండి"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"కెమెరా లేజర్ సెన్సార్"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"డిఫాల్ట్‌గా లాజికల్ కెమెరా"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ఆటోమేటిక్ సిస్టమ్ అప్‌డేట్‌లు"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"పరికరం పునఃప్రారంభమైనప్పుడు అప్‌డేట్‌లను వర్తింపజేయండి"</string>
     <string name="usage" msgid="2977875522080448986">"వినియోగం"</string>
@@ -4104,8 +4092,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"స్వీయ పూరింపు సేవ"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"స్వయంచాలకం, పూరించు, స్వీయ పూరింపు"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;ఈ యాప్‌ను మీరు విశ్వసిస్తున్నట్లు నిర్ధారించండి&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; మీ స్క్రీన్‌పై ఉన్నవాటిని పరిగణనలోకి తీసుకొని వేటిని ఆటోమేటిక్‌గా పూరించాలో నిశ్చయిస్తుంది."</string>
-    <string name="device_theme" msgid="4571803018917608588">"పరికర థీమ్"</string>
+    <string name="color_theme" msgid="1535685696756738324">"రంగు థీమ్"</string>
     <string name="default_theme" msgid="7085644992078579076">"డిఫాల్ట్"</string>
+    <string name="device_theme" msgid="4571803018917608588">"పరికర థీమ్"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"ఆటోమేటిక్ (వాల్‌పేపర్ ఆధారంగా)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"లేత రంగు"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"ముదురు రంగు"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"నెట్‌వర్క్ పేరు"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"స్థితి పట్టీలో నెట్‌వర్క్ పేరును ప్రదర్శిస్తుంది"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"నిల్వ నిర్వాహికి: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4117,7 +4109,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"క్యారియర్ కేటాయింపు సమాచారం"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"క్యారియర్ కేటాయింపు సక్రియం చేయండి"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"అంతరాయం కలిగించవద్దును అప్‌డేట్ చేయి"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"ఇతర వ్యాపకాలపై దృష్టి మరలకుండా ఉండడానికి నోటిఫికేషన్‌లను దాచు"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"ఇతర వ్యాపకాలపై దృష్టి మరలకుండా ఉండడానికి నోటిఫికేషన్‌లను పాజ్ చేయండి"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"కొత్తవి మరియు అద్భుతమైనవి ఏమిటి?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"మీ కొత్త ఫోన్ గురించి తెలుసుకోండి"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"మీ కొత్త టాబ్లెట్ గురించి తెలుసుకోండి"</string>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index ba0d586..9522f37 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"เปิดอยู่เสมอ"</item>
     <item msgid="6385301106124765323">"ปิดอยู่เสมอ"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 0fd0061..9c6ef28 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"อนุญาตให้แท็บเล็ตสื่อสารกับอุปกรณ์บลูทูธใกล้เคียง"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"อนุญาตให้อุปกรณ์สื่อสารกับอุปกรณ์บลูทูธใกล้เคียง"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"อนุญาตให้โทรศัพท์สื่อสารกับอุปกรณ์บลูทูธใกล้เคียง"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"ปิดใช้การลดภาระฮาร์ดแวร์บลูทูธ A2DP"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"รีสตาร์ทอุปกรณ์ใช่ไหม"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"คุณต้องรีสตาร์ทอุปกรณ์เพื่อเปลี่ยนการตั้งค่านี้"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"รีสตาร์ท"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"ยกเลิก"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"อุปกรณ์สื่อที่ใช้ได้"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"อุปกรณ์สำหรับโทรที่ใช้ได้"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"เชื่อมต่ออยู่"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"ค่ากำหนดการเชื่อมต่อ"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"อุปกรณ์ที่เคยเชื่อมต่อ"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"อุปกรณ์ที่เคยเชื่อมต่อ"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"วันที่และเวลา"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"เลือกเขตเวลา"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"พอร์ตที่คุณพิมพ์ไม่ถูกต้อง"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"พร็อกซี HTTP มีการใช้งานโดยเบราว์เซอร์ แต่อาจไม่มีการใช้งานโดยแอปพลิเคชันอื่น"</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"แบนด์วิดท์ดาวน์โหลด (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"แบนด์วิดท์อัปโหลด (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"ข้อมูลตำแหน่งของเครือข่ายมือถือ (เลิกใช้งานแล้ว):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"ข้อมูลมือถือใกล้เคียง (เลิกใช้งานแล้ว):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"การกำหนดค่าแชนเนลทางกายภาพของ LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"อัตราการรีเฟรชข้อมูลมือถือ:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"ข้อมูลการวัดเครือข่ายมือถือทั้งหมด:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"รายละเอียดการเชื่อมต่ออินเทอร์เน็ตแบบเรียลไทม์:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"บริการข้อมูล:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"โรมมิ่ง:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"ปรับความสว่างอัตโนมัติ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"ยกขึ้นเพื่อเวก"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"หน้าจอแอมเบียนท์"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"เปิดเสมอ/ใช้แบตเตอรี่เพิ่มขึ้น"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"การแจ้งเตือนใหม่"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"แสดงเมื่อใด"</string>
     <string name="doze_title" msgid="2375510714460456687">"การแจ้งเตือนใหม่"</string>
     <string name="doze_summary" msgid="3846219936142814032">"เปิดหน้าจอเมื่อได้รับการแจ้งเตือน"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">รหัส PIN ของซิมไม่ถูกต้อง คุณพยายามได้อีก <xliff:g id="NUMBER_0">%d</xliff:g> ครั้งก่อนที่จะต้องติดต่อผู้ให้บริการเพื่อปลดล็อกอุปกรณ์</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"การปลดล็อกด้วย PIN ของซิมล้มเหลว!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"สถานะแท็บเล็ต"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"สถานะโทรศัพท์"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"การอัปเดตระบบ"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"เวอร์ชันของ Android"</string>
@@ -1440,7 +1444,7 @@
     <string name="menu_delete" msgid="6981294422841124659">"ลบ APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN ใหม่"</string>
     <string name="menu_save" msgid="8109345640668285399">"บันทึก"</string>
-    <string name="menu_cancel" msgid="2194502410474697474">"ยกเลิก"</string>
+    <string name="menu_cancel" msgid="2194502410474697474">"ทิ้ง"</string>
     <string name="error_title" msgid="7631322303341024692"></string>
     <string name="error_name_empty" msgid="5508155943840201232">"ต้องใส่ข้อมูลในช่องชื่อ"</string>
     <string name="error_apn_empty" msgid="4932211013600863642">"ต้องใส่ข้อมูล APN"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"จำกัดการใช้งานในพื้นหลังไม่ได้"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"จำกัดกิจกรรมในพื้นหลังใช่ไหม"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"แอปอาจทำงานผิดพลาดหากคุณจำกัดกิจกรรมในพื้นหลัง"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"เนื่องจากแอปนี้ไม่ได้ตั้งค่าให้เพิ่มประสิทธิภาพแบตเตอรี่ คุณจึงจำกัดการใช้งานไม่ได้\n\nหากต้องการจำกัด ให้เปิดการเพิ่มประสิทธิภาพแบตเตอรี่ก่อน"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"การใช้งานหน้าจอตั้งแต่ชาร์จจนเต็ม"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"การใช้งานหน้าจอ"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"การสแกนเครือข่ายมือถือ"</string>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"สัญญาณการโทรฉุกเฉิน"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"ตั้งค่าการทำงานเมื่อมีการโทรหาหมายเลขฉุกเฉิน"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"การสำรองข้อมูล"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"เปิด"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"ปิด"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"การสำรองและคืนค่าข้อมูล"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"ข้อมูลส่วนตัว"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"สำรองข้อมูลของฉัน"</string>
@@ -2761,6 +2766,12 @@
       <item quantity="one">ตรวจสอบใบรับรอง</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"ผู้ใช้หลายคน"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"ผู้ใช้และโปรไฟล์"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"เพิ่มผู้ใช้หรือโปรไฟล์"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"เพิ่มผู้ใช้"</string>
@@ -2943,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ปริมาณการใช้อินเทอร์เน็ต"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"ฮอตสปอต"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"อุปกรณ์ที่เชื่อมต่อ"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"บลูทูธ, โหมดขับรถ, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"บลูทูธ, โหมดขับรถ"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"บลูทูธ, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"บลูทูธ"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"แอปและการแจ้งเตือน"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"สิทธิ์ แอปเริ่มต้น"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"บัญชี"</string>
@@ -2967,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"launcher, ค่าเริ่มต้น, แอป"</string>
     <string name="keywords_display" msgid="8910345814565493016">"หน้าจอ, หน้าจอสัมผัส"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"หน้าจอสลัว, หน้าจอสัมผัส, แบตเตอรี่, ความสว่าง"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"หน้าจอสลัว, หน้าจอสัมผัส, แบตเตอรี่"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"หน้าจอสลัว, กลางคืน, สีอ่อน, ช่วงกลางคืน, ความสว่าง, สีของหน้าจอ, สี, สีสัน"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"พื้นหลัง, ปรับเปลี่ยนในแบบของคุณ, ปรับแต่งการแสดงผล"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ขนาดข้อความ"</string>
@@ -3008,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"เครือข่าย, สถานะเครือข่ายมือถือ, สถานะบริการ, ความแรงของสัญญาณ, ประเภทเครือข่ายมือถือ, โรมมิ่ง, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"หมายเลขซีเรียล, เวอร์ชันฮาร์ดแวร์"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"ระดับแพตช์ความปลอดภัย android, เวอร์ชันเบสแบนด์, เวอร์ชันเคอร์เนล"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"หน้าจอแอมเบียนท์ หน้าจอล็อก"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"ลายนิ้วมือ"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"หมุน, พลิก, การหมุน, แนวตั้ง, แนวนอน, การวางแนว, ตั้ง, นอน"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"อัปเกรด, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, ตั้งเวลา, การแจ้งเตือน, บล็อก, เงียบ, สั่น, สลีป, ทำงาน, โฟกัส, เสียง, ปิดเสียง, วัน, วันทำการ, วันหยุดสุดสัปดาห์, คืนวันทำการ, กิจกรรม"</string>
@@ -3092,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"อนุญาตสัญญาณที่มองเห็น"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"เมื่อเปิด \"ห้ามรบกวน\""</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"การแจ้งเตือน"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"แสดงการแจ้งเตือนโดยไม่ส่งเสียง"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"การแจ้งเตือนจะถูกปิดเสียง"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"ไม่มีเสียงจากการแจ้งเตือน"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"คุณจะเห็นการแจ้งเตือนในหน้าจอ"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"เมื่อมีการแจ้งเตือนเข้ามา โทรศัพท์จะไม่ส่งเสียงหรือสั่น"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"ซ่อนการแจ้งเตือน"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"คุณจะไม่เห็นการแจ้งเตือนใหม่หรือการแจ้งเตือนที่มีอยู่"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"ไม่มีภาพหรือเสียงจากการแจ้งเตือน"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"คุณจะไม่เห็นหรือได้ยินเสียงการแจ้งเตือน"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"โทรศัพท์จะไม่แสดงการแจ้งเตือนใหม่หรือการแจ้งเตือนที่มีอยู่รวมถึงไม่ส่งเสียงหรือสั่น การแจ้งเตือนจะไม่ปรากฏขึ้นเมื่อคุณเลื่อนลงจากด้านบนของหน้าจอ\n\nแต่การแจ้งเตือนที่สำคัญสำหรับกิจกรรมและสถานะของโทรศัพท์จะยังคงแสดงขึ้น"</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"กำหนดเอง"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"เปิดใช้การตั้งค่าที่กำหนดเอง"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"นำการตั้งค่าที่กำหนดเองออก"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"จะปรากฏขึ้นมา"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"ไม่มีเสียงจากการแจ้งเตือน"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"ซ่อนบางส่วน"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"ซ่อน"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"ไม่มีภาพหรือเสียงจากการแจ้งเตือน"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"การจำกัดที่กำหนดเอง"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"เมื่อหน้าจอเปิดอยู่"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"เมื่อหน้าจอปิดอยู่"</string>
@@ -3162,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"ปิดเสียงแล้ว แต่อนุญาตให้ <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> และ <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"ข้อความ เหตุการณ์ และการช่วยเตือน"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"เมื่อเปิด \"ห้ามรบกวน\" ข้อความ การช่วยเตือน และเหตุการณ์ต่างๆ จะถูกปิดเสียงยกเว้นรายการที่คุณอนุญาตข้างต้น คุณปรับเปลี่ยนการตั้งค่าเพื่ออนุญาตให้เพื่อน ครอบครัว หรือรายชื่อติดต่อคนอื่นๆ ติดต่อคุณได้"</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"เสร็จ"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"การตั้งค่า"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"ไม่มีภาพหรือเสียงจากการแจ้งเตือน"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"ไม่มีเสียงจากการแจ้งเตือน"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"คุณจะไม่เห็นหรือยินเสียงการแจ้งเตือน อนุญาตการโทรจากรายชื่อติดต่อที่ติดดาวและผู้โทรซ้ำ"</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(การตั้งค่าปัจจุบัน)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"เปลี่ยนการตั้งค่าการแจ้งเตือนห้ามรบกวนไหม"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"เสียงในโปรไฟล์งาน"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"ใช้เสียงในโปรไฟล์ส่วนตัว"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"เสียงในโปรไฟล์งานและโปรไฟล์ส่วนตัวเหมือนกัน"</string>
@@ -3346,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"อนุญาตการโทร"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"เมื่อเปิด \"ห้ามรบกวน\" สายเรียกเข้าจะถูกบล็อก คุณปรับเปลี่ยนการตั้งค่าเพื่ออนุญาตให้เพื่อน ครอบครัว หรือรายชื่อติดต่อคนอื่นๆ ติดต่อคุณได้"</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"รายชื่อติดต่อที่ติดดาว"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">และอีก <xliff:g id="NUM_PEOPLE">%d</xliff:g> รายการ</item>
-      <item quantity="one">และอีก 1 รายการ</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"ข้อความ"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"อนุญาตข้อความ"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"ข้อความ"</string>
@@ -3779,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"อุณหภูมิสีเย็น"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ใช้สีแสดงผลที่เย็นกว่านี้"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"หากต้องการใช้การเปลี่ยนสี ให้ปิดหน้าจอ"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"การตรวจสอบการเชื่อมต่อ"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"การตรวจสอบการเชื่อมต่อจะรวบรวมบันทึกเมื่อตรวจพบปัญหาด้านการเชื่อมต่อและแจ้งเตือนให้ผู้ใช้ส่งข้อบกพร่อง"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"เริ่มต้นอุปกรณ์ใหม่เพื่อให้การเปลี่ยนแปลงการตรวจสอบการเชื่อมต่อมีผล"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"เซ็นเซอร์เลเซอร์ของกล้อง"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Logical Camera เป็นค่าเริ่มต้น"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"การอัปเดตระบบอัตโนมัติ"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"ใช้การอัปเดตเมื่ออุปกรณ์รีสตาร์ท"</string>
     <string name="usage" msgid="2977875522080448986">"การใช้งาน"</string>
@@ -4092,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"บริการป้อนอัตโนมัติ"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"ป้อน, อัตโนมัติ, ป้อนอัตโนมัติ"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;ตรวจดูว่าคุณเชื่อถือแอปนี้ได้&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google ป้อนอัตโนมัติ&gt;%1$s&lt;/xliff:g&gt; ใช้สิ่งที่อยู่บนหน้าจอเพื่อดูว่าจะป้อนข้อมูลใดโดยอัตโนมัติได้บ้าง"</string>
-    <string name="device_theme" msgid="4571803018917608588">"ธีมอุปกรณ์"</string>
+    <string name="color_theme" msgid="1535685696756738324">"ธีมสี"</string>
     <string name="default_theme" msgid="7085644992078579076">"ค่าเริ่มต้น"</string>
+    <string name="device_theme" msgid="4571803018917608588">"ธีมอุปกรณ์"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"อัตโนมัติ (ขึ้นอยู่กับวอลล์เปเปอร์)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"สว่าง"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"มืด"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"ชื่อเครือข่าย"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"แสดงชื่อเครือข่ายในแถบสถานะ"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"ตัวจัดการพื้นที่เก็บข้อมูล: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4105,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"ข้อมูลการจัดสรรผู้ให้บริการ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ทริกเกอร์การจัดสรรผู้ให้บริการ"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"อัปเดตโหมดห้ามรบกวน"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"ซ่อนการแจ้งเตือนเพื่อไม่ให้มีสิ่งรบกวน"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"หยุดการแจ้งเตือนชั่วคราวเพื่อไม่ให้มีสิ่งรบกวน"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"มีอะไรใหม่และน่าสนใจบ้าง"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ทัวร์ชมโทรศัพท์เครื่องใหม่"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ทัวร์ชมแท็บเล็ตเครื่องใหม่"</string>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index c44791d..7ec72be 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Palaging naka-on"</item>
     <item msgid="6385301106124765323">"Palaging naka-off"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 17840ee..0ef0b22 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Pinapayagan ang iyong tablet na makipag-ugnayan sa mga kalapit na Bluetooth device"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Pinapayagan ang iyong device na makipag-ugnayan sa mga kalapit na Bluetooth device"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Pinapayagan ang iyong teleponong makipag-ugnayan sa mga kalapit na Bluetooth device"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"I-disable ang Bluetooth A2DP hardware offload"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"I-restart Ito?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Kailangan mong i-restart ang device para mabago ang setting."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"I-restart"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Kanselahin"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Mga available na media device"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Mga available na call device"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Kasalukuyang nakakonekta"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Mga kagustuhan sa koneksyon"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Mga nakakonektang dating device"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Dating nakakonekta"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Petsa at oras"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Pumili ng time zone"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Hindi wasto ang port na iyong na-type."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Ang HTTP proxy ay ginagamit ng browser ngunit hindi maaaring gamitin ng iba pang apps."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL Bandwidth (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL Bandwidth (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Impormasyon ng Lokasyon ng Cell (hindi na ginagamit):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Impormasyon ng Neighbor Cell (hindi na ginagamit):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Configuration ng LTE Physical Channel:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Rate ng Pag-refresh ng Impormasyon ng Cell:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Impormasyon ng Pagsukat sa Lahat ng Cell:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Real-Time na Impormasyon ng Koneksyon sa Data:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Serbisyo ng Data:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Awtomatikong pagliwanag"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Angatin upang paganahin"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambient na display"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Palaging naka-on / Mas magastos sa baterya"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Mga bagong notification"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kailan ipapakita"</string>
     <string name="doze_title" msgid="2375510714460456687">"Mga bagong notification"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Paganahin ang screen kapag nakatanggap ka ng mga notification"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="other">Maling SIM PIN code, <xliff:g id="NUMBER_1">%d</xliff:g> subok na lang bago ka makipag-ugnayan sa carrier mo upang i-unlock ang device.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Nabigo ang operasyon ng SIM PIN!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Katayuan ng tablet"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Katayuan ng telepono"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Mga pag-update ng system"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Bersyon ng Android"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Hindi maaaring paghigpitan ang paggamit sa background"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Limitahan ang aktibidad sa background?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Kung lilimitahan mo ang aktibidad sa background ng app, maaari itong gumana nang hindi tama"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Hindi nakatakda ang app na mag-optimize ng baterya kaya hindi ito malilimitahan.\n\nPara malimitahan, i-on ang battery optimization."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Paggamit ng screen mula noong napuno ang baterya"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Pagkonsumo ng screen"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Pag-scan ng mobile network"</string>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Signal sa pang-emergency na pag-dial"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Itakda ang pag-uugali kapag naganap ang isang pang-emergency na tawag"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Pag-back Up"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Naka-on"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Naka-off"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"I-backup &amp; ipanumbalik"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personal na data"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"I-back up ang aking data"</string>
@@ -2761,6 +2766,12 @@
       <item quantity="other">Tingnan ang mga certificate</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Maraming user"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Mga user at profile"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Magdagdag ng user o profile"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Magdagdag ng user"</string>
@@ -2943,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"paggamit ng data"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Mga nakakonektang device"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, driving mode, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, driving mode"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Mga app at notification"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Mga pahintulot, mga default na app"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Mga Account"</string>
@@ -2967,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"launcher, default, mga app"</string>
     <string name="keywords_display" msgid="8910345814565493016">"screen, touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"i-dim ang screen, touchscreen, baterya, maliwanag"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"i-dim ang screen, touchscreen, baterya"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"i-dim ang screen, gabi, tint, night shift, brightness, kulay ng screen, kulay, kulay"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"background, i-personalize, i-customize ang display"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"laki ng text"</string>
@@ -3008,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"network, status ng mobile network, status ng serbisyo, lakas ng signal, uri ng mobile network, naka-roaming, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"serial number, bersyon ng hardware"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"antas ng patch ng seguridad ng android, bersyon ng baseband, kernel version"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambient na display, Display ng lock screen"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"fingerprint"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"i-rotate, i-flip, pag-rotate, portrait, landscape, oryentasyon, patayo, pahalang"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"i-upgrade, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, iskedyul, mga notification, i-block, katahimikan, mag-vibrate, sleep, trabaho, i-focus, tunog, i-mute, araw, weekday, weekend, weeknight, event"</string>
@@ -3092,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Payagan ang visual na signal"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Kapag naka-on ang Huwag Istorbohin"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Mga Notification"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Tahimik na ipakita ang mga notification"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Imu-mute ang mga notification"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Walang tunog mula sa mga notification"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Makikita mo ang mga notification sa iyong screen"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Kapag may dumating na mga notification, hindi tutunog o magva-vibrate ang iyong telepono."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Itago ang mga notification"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Hindi mo makikita ang mga bago o dati nang notification"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Walang visual o tunog mula sa mga notification"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Wala kang makikita o maririnig na notification"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Hindi magpapakita ng mga bago o dati nang notification ang iyong telepono, at hindi tutunog o magva-vibrate. Hindi lalabas ang mga notification kapag nag-swipe ka pababa mula sa itaas ng iyong screen.\n\nTandaan, lalabas pa rin ang mahahalagang notification para sa aktibidad at status ng telepono."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Custom"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"I-enable ang custom na setting"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Alisin ang custom na setting"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Lalabas"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Walang tunog mula sa mga notification"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Bahagyang nakatago"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Nakatago"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Walang visual o tunog mula sa mga notification"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Mga custom na paghihigpit"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Kapag naka-on ang screen"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Kapag naka-off ang screen"</string>
@@ -3162,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Naka-mute, pero payagan ang <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>, at <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mga mensahe, event, at paalala"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Kapag naka-on ang Huwag Istorbohin, mamu-mute ang mga mensahe, paalala, at event, maliban sa mga item na pinapayagan mo sa itaas. Maaari mong isaayos ang mga setting ng mensahe para payagan ang iyong mga kaibigan, pamilya, o iba pang contact na makipag-ugnayan sa iyo."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Tapos na"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Mga Setting"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Walang visual o tunog mula sa mga notification"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Walang tunog mula sa mga notification"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Wala kang makikita o maririnig na mga notification. Pinapayagan ang mga tawag mula sa mga naka-star na contact at umuulit na tumatawag."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Kasalukuyang setting)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Baguhin ang mga setting ng notification na Huwag Istorbohin?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Mga tunog sa profile sa trabaho"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Gamitin tunog sa personal na profile"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Pareho ang mga tunog para sa personal na profile at profile sa trabaho"</string>
@@ -3346,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Payagan ang mga tawag"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Kapag naka-on ang Huwag Istorbohin, bina-block ang mga papasok na tawag. Maaari mong isaayos ang mga setting para payagan ang iyong mga kaibigan, pamilya, o iba pang contact na makipag-ugnayan sa iyo."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Mga naka-star na contact"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">at <xliff:g id="NUM_PEOPLE">%d</xliff:g> iba pa</item>
-      <item quantity="other">at <xliff:g id="NUM_PEOPLE">%d</xliff:g> na iba pa</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mga Mensahe"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Payagan ang mga mensahe"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Mga Mensahe"</string>
@@ -3779,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Malamig na temperatura ng kulay"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gumamit ng mas malalamig na kulay ng display"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Upang ilapat ang pagbabago sa kulay, i-off ang screen"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Mangongolekta ang ConnectivityMonitor ng mga log kapag nakatukoy ito ng problema sa koneksyon at magpo-prompt ito ng notification sa user na mag-file ng bug"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Upang ilapat ang pagbabago sa connectivity monitor, i-reboot ang device"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Sensor ng Laser ng Camera"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Logical na Camera Bilang Default"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Mga awtomatikong pag-update ng system"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Ilapat ang mga update kapag nag-restart ang device"</string>
     <string name="usage" msgid="2977875522080448986">"Paggamit"</string>
@@ -4092,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Serbisyo ng autofill"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"awtomatiko, punan, autofill"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Tiyaking pinagkakatiwalaan mo ang app na ito&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; Ginagamit ng &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; ang nasa iyong screen para matukoy kung ano ang pwedeng i-autofill."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Tema ng device"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Tema ng kulay"</string>
     <string name="default_theme" msgid="7085644992078579076">"Default"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Tema ng device"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Awtomatiko (batay sa wallpaper)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Maliwanag"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Madilim"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Pangalan ng network"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Ipakita ang pangalan ng network sa status bar"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Manger ng Storage: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4105,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Impormasyon sa Provisioning ng Carrier"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"I-trigger ang Provisioning ng Carrier"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"I-update ang Huwag Istorbohin"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Itago ang mga notification para manatiling nakatuon ang pansin"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"I-pause ang mga notification para manatiling nakatuon ang pansin"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Ano ang bago at kapana-panabik?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Maglibot sa iyong bagong telepono"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Maglibot sa iyong bagong tablet"</string>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index 66c5012..b3c92e4 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Her zaman açık"</item>
     <item msgid="6385301106124765323">"Her zaman kapalı"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e48cd43..3f1a37b 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Tabletinizin yakındaki Bluetooth cihazlarıyla iletişim kurmasına izin verin"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Cihazınızın yakındaki Bluetooth cihazlarıyla iletişim kurmasına izin verin"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Telefonunuzun yakındaki Bluetooth cihazlarıyla iletişim kurmasına izin verin"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Bluetooth A2DP donanım yükünü devre dışı bırak"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Cihaz Yeniden Başlatılsın mı?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Bu ayarı değiştirmek için cihazınızı yeniden başlatın."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Yeniden başlat"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"İptal"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Kullanılabilir medya cihazları"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Kullanılabilir çağrı cihazları"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Şu anda bağlı"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Bağlantı tercihleri"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Daha önce bağlanılmış cihazlar"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Daha önce bağlanılmış cihazlar"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Tarih ve saat"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Saat dilimini seçin"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Yazdığınız bağlantı noktası geçerli değil."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP proxy, tarayıcı tarafından kullanılır, ancak diğer uygulamalar tarafından kullanılamayabilir."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL\'si: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"İndirme Bant Genişliği (kb/sn.):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Yükleme Bant Genişliği (kb/sn.):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Hücre Konumu Bilgisi (kullanımdan kaldırıldı):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Komşu Hücre Bilgisi (kullanımdan kaldırıldı):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE Fiziksel Kanal Yapılandırması:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Hücre Bilgilerini Yenileme Oranı:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Tüm Hücre Ölçümü Bilgileri:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Veri Bağlantısına İlişkin Gerçek Zamanlı Bilgi:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Veri Hizmeti:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Dolaşım:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Otomatik parlaklık"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Kaldırarak uyandır"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ortam ekranı"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Her zaman açık / Pil kullanımı artar"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Yeni bildirimler"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Ne zaman gösterilecek?"</string>
     <string name="doze_title" msgid="2375510714460456687">"Yeni bildirimler"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Bildirim geldiğinde ekranı uyandır"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">Yanlış SIM PIN kodu. Cihazınızın kilidini açmak için operatörünüzle bağlantı kurmak zorunda kalmadan önce <xliff:g id="NUMBER_0">%d</xliff:g> deneme hakkınız kaldı.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM PIN işlemi başarısız oldu!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tabletin durumu"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefon durumu"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Sistem güncellemeleri"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android sürümü"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Arka plan kullanımı kısıtlanamıyor"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Arka plan etkinliği sınırlansın mı?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Uygulama için arka plan etkinliğini sınırlarsanız hatalı davranabilir"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Uygulama, pili optimize etmek için ayarlanmadığından kısıtlanamaz.\n\nUygulamayı kısıtlamak için önce pil optimizasyonunu açın."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Tam şarj sonrası ekran kullanımı"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Ekranın pil tüketimi"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobil ağ tarama"</string>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Acil durum arama sinyali"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Acil çağrı yapıldığında nasıl işlev göreceğini ayarlayın"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Yedekleme"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Açık"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Kapalı"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Yedekleme ve geri yükleme"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Kişisel veriler"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Verilerimi yedekle"</string>
@@ -2761,6 +2766,12 @@
       <item quantity="one">Sertifikayı kontrol et</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Birden çok kullanıcı"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Kullanıcılar ve Profiller"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Kullanıcı veya profil ekle"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Kullanıcı ekle"</string>
@@ -2943,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"veri kullanımı"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Bağlı cihazlar"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, sürüş modu, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, sürüş modu"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Uygulamalar ve bildirimler"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"İzinler, varsayılan uygulamalar"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Hesaplar"</string>
@@ -2967,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"başlatıcı, varsayılan, uygulamalar"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ekran, dokunmatik ekran"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"ekranı karartma, dokunmatik ekran, pil, parlak"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"ekranı karartma, dokunmatik ekran, pil"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"ekran karartma, gece, renk tonu, gece tonu, parlaklık, ekran rengi, renk, renkli"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"arka plan, kişiselleştirme, ekranı özelleştirme"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"metin boyutu"</string>
@@ -3008,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"ağ, mobil ağ durumu, hizmet durumu, sinyal gücü, mobil ağ türü, dolaşım, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"seri numarası, donanım sürümü"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android güvenlik yaması düzeyi, ana bant sürümü, çekirdek sürümü"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ekran ambiyansı, Ekran kilidi ekranı"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"dijital parmak izi"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"döndür, çevir, döndürme, portre, manzara, yön, dikey, yatay"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"yeni sürüme geçme, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, zamanlama, bildirimler, engelleme, sessiz, titreşim, uyku, çalışma, odak, ses, sesi kapatma, gün, hafta içi, hafta sonu, hafta içi gece, etkinlik"</string>
@@ -3092,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Görsel sinyallere izin ver"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Rahatsız etmeyin ayarı açık olduğunda"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Bildirimler"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Bildirimleri sessizce göster"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Bildirimlerin sesi kapatılır"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Bildirimlerden sesli uyarı yok"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Bildirimleri ekranınızda göreceksiniz"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Bildirim geldiğinde telefonunuz ses çıkartmaz veya titreşmez."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Bildirimleri gizle"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Yeni veya mevcut bildirimleri görmezsiniz"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Bildirimlerden görsel veya ses yok"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Bildirimleri görmeyecek ve duymayacaksınız"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Telefonunuz yeni veya mevcut bildirimleri göstermez, ses çıkartmaz ve titreşmez. Parmağınızı ekranınızın üst kısmından aşağı doğru kaydırdığınızda bildirimler görünmez.\n\nTelefon işlemleri ve durumu ile ilgili önemli bildirimlerin gösterilmeye devam edeceğini unutmayın."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Özel"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Özel ayarı etkinleştir"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Özel ayarı kaldır"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Görünür"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Bildirimlerden sesli uyarı yok"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Kısmen gizli"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Gizli"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Bildirimlerden görsel veya sesli uyarı yok"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Özel kısıtlamalar"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Ekran açıkken"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Ekran kapalıyken"</string>
@@ -3162,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Ses kapatıldı, ancak <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> ve <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> seslerine izin ver"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Mesajlar, etkinlikler ve hatırlatıcılar"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Rahatsız Etmeyin ayarı açık olduğunda mesajların, hatırlatıcıların ve etkinliklerin sesi kapatılır (yukarıda izin verdiğiniz öğeler hariç). Mesaj ayarlarını arkadaşlarınızın, ailenizin veya diğer kişilerin size ulaşmasına izin verecek şekilde düzenleyebilirsiniz."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Bitti"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Ayarlar"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Bildirimlerden görsel veya sesli uyarı yok"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Bildirimlerden sesli uyarı yok"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Bildirimleri görmeyecek veya duymayacaksınız. Yıldız işaretli kişilerden ve tekrar arayanlardan gelen aramalara izin verilir."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Geçerli ayar)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Rahatsız Etmeyin bildirim ayarları değiştirilsin mi?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"İş profili sesleri"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Kişi. profil seslerini kullan"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Sesler, iş profili ve kişisel profil için aynıdır"</string>
@@ -3346,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Çağrılara izin ver"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Rahatsız Etmeyin ayarı açık olduğunda gelen aramalar engellenir. Ayarları arkadaşlarınızın, ailenizin veya diğer kişilerin size ulaşmasına izin verecek şekilde düzenleyebilirsiniz."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Yıldızlı kişiler"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">ve <xliff:g id="NUM_PEOPLE">%d</xliff:g> kişi daha</item>
-      <item quantity="one">ve 1 kişi daha</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"İletiler"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Mesajlara izin ver"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Mesajlar"</string>
@@ -3644,7 +3645,7 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Bu uygulama tarafından oluşturulmuş tüm Rahatsız Etmeyin kuralları kaldırılacak."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Optimize etme"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimize et"</string>
-    <string name="ignore_optimizations_on_desc" msgid="3549930955839111652">"Pilinizi daha hızlı tüketebilir. Artık uygulamanın arka planda pil kullanımı kısıtlanmayacak."</string>
+    <string name="ignore_optimizations_on_desc" msgid="3549930955839111652">"Pilinizi daha hızlı tüketebilir. Uygulamanın arka planda pil kullanımı artık kısıtlanmayacak."</string>
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Daha uzun pil ömrü için önerilir"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"<xliff:g id="APP">%s</xliff:g> adlı uygulamaya pil optimizasyonlarını yoksayma izni verilsin mi?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Yok"</string>
@@ -3779,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Soğuk renk sıcaklığı"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Daha soğuk ekran renkleri kullan"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Renk değişikliğini uygulamak için ekranı kapatın"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Bağlantı İzleyiciler:"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"ConnectivityMonitor bağlantı sorunu algıladığında günlükleri toplar ve kullanıcılara bir hata bildiriminde bulunmalarını söyler"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Bağlantı izleyici değişikliğini uygulamak için cihazı yeniden başlatın"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kamera Lazer Sensörü"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Varsayılan Olarak Mantıksal Kamera"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Otomatik sistem güncellemeleri"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Cihaz yeniden başladığında güncellemeleri uygula"</string>
     <string name="usage" msgid="2977875522080448986">"Kullanım"</string>
@@ -4092,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Otomatik doldurma hizmeti"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"otomatik, doldur, otomatik doldur"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Bu uygulamaya güvendiğinizden emin olun&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Otomatik Doldurma&gt;%1$s&lt;/xliff:g&gt; otomatik doldurulabilecek öğeleri belirlemek için ekranınızdaki bilgileri kullanır."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Cihaz teması"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Renk teması"</string>
     <string name="default_theme" msgid="7085644992078579076">"Varsayılan"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Cihaz teması"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Otomatik (duvar kağıdına göre)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Açık"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Koyu"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Ağ adı"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Ağ adını durum çubuğunda göster"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Depolama Yöneticisi: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4105,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operatör Temel Hazırlık Bilgileri"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Tetikleyici Operatör Temel Hazırlığı"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Rahatsız Etmeyin özelliğini güncelleyin"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Konsantrasyonu korumak için bildirimleri gizle"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Konsantrasyonunuzu bozmamak için bildirimleri duraklatın"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Yeni ve heyecan verici neler var?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Yeni telefonunuzu tanıyın"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Yeni tabletinizi tanıyın"</string>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index f7dff25..715bee3 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Завжди ввімкнено"</item>
     <item msgid="6385301106124765323">"Завжди вимкнено"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 3f7b1e0..b1133ea 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -175,6 +175,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Дозвольте планшету обмінюватися даними з пристроями Bluetooth поруч"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Дозвольте пристрою обмінюватися даними з пристроями Bluetooth поруч"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Дозвольте телефону обмінюватися даними з пристроями Bluetooth поруч"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Вимкнути розвантаження Bluetooth A2DP"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Перезапустити?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Щоб змінити це налаштування, перезапустіть пристрій."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Перезапустити"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Скасувати"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Доступні носії"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Доступні пристрої для дзвінків"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Під’єднані пристрої"</string>
@@ -184,6 +189,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Параметри підключення"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Підключені раніше пристрої"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Підключені раніше"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Дата й час"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Вибрати часовий пояс"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -209,11 +216,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Введений порт не дійсний."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Проксі-сервер HTTP використовується веб-переглядачем і не може використовуватися іншими додатками."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"URL-адреса PAC: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Пропускна спроможність DL (Кб/с):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Пропускна спроможність UL (Кб/с):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Геодані телефона (більше не підтримується):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Дані мобільного пристрою поблизу (більше не підтримується):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Конфігурація фізичного каналу LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Частота оновлення даних про мобільний зв’язок:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Усі дані про показники мобільного зв’язку:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Дані про передавання даних у реальному часі:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Мобільний Інтернет:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Роумінг:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1178,8 +1186,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматична яскравість"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Підняти, щоб активувати"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Активація екрана"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Завжди ввімкнено / Підвищене використання заряду"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Нові сповіщення"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Час показу"</string>
     <string name="doze_title" msgid="2375510714460456687">"Нові сповіщення"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Активувати екран, коли надходять сповіщення"</string>
@@ -1226,8 +1232,6 @@
       <item quantity="other">Неправильний PIN-код SIM-карти. У вас залишилося <xliff:g id="NUMBER_1">%d</xliff:g> спроби.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Помилка введення PIN-коду SIM-карти."</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Стан пристрою"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Стан телефона"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Оновлення сист."</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Версія Android"</string>
@@ -2166,8 +2170,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Не можна обмежити споживання заряду у фоновому режимі"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Обмежити фонову активність?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Якщо обмежити фонову активність, додаток може працювати неналежним чином"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Оскільки в додатку не передбачено економію заряду акумулятора, його не можна обмежити.\n\nУвімкніть оптимізацію споживання заряду."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Використання екрана після повного заряджання"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Споживання заряду екраном"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Сканування мобільної мережі"</string>
@@ -2501,6 +2504,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Сигнал екстреного виклику"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Устан. поведінку при розміщ. аварійного виклику"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Резервне копіювання"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Увімкнено"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Вимкнено"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Резервне копіювання та відновлення"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Особисті дані"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Резервне копіювання даних"</string>
@@ -2835,6 +2840,12 @@
       <item quantity="other">Перевірити сертифікати</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Кілька користувачів"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Користувачі та профілі"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Додати користувача чи профіль"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Додати користувача"</string>
@@ -3019,14 +3030,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"використання трафіку"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"точка доступу"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Під’єднані пристрої"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, режим автомобіля, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, режим автомобіля"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Додатки та сповіщення"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Дозволи та додатки за умовчанням"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Облікові записи"</string>
@@ -3043,7 +3050,6 @@
     <string name="keywords_home" msgid="294182527446892659">"панель запуску, за умовчанням, додатки"</string>
     <string name="keywords_display" msgid="8910345814565493016">"екран, сенсорний екран"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"затемнений екран, сенсорний екран, акумулятор, яскравий"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"затемнений екран, сенсорний екран, акумулятор"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"затемнений екран, ніч, відтінок, нічний час, яскравість, колір екрана, колір"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"фон, персоналізувати, налаштувати дисплей"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"розмір шрифту"</string>
@@ -3084,8 +3090,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"мережа, стан мобільної мережі, стан служби, потужність сигналу, тип мобільної мережі, роумінг, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"серійний номер, версія апаратного забезпечення"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"рівень виправлення системи безпеки android, версія каналу зв’язку, версія ядра"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Активний екран, заблокований екран"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"відбиток пальця"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"затемнений екран, сенсорний екран, акумулятор, розумна яскравість, динамічна яскравість"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"обернути, перевернути, обертання, книжкова орієнтація, альбомна орієнтація, орієнтація, вертикально, горизонтально"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"оновлення, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"не турбувати, графік, сповіщення, блокувати, без звуку, вібрація, сон, робота, зосередитися, звук, вимкнути звук, день, будній день, вихідні, будній вечір, подія"</string>
@@ -3170,18 +3179,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Дозволити візуальні сигнали"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Коли ввімкнено режим \"Не турбувати\""</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Сповіщення"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Показувати сповіщення без звуку"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Звук для сповіщень буде вимкнено"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Вимкнути звук сповіщень"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Ви бачитимете сповіщення на екрані"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Коли надходитимуть сповіщення, телефон не подаватиме сигнал і не вібруватиме."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Сховати сповіщення"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Нові чи наявні сповіщення не з’являтимуться"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Вимкнути зображення та звук сповіщень"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Ви не зможете бачити або чути сповіщення"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Телефон не показуватиме нові чи наявні сповіщення, не подаватиме сигнал і не вібруватиме. Сповіщення не з’являтимуться, коли ви проводитимете пальцем від верху екрана.\n\nПам’ятайте: ви бачитимете важливі сповіщення про активність і статус телефона."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Власні налаштування"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Увімкнути власне налаштування"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Видалити власне налаштування"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"З’являються"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Вимкнути звук сповіщень"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Частково ховаються"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Ховаються"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Вимкнути зображення та звук сповіщень"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Власні обмеження"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Коли екран увімкнено"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Коли екран вимкнено"</string>
@@ -3244,19 +3253,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Звук вимкнено. Дозволити лише <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> та <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Повідомлення, події й нагадування"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"У режимі \"Не турбувати\" звук для повідомлень, нагадувань і подій вимикатиметься (окрім дозволених елементів вище). Можна змінити налаштування повідомлень, щоб ваші друзі, члени сім’ї та інші контакти могли зв’язатися з вами."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Готово"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Налаштування"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Вимкнути зображення та звук сповіщень"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Вимкнути звук сповіщень"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Ви не зможете бачити або чути сповіщення. Дозволено виклики від контактів із зірочкою та постійних абонентів."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Поточне налаштування)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Змінити налаштування сповіщень у режимі \"Не турбувати\"?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Звуки робочого профілю"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Звуки особистого профілю"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Звуки однакові для робочого й особистого профілів"</string>
@@ -3436,12 +3439,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Дозволити дзвінки"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Коли режим \"Не турбувати\" ввімкнено, вхідні дзвінки блокуються. Можна змінити налаштування, щоб ваші друзі, члени сім’ї та інші контакти могли зв’язатися з вами."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Контакти із зірочкою"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">і ще <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="few">і ще <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="many">і ще <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="other">і ще <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Повідомлення"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Дозволити повідомлення"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Повідомлення"</string>
@@ -3897,10 +3895,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Холодна температура кольорів"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Використовувати холодніші кольори дисплея"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Щоб змінити кольори, вимкніть екран"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Коли Connectivity Monitor виявить проблему зі з’єднанням, він збере журнали та запропонує користувачу повідомити про помилку"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Щоб застосувати зміни в Connectivity Monitor, перезапустіть пристрій"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Лазерний датчик камери"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Логічна камера за умовчанням"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматичне оновлення системи"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Застосувати оновлення, коли пристрій перезапуститься"</string>
     <string name="usage" msgid="2977875522080448986">"Використання"</string>
@@ -4238,8 +4234,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Автозаповнення"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"автоматично, заповнювати, автозаповнення"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Переконайтеся, що додаток надійний&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Функція Автозаповнення Google&gt;%1$s&lt;/xliff:g&gt; використовує інформацію на екрані, щоб визначати поля для автозаповнення."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Тема пристрою"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Колірна тема:"</string>
     <string name="default_theme" msgid="7085644992078579076">"За умовчанням"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Тема пристрою"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"автоматичний вибір (на основі фонового малюнка)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"світла"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"темна"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Назва мережі"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Показувати назву мережі в рядку стану"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Диспетчер пам’яті: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4251,7 +4251,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Інформація про ініціалізацію оператора"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Активатор ініціалізації оператора"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Оновити режим \"Не турбувати\""</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Сховати сповіщення, щоб не відволікатися"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Призупинити сповіщення, щоб не відволікатися"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Що нового та цікавого?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Ознайомтеся зі своїм новим телефоном"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Ознайомтеся зі своїм новим планшетом"</string>
diff --git a/res/values-ur/arrays.xml b/res/values-ur/arrays.xml
index 8e43fc9..2c64a09 100644
--- a/res/values-ur/arrays.xml
+++ b/res/values-ur/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"ہمیشہ آن"</item>
     <item msgid="6385301106124765323">"ہمیشہ آف"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index de3be17..dbcc281 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"اپنے ٹیبلیٹ کو قریبی بلوٹوتھ آلات سے مواصلت کرنے کی اجازت دیں"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"اپنے آلہ کو قریبی بلوٹوتھ آلات سے مواصلت کرنے کی اجازت دیں"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"اپنے فون کو قریبی بلوٹوتھ آلات سے مواصلت کرنے کی اجازت دیں"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"‏Bluetooth A2DP ہارڈ ویئر آف لوڈ بند کریں"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"آلہ ریسٹارٹ کریں؟"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"یہ ترتیب تبدیل کرنے کیلئے آپ کو اپنا آلہ ریسٹارٹ کرنا ہوگا۔"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"ریسٹارٹ کریں"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"منسوخ کریں"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"دستیاب میڈیا آلات"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"دستیاب کال آلات"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"فی الحال منسلک ہے"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"کنکشن کی ترجیحات"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"پہلے منسلک کردہ آلات"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"پہلے سے منسلک کردہ"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"تاریخ اور وقت"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"ٹائم زون منتخب کریں"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"آپ کے ذریعے ٹائپ کردہ پورٹ درست نہیں ہے۔"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"‏HTTP پراکسی کا استعمال براؤزر کے ذریعے ہوتا ہے لیکن ممکن ہے دوسری ایپس اسے استعمال نہ کریں۔"</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL:‎ "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"‏DL بینڈ وڈتھ (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"‏UL بینڈ وڈتھ (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"سیل کے مقام کی معلومات (فرسودہ):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"پڑوسی کے سیل کی معلومات (فرسودہ):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"‏LTE فزيکل چینل کنفیگریشن:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"سیل کی معلومات ریفریش کرنے کی شرح:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"سیل پیمائش کی تمام معلومات:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"ڈیٹا کنکشن ریئل ٹائم معلومات:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"ڈیٹا سروس:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"رومنگ:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1007,16 +1015,11 @@
     <string name="emergency_address_title" msgid="932729250447887545">"ہنگامی پتہ"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"‏جب آپ Wi-Fi سے ہنگامی کال کرتے ہیں، تو آپ کے مقام کے طور پر استعمال ہوتا ہے"</string>
     <string name="private_dns_help_message" msgid="3299567069152568958">"‏نجی DNS کی خصوصیات کے بارے میں "<annotation id="url">"مزید جانیں"</annotation></string>
-    <!-- no translation found for wifi_calling_pref_managed_by_carrier (6845711858866828986) -->
-    <skip />
-    <!-- no translation found for wifi_calling_settings_activation_instructions (7492509632478260955) -->
-    <skip />
-    <!-- no translation found for wifi_calling_turn_on (1171403510313983983) -->
-    <skip />
-    <!-- no translation found for wifi_calling_not_supported (7878640438907807754) -->
-    <skip />
-    <!-- no translation found for carrier (5264014738689761132) -->
-    <skip />
+    <string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"ترتیب کیریئر کے زیر انتظام ہے"</string>
+    <string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"‏Wi-Fi کالنگ فعال کریں"</string>
+    <string name="wifi_calling_turn_on" msgid="1171403510313983983">"‏Wi-Fi کالنگ آن کریں"</string>
+    <string name="wifi_calling_not_supported" msgid="7878640438907807754">"‏Wi‑Fi کالنگ ‎%1$s کیلئے دستیاب نہیں ہے"</string>
+    <string name="carrier" msgid="5264014738689761132">"کیریئر"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ڈسپلے"</string>
     <string name="sound_settings" msgid="5534671337768745343">"آواز"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"والیومز"</string>
@@ -1151,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"خود کار چمک"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"جگانے کیلئے اٹھائیں"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"ايمبيئنٹ ڈسپلے"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"ہمیشہ آن/اضافی بیٹری کا استعمال"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"نئی اطلاعات"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"دکھانے کا وقت"</string>
     <string name="doze_title" msgid="2375510714460456687">"نئی اطلاعات"</string>
     <string name="doze_summary" msgid="3846219936142814032">"اطلاعات موصول ہونے پر اسکرین کو جگائیں"</string>
@@ -1197,8 +1198,6 @@
       <item quantity="one">‏غلط SIM PIN کوڈ، آپ کے پاس <xliff:g id="NUMBER_0">%d</xliff:g> کوشش بچی ہے، اس کے بعد آپ کو اپنا آلہ غیر مقفل کرنے کیلئے اپنے کریئر سے رابطہ کرنا ہوگا۔</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"‏SIM کے PIN کا عمل ناکام ہوگیا!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"ٹیبلٹ کی حیثیت"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"فون اسٹیٹس"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"سسٹم اپ ڈیٹس"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"‏Android ورژن"</string>
@@ -2119,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"پس منظر کے استعمال کو محدود نہیں کیا جا سکتا"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"پس منظر کی سرگرمی کو محدود کریں؟"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"اگر آپ کسی ایپ کی پس منظر کی سرگرمی کو محدود کرتے ہیں تو یہ غلط برتاؤ کر سکتی ہے"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"چونکہ یہ ایپ بیٹری کی کارکردگی کو بہتر بنانے کیلئے نہیں ہے، لہذا آپ اسے محدود نہیں کر سکتے ہیں۔\n\nایپ کو محدود کرنے کیلئے، پہلے بیٹری کی کارکردگی کو بہتر بنانے کو آن کریں۔"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"مکمل چارج کے بعد سے اسکرین کا استعمال"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"اسکرین کی کھپت"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"موبائل نیٹ ورک اسکیننگ"</string>
@@ -2440,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"ایمرجنسی ڈائلنگ سگنل"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"ہنگامی کال کرتے وقت برتاؤ سیٹ کریں"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"بیک اپ"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"آن"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"آف"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"بیک اپ لیں اور بحال کریں"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"ذاتی ڈیٹا"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"میرے ڈیٹا کا بیک اپ لیں"</string>
@@ -2766,6 +2766,12 @@
       <item quantity="one">سرٹیفیکیٹ چیک کریں</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"متعدد صارفین"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"‏صارفین ‎اور‎ پروفائلز"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"صارف یا پروفائل شامل کریں"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"صارف کو شامل کریں"</string>
@@ -2946,14 +2952,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ڈیٹا کا استعمال"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"ہاٹ اسپاٹ"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"منسلک آلات"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"‏بلوٹوتھ، ڈرائیونگ موڈ، NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"بلوٹوتھ، ڈرائیونگ موڈ"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"‏بلوٹوتھ، NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"بلوٹوتھ"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ایپس اور اطلاعات"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"اجازتیں، ڈیفالٹ ایپس"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"اکاؤنٹس"</string>
@@ -2970,7 +2972,6 @@
     <string name="keywords_home" msgid="294182527446892659">"لانچر، ڈیفالٹ، ایپس"</string>
     <string name="keywords_display" msgid="8910345814565493016">"اسکرین، ٹچ اسکرین"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"مدھم اسکرین، ٹچ اسکرین، بیٹری، روشنی"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"مدھم اسکرین، ٹچ اسکرین، بیٹری"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"مدھم اسکرین، نائٹ، ہلکا رنگ، نائٹ شفٹ، چمک، اسکرین کا رنگ، رنگ، رنگ"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"پس منظر، ذاتی نوعیت کا بنانا، حسب ضرورت ڈسپلے"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"متن کا سائز"</string>
@@ -3011,8 +3012,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"‏نیٹ ورک، موبائل نیٹ ورک کی صورت حال، سروس کی صورت حال، سگنل کی قوت، موبائل نیٹ ورک کی قسم، رومنگ، iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"نمبر شمار، ہارڈ ویئر کا ورژن"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"‏Android سیکیورٹی پیچ کی سطح، بیس بینڈ ورژن، کرنل ورژن"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"ايمبيئنٹ ڈسپلے، لاک اسکرین ڈسپلے"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"فنگر پرنٹ"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"گھمانا، پلٹنا، گردش، پورٹریٹ، لینڈ اسکیپ، سمت بندی، عمودی، افقی"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"‏اپ گریڈ کریں، Android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"ڈسٹرب نہ کریں، شیڈول، اطلاعات، انسداد، سکوت، وائبریٹ، سلیپ، کام، توجہ، آواز، خاموش، دن، ہفتہ کا دن، ویک اینڈ، ہفتہ کی رات، ایونٹ"</string>
@@ -3095,18 +3100,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"بصری سگنلز کی اجازت دیں"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"\'ڈسٹرب نہ کریں\' آن ہونے پر"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"اطلاعات"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"اطلاعات خاموشی سے دکھائیں"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"اطلاعات خاموش کر دی جائیں گی"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"اطلاعات کی کوئی آواز نہیں"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"آپ کو اپنی اسکرین پر اطلاعات نظر آئیں گی"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"جب اطلاعات آپ تک پہنچیں گی، تو آپ کا فون آواز یا وائبریٹ نہیں کرے گا۔"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"اطلاعات چھپائیں"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"آپ کو نئی یا موجودہ اطلاعات دکھائی نہیں دیں گی"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"اطلاعات کی کوئی ویزوئل یا آواز نہیں"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"آپ کو اطلاعات دکھائی یا سنائی نہيں دیں گی"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"آپ کے فون پر نئی یا موجودہ اطلاعات دکھائی نہیں دیں گی اور یہ آواز یا وائبریٹ نہیں کرے گا۔ جب آپ اپنی اسکرین کے اوپری حصے سے نیچے کی طرف سوائپ کریں گے تو اطلاعات دکھائی نہیں دیں گی۔\n\nذہن نشین کر لیں کہ فون کی سرگرمی اور اسٹیٹس کی اہم اطلاعات اب بھی دکھائی دیں گی۔"</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"حسب ضرورت"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"حسب ضرورت ترتیب فعال کریں"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"حسب ضرورت ترتیب ہٹائیں"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"نظر آئیں گی"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"اطلاعات کی کوئی آواز نہیں"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"جزوی طور پر پوشیدہ"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"پوشیدہ"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"اطلاعات کی کوئی ویزوئل یا آواز نہیں"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"حسب ضرورت پابندیاں"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"اسکرین کے آن ہونے پر"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"اسکرین کے آف ہونے پر"</string>
@@ -3165,19 +3170,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"خاموش کردہ، لیکن <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>، <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> اور <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> کو اجازت دیں"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"پیغامات، ایونٹس اور یاد دہانیاں"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"\'ڈسٹرب نہ کریں\' آن ہونے پر، پیغامات، یاد دہانیاں اور ایونٹس خاموش کر دئے جائیں گے، ماسوا ان آئٹمز کے جن کی آپ نے اوپر اجازت دی ہے۔ اپنے دوستوں، اہل خانہ اور دیگر رابطوں کو آپ تک پہنچنے کی اجازت دینے کیلئے، آپ پیغامات کی ترتیبات ایڈجسٹ کر سکتے ہیں۔"</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"ہو گیا"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"ترتیبات"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"اطلاعات کی کوئی ویزوئل یا آواز نہیں"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"اطلاعات کی کوئی آواز نہیں"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"آپ کو ستارے کے نشان والے رابطوں اور بار بار کال کرنے والے مجاز لوگوں کی طرف سے اطلاعات، کالز نظر نہیں آئیں گی یا سنائی نہيں دیں گی۔"</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(موجودہ ترتیب)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"\'ڈسٹرب نہ کریں\' کی اطلاع کی ترتیبات کو تبدیل کریں؟"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"دفتری پروفائل کی آوازیں"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"ذاتی پروفائل کی آوازیں استعمال کریں"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"دفتری اور ذاتی پروفائلز کی آوازیں ایک ہی جیسی ہیں"</string>
@@ -3346,17 +3345,12 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> تا <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"کالز"</string>
-    <!-- no translation found for zen_mode_calls_title (623395033931747661) -->
-    <skip />
+    <string name="zen_mode_calls_title" msgid="623395033931747661">"کالز کی اجازت دیں"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"\'ڈسٹرب نہ کریں\' آن ہونے پر، موصول ہونے والی کالز مسدود کر دی جاتی ہیں۔ اپنے دوستوں، اہل خانہ اور دیگر رابطوں کو آپ تک پہنچنے کی اجازت دینے کیلئے، آپ ترتیبات ایڈجسٹ کر سکتے ہیں۔"</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"ستارہ کا نشان لگے ہوئے رابطے"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">اور <xliff:g id="NUM_PEOPLE">%d</xliff:g> دیگر</item>
-      <item quantity="one">اور 1 دیگر</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"پیغامات"</string>
-    <!-- no translation found for zen_mode_messages_title (7729380010396411129) -->
-    <skip />
+    <string name="zen_mode_messages_title" msgid="7729380010396411129">"پیغامات کی اجازت دیں"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"پیغامات"</string>
     <string name="zen_mode_selected_messages" msgid="1047355526202106114">"کچھ پیغامات"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"کسی سے بھی"</string>
@@ -3370,19 +3364,15 @@
     <string name="zen_mode_media" msgid="8808264142134422380">"میڈیا"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"ٹچ کی آوازیں"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"یاد دہانیاں"</string>
-    <!-- no translation found for zen_mode_reminders_title (2345044406347406902) -->
-    <skip />
+    <string name="zen_mode_reminders_title" msgid="2345044406347406902">"یاددہانیوں کی اجازت دیں"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ایونٹس"</string>
-    <!-- no translation found for zen_mode_events_title (5597241655883329085) -->
-    <skip />
+    <string name="zen_mode_events_title" msgid="5597241655883329085">"ایونٹس کی اجازت دیں"</string>
     <string name="zen_mode_all_callers" msgid="2378065871253871057">"کوئی بھی"</string>
     <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"رابطے"</string>
     <string name="zen_mode_starred_callers" msgid="1023167821338514140">"ستارے کا نشان لگے ہوئے رابطے"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"بار بار کال کرنے والے"</string>
-    <!-- no translation found for zen_mode_repeat_callers_title (8553876328249671783) -->
-    <skip />
-    <!-- no translation found for zen_mode_calls_summary_one (3972333792749874863) -->
-    <skip />
+    <string name="zen_mode_repeat_callers_title" msgid="8553876328249671783">"دوبارہ کال کرنے والوں کو اجازت دیں"</string>
+    <string name="zen_mode_calls_summary_one" msgid="3972333792749874863">"منجانب <xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
     <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"<xliff:g id="CALLER_TYPE">%1$s</xliff:g> اور <xliff:g id="CALLERT_TPYE">%2$s</xliff:g> کی جانب سے"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"ایک ہی شخص کے <xliff:g id="MINUTES">%d</xliff:g> منٹ کے اندر دوسری بار کال کرنے پر"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"حسب ضرورت"</string>
@@ -3788,10 +3778,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"سرد رنگ کا درجہ حرارت"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ڈسپلے کیلئے سرد رنگ استعمال کریں"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"رنگ میں تبدیلی لاگو کرنے کیلئے اسکرین آف کریں"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"کنیکٹوٹی مانیٹر"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"کنیکٹوٹی کے ساتھ در پیش مسئلہ کا پتہ چلنے پر کنیکٹوٹی مانیٹر لاگز اکٹھا کر کے بگ دائر کرنے کیلئے صارف کو اطلاع بھیجے گا"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"کنیکٹوٹی مانیٹر کی تبدیلی لاگو کرنے کیلئے، آلہ ریبوٹ کریں"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"کیمرا لیزر سینسر"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"بطور ڈیفالٹ لاجیکل کیمرا"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"خودکار سسٹم اپ ڈیٹس"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"آلہ ری اسٹارٹ ہونے پر اپ ڈیٹس لاگو کریں"</string>
     <string name="usage" msgid="2977875522080448986">"استعمال"</string>
@@ -4101,8 +4089,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"آٹو فل سروس"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"آٹو، فل، آٹو فل"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"‏&lt;b&gt;یہ یقینی بنائیں کہ آپ کو اس ایپ پر اعتماد ہے&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt;  آٹو فل کی جانے والی چیزوں کی تعیین کرنے کیلئے آپ کی اسکرین پر موجود چیزوں کو استعمال کرتا ہے۔"</string>
-    <string name="device_theme" msgid="4571803018917608588">"آلہ کا تھیم"</string>
+    <string name="color_theme" msgid="1535685696756738324">"رنگ کی تھیم"</string>
     <string name="default_theme" msgid="7085644992078579076">"ڈیفالٹ"</string>
+    <string name="device_theme" msgid="4571803018917608588">"آلہ کا تھیم"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"خودکار (وال پیپر پر مبنی)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"ہلکی"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"گہری"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"نیٹ ورک کا نام"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"اسٹیٹس بار میں نیٹ ورک کا نام دکھائيں"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"اسٹوریج مینیجر: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4114,7 +4106,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"کیرئیر فراہمی معلومات"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ٹرگر کیرئیر فراہمی"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"\'ڈسٹرب نہ کریں\' کو اپ ڈیٹ کریں"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"متوجہ رہنے کے لیے اطلاعات چھپائیں"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"متوجہ رہنے کے لیے اطلاعات موقوف کریں"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"نیا اور دلچسپ کیا ہے؟"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"اپنے نئے فون کا ایک ٹؤر لیں"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"اپنے نئے ٹیبلیٹ کا ایک ٹؤر لیں"</string>
diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml
index 168fb5c..3593554 100644
--- a/res/values-uz/arrays.xml
+++ b/res/values-uz/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -268,7 +274,7 @@
     <item msgid="7136963238377062018">"ovoz balandligi"</item>
     <item msgid="4270236897655923007">"qo‘ng‘iroq ovozi"</item>
     <item msgid="6325739889222559394">"multimedia ovozi"</item>
-    <item msgid="5762123934816216821">"signal ovozi"</item>
+    <item msgid="5762123934816216821">"Signal tovushi balandligi"</item>
     <item msgid="785049718065337473">"xabarnoma tovush balandligi"</item>
     <item msgid="6700305533746877052">"bluetooth tovush balandligi"</item>
     <item msgid="2029227495214047094">"uyg‘oq turish"</item>
@@ -335,7 +341,7 @@
     <item msgid="5660213838861789350">"Ovoz balandligi"</item>
     <item msgid="7983336752371254444">"Qo‘ng‘iroq ovozi"</item>
     <item msgid="7878027809189330917">"Multimedia ovozi"</item>
-    <item msgid="7260546305036218513">"Signal ovozi"</item>
+    <item msgid="7260546305036218513">"Signal tovushi balandligi"</item>
     <item msgid="9103719301075748925">"Xabarnoma tovush balandligi"</item>
     <item msgid="7025966722295861512">"Bluetooth tovush balandligi"</item>
     <item msgid="4665183401128289653">"Uyg‘oq turish"</item>
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Har doim yoniq"</item>
     <item msgid="6385301106124765323">"Har doim o‘chiq"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 6ad0203..709388c 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Planshetga yaqin-atrofdagi Bluetooth qurilmalar bilan ma’lumotlarni almashishi uchun ruxsat berish"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Qurilmaga yaqin-atrofdagi Bluetooth qurilmalar bilan ma’lumotlarni almashishi uchun ruxsat berish"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Telefonga yaqin-atrofdagi Bluetooth qurilmalar bilan ma’lumotlarni almashishi uchun ruxsat berish"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Bluetooth A2DP apparat yukini kamaytirish funksiyasini faolsizlantirish"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Qurilma qayta ishga tushirilsinmi?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"O‘zgartirish uchun qurilmangizni qayta ishga tushiring."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Qaytadan"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Bekor"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Mavjud media qurilmalar"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Mavjud chaqiruv qurilmalari"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Hozirda ulangan"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Ulanish parametrlari"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Avval ulangan qurilmalar"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Avval ulangan qurilmalar"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Sana va vaqt"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Vaqt zonasini tanlang"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Siz noto‘g‘ri port raqamini kiritdingiz."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP proksi-serveri faqat brauzer tomonidan foydalaniladi."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"Proksi avto-sozlamalari URL "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Yuklash/yuklab olish tezligi (kbit/s):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Yuqori-past tezlik (kbit/s):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Tarmoqning joylashuvi haqida ma’lumot (eskirgan):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Qo‘shni tarmoq ma’lumotlari (eskirgan):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE jismoniy kanal konfiguratsiyasi:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Tarmoq ma’lumotlarining yangilanish darajasi:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Tarmoq statistikasi:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Real vaqt rejimida mobil internet haqida ma’lumot:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Mobil internet xizmati:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Rouming:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -376,8 +384,8 @@
     <string name="decryption_settings_summary" product="default" msgid="5671817824042639849">"Telefon shifrlanmagan"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Qurilma shifrlangan"</string>
     <string name="decryption_settings_summary" product="tablet" msgid="5794135636155570977">"Qurilma shifrlanmagan"</string>
-    <string name="lockscreen_settings_title" msgid="1099738951060387656">"Qulflangan ekrandagi ma’lumot"</string>
-    <string name="lockscreen_settings_what_to_show_category" msgid="278055252361575926">"Nimalar ko‘rsatilsin"</string>
+    <string name="lockscreen_settings_title" msgid="1099738951060387656">"Qulflangan ekran ustidagi axborot"</string>
+    <string name="lockscreen_settings_what_to_show_category" msgid="278055252361575926">"Nimalar chiqsin"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Joylashuv va xavfsizlik sozlamalari"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Mening joylashuvim, ekran qulfi, hisob ma‘lumotlari omborini qulflash sozlamalari"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Maxfiylik"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Avtomatik yorqinlik"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Tik holatda faollashtirish"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Sezgir ekran"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Doim yoniq (batareya tezroq sarflanadi)"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Yangi bildirishnomalar"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Ekran qachon yonadi"</string>
     <string name="doze_title" msgid="2375510714460456687">"Yangi bildirishnomalar"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Bildirishnoma kelsa, ekran yonadi"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">SIM kartaning PIN kodi xato. Qurilma qulfini ochish uchun sizda yana <xliff:g id="NUMBER_0">%d</xliff:g> ta urinish qoldi.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM karta PIN kodining amaliyoti bajarilmadi!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Planshet holati"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefon holati"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Tizimni yangilash"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android versiyasi"</string>
@@ -2120,9 +2124,7 @@
     <skip />
     <string name="device_screen_consumption" msgid="4607589286438986687">"Ekran sarfi"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobil tarmoqni tekshirish"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for power_usage_list_summary (5584049564906462506) -->
-    <skip />
+    <string name="power_usage_list_summary" msgid="5584049564906462506">"100%% quvvatlanganidan beri quvvati sarfi"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"To‘liq quvvat olganidan beri ekran yoniq turgan vaqt miqdori"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"To‘liq quvvat olganidan beri qurilmaning quvvat sarfi"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Quvvat manbaidan uzilganidan keyin sarflangan batareya quvvati"</string>
@@ -2452,6 +2454,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Favqulodda chaqiruv signali"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Favqulodda qo‘ng‘iroq uchun xususiyat o‘rnatish"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Zaxiralash"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Yoniq"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Yoqilmagan"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Zaxira nusxa va qayta tiklash"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Shaxsiy ma‘lumotlar"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Ma’lumotlarni zaxiralash"</string>
@@ -2778,6 +2782,12 @@
       <item quantity="one">Sertifikatni tekshirish</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Bir nechta foydalanuvchi"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Foydalanuvchilar &amp; profillar"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Foydalanuvchi yoki profil qo‘shish"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Foydalanuvchi qo‘shish"</string>
@@ -2960,14 +2970,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"trafik sarfi"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Ulangan qurilmalar"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, avtomobil rejimi, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, avtomobil rejimi"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Ilovalar va bildirishnomalar"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Ruxsatlar, birlamchi ilovalar"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Hisoblar"</string>
@@ -2984,7 +2990,6 @@
     <string name="keywords_home" msgid="294182527446892659">"launcher, birlamchi, ilovalar"</string>
     <string name="keywords_display" msgid="8910345814565493016">"ekran, sensorli ekran"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"xira ekran, sensorli ekran, batareya, yorqinlik"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"xira ekran, sensorli ekran, batareya"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"xira ekran, tun, tus, tungi rejim, yorqinlik, ekran rangi, rang"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"orqa fon, personallashtirish, ekranni moslashtirish"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"shrift o‘lchami"</string>
@@ -3025,8 +3030,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"tarmoq, mobil tarmoq holati, xizmat holati, signal kuchi, mobil tarmoq turi, rouming, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"seriya raqami, apparat versiyasi"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android tizimi xavfsizligi uchun yangilanish, aloqa moduli versiyasi, yadro versiyasi"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ekranning avtomatik yonishi, ekran qulfi"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"barmoq izi"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"xira ekran, sensorli ekran, batareya, smart yorqinlik, dinamik yorqinlik"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"burish, aylantirish, burilish, tik, yoqish, holat, portret, peyzaj"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"yangilash, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"bezovta qilinmasin, jadval, bildirishnomalar, bloklash, ovozsiz rejim, tebranish, uyqu, ish, konsentratsiya, tovush, kun, ish kuni, dam olish kuni, ish kuni kechasi, tadbir"</string>
@@ -3057,7 +3065,7 @@
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Qo‘ng‘iroq ovozi balandligi: 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Multimedia ovozi"</string>
     <string name="call_volume_option_title" msgid="1265865226974255384">"Chaqiruv tovushi"</string>
-    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Signal ovozi"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Signal tovushi balandligi"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Rington"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Bildirishnomalar ovozi"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefon ringtoni"</string>
@@ -3109,18 +3117,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Vizual signallarga ruxsat"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Bezovta qilinmasin rejimi yoniqligida"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Bildirishnomalar"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Bildirishnomalar ovozsiz chiqsin"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Bildirishnomalar ovozsiz keladi"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Bildirishnomalar ovozsiz keladi"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Bildirishnomalar ekranga chiqariladi"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Yangi bildirishnomalar tovushsiz va tebranishsiz keladi."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Bildirishnomalar berkitilsin"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Barcha bildirishnomalar berkitiladi"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Bildirishnomalar chiqarilmaydi yoki ovozsiz keladi"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Bildirishnomalar chiqmaydi yoki eshittirilmaydi"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Telefoningizda barcha bildirishnomalar berkitiladi, ovozi chiqmaydi va tebranmaydi. Ekranni pastdan tepaga surganingizda bildirishnomalar chiqmaydi.\n\nYodda tuting, telefoningiz harakati va holatiga oid eng muhim bildirishnomalar ko‘rsatiladi."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Maxsus"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Maxsus sozlamalarni yoqish"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Maxsus sozlamalarni olib tashlash"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Chiqarish"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Bildirishnomalar ovozsiz keladi"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Qisman berkitish"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Berkitish"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Bildirishnomalar chiqarilmaydi yoki ovozsiz keladi"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Maxsus cheklovlar"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Ekran yoniqligida"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Ekran yoniq emasligida"</string>
@@ -3179,19 +3187,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Ovozsiz, lekin <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> va <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> uchun ruxsat berilgan"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Xabarlar, tadbirlar va eslatmalar"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Bezovta qilinmasin rejimi yoniqligida yuqorida ruxsat berilganlardan tashqari xabarlar, eslatmalar va tadbirlar ovozsiz qilinadi. Sizga bog‘lana olishlari uchun muayyan tanishlar, oila a’zolari yoki boshqa kontaktlarga sozlamalarni o‘zgartirish orqali ruxsat berishingiz mumkin."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Tayyor"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Sozlamalar"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Bildirishnomalar chiqarilmaydi yoki ovozsiz keladi"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Bildirishnomalar ovozsiz"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Bildirishnomalar chiqmaydi yoki eshittirilmaydi. Yulduzchali kontaktlardan chaqiruvlar va qayta chaqiruvlarga ruxsat berilgan."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Joriy parametr)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Bezovta qilinmasin rejimining bildirishnomalar sozlamalari o‘zgartirilsinmi?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Ishchi profil ovozlari"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Shaxsiy profil ovozlaridan foydalanish"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Tovushlar ishchi va shaxsiy profillar uchun bir xil"</string>
@@ -3363,10 +3365,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Chaqiruvlar"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Bezovta qilinmasin rejimi yoniqligida kiruvchi chaqiruvlar bloklanadi. Sizga bog‘lana olishlari uchun muayyan tanishlar, oila a’zolari yoki boshqa kontaktlarga sozlamalarni o‘zgartirish orqali ruxsat berishingiz mumkin."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Saralangan kontaktlar"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">va yana <xliff:g id="NUM_PEOPLE">%d</xliff:g> kishi</item>
-      <item quantity="one">va yana 1 kishi</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Xabarlar"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Xabarlar"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Xabarlar"</string>
@@ -3796,10 +3795,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Salqin rang harorati"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Salqin displey ranglaridan foydalanish"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Rangni o‘zgartirish uchun ekranni o‘chiring"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Aloqa nazorati"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Aloqa nazorati aloqa bilan bog‘liq muammolar aniqlansa va foydalanuvchiga xatolikni yuborishi uchun bildirishnoma yuborib, jurnallarni to‘playdi"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Aloqa nazoratiga o‘zgartirish kiritish uchun qurilmani o‘chirib yoqing"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Kameraning lazer sensori"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Birlamchi mantiqiy kamera"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Avtomatik tizim yangilanishlari"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Yangilanishlar qurilma qayta ishga tushirilganda o‘rnatilsin"</string>
     <string name="usage" msgid="2977875522080448986">"Trafik sarfi"</string>
@@ -4109,8 +4106,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Avtomatik to‘ldirish xizmati"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"avtomatik, to‘ldirish, avtomatik to‘ldirish"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Bu ilova ishonchli ekanini tekshiring&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; ekraningizda nimani avtomatik to‘ldirish kerakligini aniqlaydi."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Qurilma mavzusi"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Rangli mavzu"</string>
     <string name="default_theme" msgid="7085644992078579076">"Standart"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Qurilma mavzusi"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Avtomatik (fon rasmiga asosan)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Kunduzgi"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Tungi"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Tarmoq nomi"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Holat qatorida tarmoq nomini ko‘rsatish"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Xotira menejeri: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4121,8 +4122,8 @@
     <string name="storage_movies_tv" msgid="5498394447562086890">"Film va TV ilovalari"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Operator haqida"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Operator ta’minotini yoqish/o‘chirish"</string>
-    <string name="zen_suggestion_title" msgid="798067603460192693">"Bezovta qilinmasin rejimi yoqing"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Chalg‘ituvchi belgirishnomalarni berkiting"</string>
+    <string name="zen_suggestion_title" msgid="798067603460192693">"Bezovta qilinmasin rejimini yoqing"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Bezovta qiluvchi bildirishnomalarni pauza qiling"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Nima yangi va qiziqarli narsalar bor?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Yangi telefoningiz bilan tanishib chiqing"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Yangi planshetingiz bilan tanishib chiqing"</string>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index e216156..c24c1cd 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Luôn bật"</item>
     <item msgid="6385301106124765323">"Luôn tắt"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 9275e9d..01665a7 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Cho phép máy tính bảng kết nối với các thiết bị Bluetooth ở gần"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Cho phép thiết bị kết nối với các thiết bị Bluetooth ở gần"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Cho phép điện thoại kết nối với các thiết bị Bluetooth ở gần"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Tắt giảm tải cho phần cứng Bluetooth A2DP"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Khởi động lại thiết bị?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Bạn cần khởi động lại thiết bị để thay đổi cài đặt này."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Khởi động lại"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Hủy"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Các thiết bị phương tiện có sẵn"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Các thiết bị thực hiện cuộc gọi có sẵn"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Hiện đã kết nối"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Tùy chọn kết nối"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Các thiết bị đã kết nối trước đây"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Đã kết nối trước đó"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Ngày và giờ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Chọn múi giờ"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Cổng bạn đã nhập không hợp lệ."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy HTTP được sử dụng bởi trình duyệt nhưng có thể không được sử dụng bởi các ứng dụng khác."</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"URL PAC: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Băng thông DL (kb/giây):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Băng thông UL (kb/giây):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Thông tin vị trí mạng di động (không dùng nữa):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Thông tin mạng di động lân cận (không dùng nữa):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Cấu hình kênh LTE thực:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Tốc độ làm mới thông tin mạng di động:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Toàn bộ thông tin về số đo mạng di động:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Thông tin kết nối dữ liệu trong thời gian thực:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Dịch vụ dữ liệu:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Chuyển vùng:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Độ sáng tự động"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Nhấc lên để đánh thức"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Màn hình sáng"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Luôn bật / Mức sử dụng pin tăng"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Thông báo mới"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Thời điểm hiển thị"</string>
     <string name="doze_title" msgid="2375510714460456687">"Thông báo mới"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Bật màn hình khi bạn nhận được thông báo"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">Mã PIN của SIM không chính xác, bạn còn  <xliff:g id="NUMBER_0">%d</xliff:g> lần thử trước khi bạn phải liên hệ với nhà cung cấp dịch vụ để mở khóa thiết bị của bạn.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Thao tác mã PIN của SIM không thành công!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Trạng thái của máy tính bảng"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Trạng thái điện thoại"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Bản cập nhật hệ thống"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Phiên bản Android"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Không thể hạn chế sử dụng trong nền"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"Giới hạn hoạt động nền?"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Nếu bạn giới hạn hoạt động nền cho một ứng dụng, ứng dụng đó có thể hoạt động sai"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Không thể hạn chế ứng dụng này vì bạn chưa đặt để tối ưu hóa pin.\n\nĐể hạn chế ứng dụng, trước tiên hãy bật tối ưu hóa pin."</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Mức sử dụng màn hình kể từ lần sạc đầy"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Mức tiêu thụ của màn hình"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Quét mạng di động"</string>
@@ -2435,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Tín hiệu quay số khẩn cấp"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Đặt chế độ khi cuộc gọi khẩn cấp được thực hiện"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Sao lưu"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Đang bật"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Đang tắt"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Sao lưu &amp; khôi phục"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dữ liệu cá nhân"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Sao lưu dữ liệu của tôi"</string>
@@ -2761,6 +2766,12 @@
       <item quantity="one">Kiểm tra chứng chỉ</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Nhiều người dùng"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Người dùng và tiểu sử"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Thêm người dùng hoặc tiểu sử"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Thêm người dùng"</string>
@@ -2943,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"sử dụng dữ liệu"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"điểm phát sóng"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Thiết bị đã kết nối"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, chế độ lái xe, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"Bluetooth, chế độ lái xe"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"Bluetooth, NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Ứng dụng và thông báo"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Quyền, ứng dụng mặc định"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Tài khoản"</string>
@@ -2967,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"trình chạy, mặc định, ứng dụng"</string>
     <string name="keywords_display" msgid="8910345814565493016">"màn hình, màn hình cảm ứng"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"làm mờ màn hình, màn hình cảm ứng, pin, sáng"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"màn hình mờ, màn hình cảm ứng, pin"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"làm mờ màn hình, ban đêm, phủ màu, ca đêm, độ sáng, màu màn hình, màu, màu sắc"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"nền, cá nhân hóa, tùy chỉnh màn hình"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"kích thước văn bản"</string>
@@ -3008,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"mạng, trạng thái mạng di động, trạng thái dịch vụ, cường độ tín hiệu, loại mạng di động, chuyển vùng, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"số sê-ri, phiên bản phần cứng"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"mức bản vá bảo mật của android, phiên bản băng tần cơ sở, phiên bản kernel"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Màn hình sáng, Màn hình ở chế độ màn hình khóa"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"vân tay"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"xoay vòng, lật, xoay, dọc, ngang, hướng, chiều dọc, chiều ngang"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"nâng cấp, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"dnd, không làm phiền, lịch biểu, thông báo, chặn, im lặng, rung, ngủ, làm việc, tập trung, âm thanh, tắt tiếng, ngày, ngày trong tuần, ngày cuối tuần, đêm trong tuần, sự kiện"</string>
@@ -3092,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Cho phép tín hiệu hình ảnh"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Khi chế độ Không làm phiền đang bật"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Thông báo"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Hiển thị im lặng các thông báo"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Thông báo sẽ bị ẩn"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Không có âm thanh khi có thông báo"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Bạn sẽ thấy thông báo trên màn hình của mình"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Khi có thông báo, điện thoại của bạn sẽ không phát ra âm thanh hoặc rung."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Ẩn thông báo"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Bạn sẽ không thấy thông báo mới hoặc hiện có"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Không có hình ảnh hoặc âm thanh khi có thông báo"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Bạn sẽ không nghe thấy hoặc nhìn thấy thông báo"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Điện thoại của bạn sẽ không hiển thị thông báo mới hoặc hiện có, cũng như không phát ra âm thanh hoặc rung. Thông báo sẽ không xuất hiện khi bạn vuốt xuống từ đầu màn hình.\n\nXin lưu ý các thông báo quan trọng về trạng thái và hoạt động của điện thoại sẽ vẫn xuất hiện."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Tùy chỉnh"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Bật cài đặt tùy chỉnh"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Xóa cài đặt tùy chỉnh"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Sẽ hiển thị"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Không có âm thanh khi có thông báo"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Ẩn một phần"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Ẩn"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Không có hình ảnh hoặc âm thanh khi có thông báo"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Giới hạn tùy chỉnh"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Khi màn hình đang bật"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Khi màn hình đang tắt"</string>
@@ -3162,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Đã tắt tiếng nhưng cho phép <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> và <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Tin nhắn, sự kiện và lời nhắc"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Khi chế độ Không làm phiền đang bật, tin nhắn, lời nhắc và sự kiện sẽ bị ẩn trừ các mục mà bạn cho phép ở trên. Bạn có thể điều chỉnh mục cài đặt tin nhắn để cho phép bạn bè, gia đình hoặc những người khác liên hệ với bạn."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Xong"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Cài đặt"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Không có hình ảnh hoặc âm thanh khi có thông báo"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Không có âm thanh từ thông báo"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Bạn sẽ không nhìn thấy hoặc nghe thấy thông báo. Các cuộc gọi từ các liên hệ được gắn dấu sao và người gọi lặp lại đều được phép."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Mục cài đặt hiện tại)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Thay đổi mục cài đặt thông báo Không làm phiền?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Âm thanh hồ sơ công việc"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Sử dụng âm thanh hồ sơ cá nhân"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Âm thanh giống nhau cho hồ sơ cá nhân và công việc"</string>
@@ -3346,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Cho phép cuộc gọi"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Khi chế độ Không làm phiền đang bật, các cuộc gọi đến đều bị chặn. Bạn có thể điều chỉnh mục cài đặt này để cho phép bạn bè, gia đình hoặc những người khác liên hệ với bạn."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Liên hệ được gắn dấu sao"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">và <xliff:g id="NUM_PEOPLE">%d</xliff:g> người khác</item>
-      <item quantity="one">và 1 người khác</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Tin nhắn"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Cho phép tin nhắn"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Tin nhắn"</string>
@@ -3779,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Nhiệt độ màu lạnh"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Sử dụng màu hiển thị lạnh hơn"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Để áp dụng thay đổi màu, hãy tắt màn hình"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Công cụ giám sát kết nối"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Công cụ ConnectivityMonitor sẽ thu thập nhật ký khi phát hiện thấy sự cố kết nối và gửi thông báo khẩn cấp tới người dùng để gửi lỗi"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Để áp dụng thay đổi công cụ giám sát kết nối, hãy khởi động lại thiết bị"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Cảm biến laser của máy ảnh"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Chuyển máy ảnh logic về mặc định"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Cập nhật hệ thống tự động"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Áp dụng bản cập nhật khi thiết bị khởi động lại"</string>
     <string name="usage" msgid="2977875522080448986">"Sử dụng"</string>
@@ -3972,7 +3971,7 @@
     <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Để xem thời gian, biểu tượng thông báo và thông tin khác, hãy nhấc điện thoại lên."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Để xem thời gian, biểu tượng thông báo và thông tin khác, hãy nhấc máy tính bảng lên."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Để xem thời gian, biểu tượng thông báo và thông tin khác, hãy nhấc thiết bị lên."</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Vuốt vân tay để xem thông báo"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Vuốt cảm biến vân tay để xem thông báo"</string>
     <string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Vuốt vân tay"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Để kiểm tra thông báo, hãy vuốt xuống trên cảm biến vân tay ở mặt sau điện thoại."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Để kiểm tra thông báo, hãy vuốt xuống trên cảm biến vân tay ở mặt sau máy tính bảng."</string>
@@ -4092,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Dịch vụ tự động điền"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"tự động, điền, tự động điền"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Hãy đảm bảo bạn tin tưởng ứng dụng này&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; sử dụng nội dung trên màn hình của bạn để xác định nội dung nào có thể được tự động điền."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Chủ đề thiết bị"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Chủ đề màu"</string>
     <string name="default_theme" msgid="7085644992078579076">"Mặc định"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Chủ đề thiết bị"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Tự động (dựa trên hình nền)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Sáng"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Tối"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Tên mạng"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Hiển thị tên mạng trên thanh trạng thái"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Trình quản lý bộ nhớ: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4105,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Thông tin cấp phép của nhà cung cấp dịch vụ"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Kích hoạt cấp phép của nhà cung cấp dịch vụ"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Cập nhật chế độ Không làm phiền"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Ẩn thông báo để luôn tập trung"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Tạm dừng thông báo để tập trung"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Thông tin mới và thú vị?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Tham quan điện thoại mới của bạn"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Tham quan máy tính bảng mới của bạn"</string>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index dccb01e..332ea5e 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"始终开启"</item>
     <item msgid="6385301106124765323">"始终关闭"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 45cd694..496a8ce 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"允许您的平板电脑与附近的蓝牙设备进行通信"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"允许您的设备与附近的蓝牙设备进行通信"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"允许您的手机与附近的蓝牙设备进行通信"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"停用蓝牙 A2DP 硬件卸载"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"要重启设备吗？"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"您需要重启设备才能让这项设置更改生效。"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"重启"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"取消"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"可用的媒体设备"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"可用的通话设备"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"当前已连接"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"连接偏好设置"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"之前连接的设备"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"之前连接的设备"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"日期和时间"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"选择时区"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"您键入的端口无效。"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"浏览器会使用 HTTP 代理，但其他应用可能不会使用。"</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC网址： "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL 带宽 (kbps)："</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"UL 带宽 (kbps)："</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"移动网络位置信息（已弃用）："</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"邻域移动网络信息（已弃用）："</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE 物理信道配置："</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"移动网络信息刷新频率："</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"所有移动网络测量信息："</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"数据网络连接实时信息："</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"数据服务："</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"漫游："</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"移动通信国际识别码："</string>
@@ -1007,16 +1015,11 @@
     <string name="emergency_address_title" msgid="932729250447887545">"紧急联系地址"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"当您通过 WLAN 网络拨打紧急呼救电话时，系统会判定您位于这个位置"</string>
     <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"详细了解"</annotation>"私人 DNS 功能"</string>
-    <!-- no translation found for wifi_calling_pref_managed_by_carrier (6845711858866828986) -->
-    <skip />
-    <!-- no translation found for wifi_calling_settings_activation_instructions (7492509632478260955) -->
-    <skip />
-    <!-- no translation found for wifi_calling_turn_on (1171403510313983983) -->
-    <skip />
-    <!-- no translation found for wifi_calling_not_supported (7878640438907807754) -->
-    <skip />
-    <!-- no translation found for carrier (5264014738689761132) -->
-    <skip />
+    <string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"这项设置由运营商管理"</string>
+    <string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"请启用 WLAN 通话功能"</string>
+    <string name="wifi_calling_turn_on" msgid="1171403510313983983">"请开启 WLAN 通话功能"</string>
+    <string name="wifi_calling_not_supported" msgid="7878640438907807754">"%1$s不支持 WLAN 通话功能"</string>
+    <string name="carrier" msgid="5264014738689761132">"运营商"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"显示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"声音"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"音量"</string>
@@ -1151,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"自动调整亮度"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"拿起设备时唤醒"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"主动显示"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"一律开启/耗电量更高"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"新通知"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"何时显示"</string>
     <string name="doze_title" msgid="2375510714460456687">"新通知"</string>
     <string name="doze_summary" msgid="3846219936142814032">"收到通知时唤醒屏幕"</string>
@@ -1197,8 +1198,6 @@
       <item quantity="one">SIM 卡 PIN 码不正确，您还可尝试 <xliff:g id="NUMBER_0">%d</xliff:g> 次。如果仍不正确，则需要联系运营商帮您解锁设备。</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM 卡 PIN 码操作失败！"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"平板电脑状态"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"手机状态"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"系统更新"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android 版本"</string>
@@ -2119,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"无法限制后台使用"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"要限制后台活动吗？"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"如果您限制某个应用的后台活动，可能会导致该应用出现异常"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"由于此应用未设置为优化电池用量，因此您无法对其加以限制。\n\n要限制该应用，请先开启电池优化功能。"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"上次充满电后的屏幕用电量"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"屏幕耗电量"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"移动网络扫描"</string>
@@ -2440,6 +2438,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"紧急拨号信号"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"设置进行紧急呼救时的行为"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"备份"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"开启"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"关闭"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"备份和还原"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"个人数据"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"备份我的数据"</string>
@@ -2766,6 +2766,12 @@
       <item quantity="one">检查证书</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"多用户"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"用户和个人资料"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"添加用户或个人资料"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"添加用户"</string>
@@ -2948,14 +2954,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"流量使用"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"热点"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"已连接的设备"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"蓝牙、驾车模式、NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"蓝牙、驾车模式"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"蓝牙、NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"蓝牙"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"应用和通知"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"权限、默认应用"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"帐号"</string>
@@ -2972,7 +2974,6 @@
     <string name="keywords_home" msgid="294182527446892659">"启动器, 默认, 应用"</string>
     <string name="keywords_display" msgid="8910345814565493016">"屏幕, 触摸屏"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"屏幕变暗, 调暗屏幕, 触摸屏, 电池, 明亮"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"屏幕变暗, 调暗屏幕, 触摸屏, 电池"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"屏幕变暗, 调暗屏幕, 夜间, 色调, night shift, 夜视模式, 亮度, 屏幕颜色, 颜色, 色彩"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"背景, 墙纸, 个性化, 自定义, 显示, 显示屏"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"字体大小"</string>
@@ -3013,8 +3014,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"网络, 移动网络状态, 服务状态, 信号强度, 移动网络类型, 漫游, ICCID"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"序列号, 硬件版本"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"Android 安全补丁程序级别, 基带版本, 内核版本"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"主动显示, 锁定屏幕显示"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"指纹"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"旋转, 翻转, 纵向, 横向, 屏幕方向, 垂直, 水平"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"升级, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"勿扰, 时间表, 通知, 屏蔽, 设为静音, 振动, 休眠, 工作, 焦点, 声音, 静音, 日, 工作日, 周末, 工作日晚上, 活动"</string>
@@ -3097,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"允许视觉信号"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"开启勿扰模式时"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"通知"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"显示通知但不发出提示音"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"有通知时会静音"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"不发出通知提示音"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"您会在屏幕上看到通知"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"手机在收到通知时既不会发出提示音也不会振动。"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"隐藏通知"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"您将不会看到任何新通知和现有通知"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"不显示通知，也不发出通知提示音"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"您将不会看到通知或听到通知提示音"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"您的手机不会显示任何新通知和现有通知，并且既不会发出提示音也不会振动。当您从屏幕顶部向下滑动时，系统不会显示通知。\n\n请注意，系统仍会显示手机活动和状态的重要通知。"</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"自定义"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"启用自定义设置"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"移除自定义设置"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"显示"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"不发出通知提示音"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"隐藏部分通知"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"隐藏"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"不显示通知，也不发出通知提示音"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"自定义限制"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"屏幕开启时"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"屏幕关闭时"</string>
@@ -3167,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"已设为静音（但<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>、<xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>和<xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>除外）"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"信息、活动和提醒"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"开启勿扰模式后，系统会忽略信息、提醒和活动。您可以调整相应信息设置（您在上访允许的项目除外），以便允许您的好友、家人或其他联系人与您联系。"</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"完成"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"设置"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"不显示通知，也不发出通知提示音"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"不发出通知提示音"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"您将不会看到通知或听到通知提示音。允许已加星标的联系人和重复来电者的来电。"</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"（当前设置）"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"要更改勿扰模式的通知设置吗？"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"工作资料提示音"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"使用个人资料提示音"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"工作资料和个人资料会使用相同的提示音"</string>
@@ -3348,17 +3347,12 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g>到<xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"来电"</string>
-    <!-- no translation found for zen_mode_calls_title (623395033931747661) -->
-    <skip />
+    <string name="zen_mode_calls_title" msgid="623395033931747661">"允许进行通话"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"开启勿扰模式后，系统会屏蔽来电。您可以调整相应设置，以便允许您的好友、家人或其他联系人与您联系。"</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"已加星标的联系人"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">以及另外 <xliff:g id="NUM_PEOPLE">%d</xliff:g> 个人</item>
-      <item quantity="one">以及另外 1 个人</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"消息"</string>
-    <!-- no translation found for zen_mode_messages_title (7729380010396411129) -->
-    <skip />
+    <string name="zen_mode_messages_title" msgid="7729380010396411129">"允许显示消息"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"信息"</string>
     <string name="zen_mode_selected_messages" msgid="1047355526202106114">"部分信息"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"来自任何人"</string>
@@ -3372,19 +3366,15 @@
     <string name="zen_mode_media" msgid="8808264142134422380">"媒体"</string>
     <string name="zen_mode_system" msgid="2541380718411593581">"触摸提示音"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"提醒"</string>
-    <!-- no translation found for zen_mode_reminders_title (2345044406347406902) -->
-    <skip />
+    <string name="zen_mode_reminders_title" msgid="2345044406347406902">"允许显示提醒"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"活动"</string>
-    <!-- no translation found for zen_mode_events_title (5597241655883329085) -->
-    <skip />
+    <string name="zen_mode_events_title" msgid="5597241655883329085">"允许显示活动"</string>
     <string name="zen_mode_all_callers" msgid="2378065871253871057">"任何人"</string>
     <string name="zen_mode_contacts_callers" msgid="5569804103920394175">"联系人"</string>
     <string name="zen_mode_starred_callers" msgid="1023167821338514140">"已加星标的联系人"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"重复来电者"</string>
-    <!-- no translation found for zen_mode_repeat_callers_title (8553876328249671783) -->
-    <skip />
-    <!-- no translation found for zen_mode_calls_summary_one (3972333792749874863) -->
-    <skip />
+    <string name="zen_mode_repeat_callers_title" msgid="8553876328249671783">"允许显示重复来电者"</string>
+    <string name="zen_mode_calls_summary_one" msgid="3972333792749874863">"来自<xliff:g id="CALLER_TYPE">%1$s</xliff:g>"</string>
     <string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"来自<xliff:g id="CALLER_TYPE">%1$s</xliff:g>和<xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"如果同一个人在 <xliff:g id="MINUTES">%d</xliff:g> 分钟内第二次来电"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"自定义"</string>
@@ -3790,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"冷色温"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"使用较冷的显示颜色"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"要应用颜色更改，请关闭屏幕"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"连接监控器"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"连接监控器会在检测到连接问题时收集相关日志，并向用户发出通知，提醒用户提交错误报告"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"要应用连接监控器的变更内容，请重新启动设备"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"相机激光传感器"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"将 Logical Camera 设置为默认"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"系统自动更新"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"重启设备时应用更新"</string>
     <string name="usage" msgid="2977875522080448986">"流量消耗"</string>
@@ -4103,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"自动填充服务"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"自动, 填充, 自动填充, auto, fill, autofill"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;请确认这是您信任的应用&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt;会根据您的屏幕内容判断可自动填充哪些内容。"</string>
-    <string name="device_theme" msgid="4571803018917608588">"设备主题背景"</string>
+    <string name="color_theme" msgid="1535685696756738324">"色调"</string>
     <string name="default_theme" msgid="7085644992078579076">"默认"</string>
+    <string name="device_theme" msgid="4571803018917608588">"设备主题背景"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"自动（根据壁纸）"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"浅色"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"深色"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"网络名称"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"在状态栏中显示网络名称"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"存储空间管理器：<xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4116,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"运营商配置信息"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"触发运营商配置"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"更新勿扰模式"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"隐藏通知即可保持专注"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"暂停通知即可保持专注"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"新增了哪些精彩功能？"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"新手机功能导览"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"新平板电脑功能导览"</string>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index 5b8a00b..7bb03c6 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"永遠開啟"</item>
     <item msgid="6385301106124765323">"一律關閉"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index ed3dd56..93d8d59 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"允許您的平板電腦與附近的藍牙裝置通訊"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"允許您的裝置與附近的藍牙裝置通訊"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"允許您的手機與附近的藍牙裝置通訊"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"停用藍牙 A2DP 硬件卸載功能"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"要重新啟動裝置嗎？"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"您需要重新啟動裝置，才可變更此設定。"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"重新啟動"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"取消"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"可用的媒體裝置"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"可用的通話裝置"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"目前已連接的裝置"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"連接偏好設定"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"之前已連接的裝置"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"之前已連接的裝置"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"日期和時間"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"選擇時區"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"您所輸入的通訊埠無效。"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"瀏覽器會使用 HTTP Proxy，但其他應用程式未必會採用。"</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC 網址： "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"下載頻寬 (kbps)："</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"上載頻寬 (kbps)："</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"發射站位置資料 (已淘汰)："</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"鄰近發射站資料 (已淘汰)："</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE 實體渠道設定："</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"發射站資料重新整理頻率："</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"所有發射站量度資料："</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"數據連線即時資料："</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"數據服務："</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"漫遊："</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI："</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"自動調整亮度"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"舉起即可喚醒"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"環境顯示"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"永遠開啟/電池用量會增加"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"新通知"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"何時顯示"</string>
     <string name="doze_title" msgid="2375510714460456687">"新通知"</string>
     <string name="doze_summary" msgid="3846219936142814032">"收到通知時喚醒螢幕"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">SIM PIN 碼不正確，您還有 <xliff:g id="NUMBER_0">%d</xliff:g> 次機會輸入。如果仍然輸入錯誤，您必須聯絡流動網絡供應商為您的裝置解鎖。</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM PIN 碼操作失敗！"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"平板電腦狀態"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"手機狀態"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"系統更新"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android 版本"</string>
@@ -2115,8 +2119,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"無法限制背景使用方式"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"要限制背景活動嗎？"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"如果您限制應用程式的背景活動，應用程式可能無法正常運作"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"由於此應用程式並未設定為優化電池，您無法限制其使用。\n\n如要限制應用程式，請先開啟電池優化功能。"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"充滿電後的螢幕用量"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"螢幕耗電量"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"流動網絡掃瞄"</string>
@@ -2438,6 +2441,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"緊急撥號訊號"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"設定撥打緊急電話時的運作方式"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"備份"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"已開啟"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"已關閉"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"備份與還原"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"個人資料"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"備份我的資料"</string>
@@ -2764,6 +2769,12 @@
       <item quantity="one">檢查憑證</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"多個使用者"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"使用者和個人檔案"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"新增使用者或個人檔案"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"新增使用者"</string>
@@ -2946,14 +2957,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"數據用量"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"熱點"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"已連接的裝置"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"藍牙、駕駛模式、NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"藍牙、駕駛模式"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"藍牙、NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"藍牙"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"應用程式和通知"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"權限、預設應用程式"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"帳戶"</string>
@@ -2970,7 +2977,6 @@
     <string name="keywords_home" msgid="294182527446892659">"啟動器, 預設, 應用程式"</string>
     <string name="keywords_display" msgid="8910345814565493016">"螢幕, 觸控螢幕"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"畫面昏暗, 觸控螢幕, 電池, 明亮"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"螢幕變暗, 觸控螢幕, 電池"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"畫面昏暗, 夜間, 色調, 夜更, 亮度, 螢幕色彩, 顏色, 色彩"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"背景, 個人化, 自訂顯示"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"文字大小"</string>
@@ -3011,8 +3017,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"網絡, 流動網絡狀態, 服務狀態, 訊號強度, 流動網絡類型, 漫遊, ICCID"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"序號, 硬件版本"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"Android 安全性修補程式等級, 基頻版本, 核心版本"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"環境顯示，上鎖畫面顯示"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"指紋"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"旋轉, 翻轉, 旋轉, 直向, 橫向, 屏幕定向, 垂直, 水平"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"升級, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"請勿騷擾, 時間表, 通知, 封鎖, 靜音, 震動, 休眠, 工作, 焦點, 音效, 忽略, 天, 平日, 週末, 平日晚上, 活動"</string>
@@ -3095,18 +3105,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"允許視覺訊號"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"開啟「請勿騷擾」模式時"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"通知"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"顯示通知，但不發出任何音效"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"有通知時會靜音"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"無音效通知"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"您會在螢幕上看到通知"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"手機收到通知時不會發出音效或震動。"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"隱藏通知"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"您將不會看到新通知或現有通知"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"無顯示或音效通知"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"您不會看到或聽到通知"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"手機將不會顯示新通知或現有通知，且不會發出音效和震動。當您從螢幕頂部向下滑動時，系統不會顯示通知。\n\n不過，手機活動和狀態的重要通知仍會繼續顯示。"</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"自訂"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"啟用自訂設定"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"移除自訂設定"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"顯示"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"無音效通知"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"隱藏部分通知"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"隱藏"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"無顯示或音效通知"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"自訂限制"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"螢幕開啟時"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"螢幕關閉時"</string>
@@ -3165,19 +3175,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"已設為靜音 (<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>、<xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>和<xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>除外)"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"訊息、活動和提醒"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"開啟「請勿騷擾」模式時，除了您在上方允許的項目外，所有訊息、提醒和活動會設為靜音。您可以調整訊息設定，讓好友、家人或其他聯絡人可以聯絡您。"</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"完成"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"設定"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"無顯示或音效通知"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"無音效通知"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"您不會看到或聽到通知，但允許顯示已加星號的聯絡人和重複來電者的來電。"</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(目前設定)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"要變更「請勿騷擾」通知設定嗎？"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"工作設定檔聲音"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"使用個人設定檔聲音"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"在工作和個人設定檔中使用相同音效"</string>
@@ -3349,10 +3353,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"允許通話"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"開啟「請勿騷擾」模式時，來電會被封鎖。您可以調整設定，讓好友、家人或其他聯絡人可以聯絡您。"</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"已加星號的聯絡人"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">及另外 <xliff:g id="NUM_PEOPLE">%d</xliff:g> 人</item>
-      <item quantity="one">及另外 1 人</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"訊息"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"允許訊息"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"訊息"</string>
@@ -3782,10 +3783,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"冷色色溫"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"使用較冷的顯示器顏色"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"如要套用色溫變更，請先關閉螢幕"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"連線監控工具"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"「連線監控工具」會在偵測到連線問題時收集記錄，並通知使用者提交報告錯誤"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"如要套用「連線監控工具」的變更內容，請重新啟動裝置"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"相機鐳射感應器"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"預設為 Logical Camera"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"自動系統更新"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"裝置重新啟動後套用更新"</string>
     <string name="usage" msgid="2977875522080448986">"用量"</string>
@@ -4095,8 +4094,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"自動填入服務"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"自動, 填入, 自動填入"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;請確定您信任此應用程式&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; 應用程式會根據您畫面上的內容判斷可自動填入的資料。"</string>
-    <string name="device_theme" msgid="4571803018917608588">"裝置主題"</string>
+    <string name="color_theme" msgid="1535685696756738324">"顏色主題"</string>
     <string name="default_theme" msgid="7085644992078579076">"預設"</string>
+    <string name="device_theme" msgid="4571803018917608588">"裝置主題"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"自動 (根據桌布)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"淺色"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"深色"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"網絡名稱"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"在狀態列中顯示網絡名稱"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"儲存空間管理員：<xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4108,7 +4111,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"流動網絡供應商佈建資料"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"觸發流動網絡供應商佈建程序"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"更新請勿騷擾模式"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"隱藏通知，助您保持專注"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"暫停通知，助您保持專注"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"新增了哪些精彩功能？"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"探索您的新手機"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"探索您的新平板電腦"</string>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index dcf15f2..ebed1d9 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"一律開啟"</item>
     <item msgid="6385301106124765323">"一律關閉"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index e66b1e1..af86ea6 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"允許你的平板電腦與附近的藍牙裝置進行通訊"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"允許你的裝置與附近的藍牙裝置進行通訊"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"允許你的手機與附近的藍牙裝置進行通訊"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"停用藍牙 A2DP 硬體卸載"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"要重新啟動裝置嗎？"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"你必須重新啟動裝置才能變更這項設定。"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"重新啟動"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"取消"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"可用的媒體裝置"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"可用的通話裝置"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"目前已連線的裝置"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"連線偏好設定"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"先前連線的裝置"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"先前連線的裝置"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"日期和時間"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"選擇時區"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"你所輸入的通訊埠無效。"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"瀏覽器會使用 HTTP Proxy，但其他應用程式不一定會採用這項設定。"</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC 網址： "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"下行頻寬 (kbps)："</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"上行頻寬 (kbps)："</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"行動網路位置資訊 (已不適用)："</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"鄰近行動網路資訊 (已不適用)："</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"LTE 實體通道設定："</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"行動網路資訊更新頻率："</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"所有行動網路測量資訊："</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"數據連線即時資訊："</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"數據服務："</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"漫遊："</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI："</string>
@@ -1012,7 +1020,7 @@
     <string name="wifi_calling_turn_on" msgid="1171403510313983983">"開啟 Wi-Fi 通話功能"</string>
     <string name="wifi_calling_not_supported" msgid="7878640438907807754">"「%1$s」不支援 Wi-Fi 通話功能"</string>
     <string name="carrier" msgid="5264014738689761132">"電信業者"</string>
-    <string name="display_settings_title" msgid="1708697328627382561">"顯示"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"顯示器"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音效"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"音量"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"音樂效果"</string>
@@ -1063,7 +1071,7 @@
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Work 帳戶 - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_personal_account_title" msgid="2169071663029067826">"個人帳戶 - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="search_settings" msgid="1910951467596035063">"搜尋"</string>
-    <string name="display_settings" msgid="7965901687241669598">"顯示"</string>
+    <string name="display_settings" msgid="7965901687241669598">"顯示器"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"自動旋轉螢幕"</string>
     <string name="color_mode_title" msgid="9186249332902370471">"色彩"</string>
     <string name="color_mode_option_natural" msgid="5013837483986772758">"自然"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"自動調整亮度"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"舉起即可喚醒"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"微光螢幕"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"一律開啟/將增加電池用量"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"新通知"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"顯示時機"</string>
     <string name="doze_title" msgid="2375510714460456687">"新通知"</string>
     <string name="doze_summary" msgid="3846219936142814032">"收到通知時喚醒螢幕"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="one">SIM 卡的 PIN 碼輸入錯誤，你還可以再試 <xliff:g id="NUMBER_0">%d</xliff:g> 次。如果仍然失敗，就必須請電信業者為裝置解鎖。</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM 卡 PIN 碼解鎖失敗！"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"平板電腦狀態"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"手機狀態"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"系統更新"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android 版本"</string>
@@ -1930,7 +1934,7 @@
     <string name="vision_settings_suggestion_title" msgid="8058794060304707004">"變更字型大小"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"螢幕閱讀器"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"音訊和畫面上的文字"</string>
-    <string name="display_category_title" msgid="685461049938269166">"螢幕"</string>
+    <string name="display_category_title" msgid="685461049938269166">"顯示器"</string>
     <string name="interaction_control_category_title" msgid="7836591031872839151">"互動控制項"</string>
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"已下載的服務"</string>
     <string name="experimental_category_title" msgid="5272318666666893547">"實驗性"</string>
@@ -2114,8 +2118,7 @@
     <string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"無法限制背景活動"</string>
     <string name="background_activity_warning_dialog_title" msgid="2216249969149568871">"要限制背景活動嗎？"</string>
     <string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"如果你限制應用程式的背景活動，應用程式可能無法正常運作"</string>
-    <!-- no translation found for background_activity_disabled_dialog_text (6133420589651880824) -->
-    <skip />
+    <string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"由於這個應用程式並未設為最佳化電池用量，因此你無法加以限制。\n\n如要限制應用程式，請先開啟電池效能最佳化功能。"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"上次完全充飽電後的螢幕使用時間"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"螢幕耗電量"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"行動網路掃描作業"</string>
@@ -2439,6 +2442,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"緊急撥號信號"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"設定撥打緊急電話時的運作方式"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"備份"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"開啟"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"關閉"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"備份與還原"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"個人資料"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"備份我的資料"</string>
@@ -2765,6 +2770,12 @@
       <item quantity="one">查看憑證</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"多位使用者"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"使用者和個人資料"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"新增使用者或個人資料"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"新增使用者"</string>
@@ -2947,14 +2958,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"數據用量"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"無線基地台"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"已連結的裝置"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"藍牙，行車模式，NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"藍牙，行車模式"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"藍牙，NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"藍牙"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"應用程式和通知"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"權限、預設應用程式"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"帳戶"</string>
@@ -2971,7 +2978,6 @@
     <string name="keywords_home" msgid="294182527446892659">"啟動器, 預設, 應用程式"</string>
     <string name="keywords_display" msgid="8910345814565493016">"螢幕, 觸控螢幕"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"調暗螢幕, 觸控螢幕, 電池, 明亮"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"調暗螢幕, 觸控螢幕, 電池"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"調暗螢幕, 夜間, 色調, night shift, 亮度, 螢幕色彩, 顏色, 色彩"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"背景, 個人化, 自訂顯示內容"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"文字大小"</string>
@@ -3012,8 +3018,12 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"網路、行動網路狀態、服務狀態、訊號強度、行動網路類型、漫遊、ICCID"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"序號、硬體版本"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"Android 安全性修補程式等級、基頻版本、核心版本"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"微光螢幕, 螢幕鎖定畫面"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"指紋"</string>
+    <!-- no translation found for keywords_display_auto_brightness (4130320471533951796) -->
+    <skip />
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"旋轉, 翻轉, 轉動, 直向, 橫向, 螢幕方向, 垂直, 水平"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"升級, android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"零打擾, 時間表, 通知, 封鎖, 靜音, 震動, 休眠, 工作, 焦點, 音效, 忽略, 天, 週間, 週末, 週間晚上, 活動"</string>
@@ -3096,18 +3106,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"允許視覺信號"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"開啟「零打擾」模式時"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"通知"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"顯示通知，但不發出任何音效"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"有通知時會靜音"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"不發出通知音效"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"你將會在畫面上看到通知"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"手機收到通知時不會發出音效或震動。"</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"隱藏通知"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"你不會看到新通知或現有通知"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"不顯示通知或不發出通知音效"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"你將不會看到通知或聽到通知音效"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"你的手機不會顯示新通知或現有通知，且不會發出音效或震動。當你從螢幕頂端向下滑動時，系統不會顯示通知。\n\n請注意，系統仍會顯示手機活動和狀態的重要通知。"</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"自訂"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"啟用自訂設定"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"移除自訂設定"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"顯示"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"不發出通知音效"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"隱藏部分通知"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"隱藏"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"不顯示通知或不發出通知音效"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"自訂限制"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"螢幕開啟時"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"螢幕關閉時"</string>
@@ -3166,19 +3176,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"已設為靜音 (<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>、<xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>和<xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>除外)"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"訊息、活動和提醒"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"開啟「零打擾」模式時，系統會將訊息、提醒和活動設為靜音 (你在上方允許的項目除外)。你可以調整訊息設定，讓好友、家人或其他聯絡人可以聯絡你。"</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"完成"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"設定"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"不顯示通知或不發出通知音效"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"不發出通知音效"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"你將不會看到或聽到通知。允許已加星號的聯絡人和重複來電者的來電。"</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(目前設定)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"要變更「零打擾」模式的通知設定嗎？"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"工作資料夾音效"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"使用個人設定檔音效"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"工作資料夾和個人設定檔使用相同的音效"</string>
@@ -3350,10 +3354,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"允許進行通話"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"開啟「零打擾」模式時，系統會封鎖來電。你可以調整設定，讓好友、家人或其他聯絡人可以聯絡你。"</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"已加星號的聯絡人"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="other">和另外 <xliff:g id="NUM_PEOPLE">%d</xliff:g> 人</item>
-      <item quantity="one">和另外 1 人</item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"訊息"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"允許顯示訊息"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"訊息"</string>
@@ -3783,10 +3784,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"冷色溫"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"使用較冷的顯示器色溫"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"如要套用色溫變更設定，請關閉螢幕"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Connectivity Monitor"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"Connectivity Monitor 會在偵測到連線問題時收集相關記錄，並顯示通知方便使用者回報錯誤"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"如要套用 Connectivity Monitor 的變更內容，請重新啟動裝置"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"相機雷射感應器"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"將 Logical Camera 設為預設"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"自動系統更新"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"裝置重新啟動後套用更新"</string>
     <string name="usage" msgid="2977875522080448986">"使用情況"</string>
@@ -4096,8 +4095,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"自動填入服務"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"自動、填入、自動填入"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;請確定這是你信任的應用程式&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt;應用程式會根據你的畫面內容判斷要自動填入的內容。"</string>
-    <string name="device_theme" msgid="4571803018917608588">"裝置主題"</string>
+    <string name="color_theme" msgid="1535685696756738324">"色彩主題"</string>
     <string name="default_theme" msgid="7085644992078579076">"預設"</string>
+    <string name="device_theme" msgid="4571803018917608588">"裝置主題"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"自動 (根據桌布)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"淺色"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"深色"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"網路名稱"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"在狀態列顯示網路名稱"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"儲存空間管理員：<xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4109,7 +4112,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"電信業者佈建資訊"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"觸發電信業者佈建程序"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"更新「零打擾」模式"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"隱藏通知以便集中注意力"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"暫停通知以保持專注"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"有什麼新奇功能？"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"認識你的新手機"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"認識你的新平板電腦"</string>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index bbff624..93cc79d 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -100,6 +100,12 @@
     <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
     <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->
+    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->
+  <string-array name="wifi_tether_security_values">
+    <item msgid="2252927183588236198">"4"</item>
+    <item msgid="5900372418924184351">"0"</item>
+  </string-array>
     <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
     <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
     <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
@@ -486,4 +492,7 @@
     <item msgid="6620560879508595181">"Ihlala ivuliwe"</item>
     <item msgid="6385301106124765323">"Ihlala ivaliwe"</item>
   </string-array>
+    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->
+    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->
+    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 29024d4..2c22482 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -173,6 +173,11 @@
     <string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Vumela ithebhulethi yakho ukuxhumana namadivayisi e-Bluetooth aseduze"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Vumela idivayisi yakho ukuxhumana namadivayisi aseduze e-Bluetooth"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Vumela ifoni yakho ukuxhumana namadivayisi aseduze e-Bluetooth"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload" msgid="4936610906348223810">"Khubaza i-Bluetooth A2DP hardware offload"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="4340101417209145308">"Qalisa kabusha idivayisi?"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="8827019472003234568">"Udinga ukuqalisa kabusha idivayisi yakho ukushintsha lesi silungiselelo."</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Qala kabusha"</string>
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Khansela"</string>
     <string name="connected_device_available_media_title" msgid="2560067541413280645">"Amadivayisi atholakalayo emidiya"</string>
     <string name="connected_device_available_call_title" msgid="697154660967595684">"Amadivayisi atholakalayo ekholi"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Kuxhunyiwe manje"</string>
@@ -182,6 +187,8 @@
     <string name="connected_device_connections_title" msgid="5988939345181466770">"Izinketho zoxhumo"</string>
     <string name="connected_device_previously_connected_title" msgid="491765792822244604">"Amadivayisi axhunywe ngaphambilini"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Kuxhunywe ngaphambilini"</string>
+    <!-- no translation found for connected_device_bluetooth_turned_on_toast (5683648191381637533) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Idethi nesikhathi"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Khetha isikhathi sendawo"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -207,11 +214,12 @@
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"Imbobo oyithayiphile ayilungile."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Iphrokzi ye-HTTP isetshenziswa isiphequluli kodwa kungenzeka ingasetshenziswa ezinye izinhlelo zokusebenza"</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"I-PAC URL: "</string>
+    <string name="radio_info_dl_kbps" msgid="6894556071523815984">"Umkhawulokudonsa we-DL (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="946464073571185678">"Umkhawulokudonsa we-UL (kbps):"</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"Ulwazi lwendawo lweseli (kwehlisiwe):"</string>
-    <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"Ulwazi lweseli yomakhelwane (kwehlisiwe):"</string>
+    <string name="radio_info_phy_chan_config" msgid="7133247058801474028">"Ukulungiselelwa okuphathekayo kwesiteshi se-LTE:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"Isilinganiso sokuqalisa kabusha solwazi lweseli:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"Ulwazi lwesilinganiso seseli:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"Ulwazi lwesikhathi samanje soxhumo lwedatha:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Isevisi yedatha:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Ukuzulazula:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -1146,8 +1154,6 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"Ukukhanya okuzenzakalelayo"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ilifti yokuvuka"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"Isibonisi esi-Ambient"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Njalo kuvuliwe / Ukusetshenziswa kwebhethri okungeziwe"</string>
-    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Izaziso ezintsha"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kuboniswa nini"</string>
     <string name="doze_title" msgid="2375510714460456687">"Izaziso ezintsha"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Vusa isikrini uma uthola izaziso"</string>
@@ -1192,8 +1198,6 @@
       <item quantity="other">Ikhodi engalungile yephinikhodi ye-SIM, unemizamo engu-<xliff:g id="NUMBER_1">%d</xliff:g> esele.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Umsebenzi wephinikhodi ye-SIM wehlulekile!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Isimo sethebhulethi"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"Umumo wefoni"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Izibuyekezo zesistimu"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Inguqulo ye-Android"</string>
@@ -2435,6 +2439,8 @@
     <string name="emergency_tone_title" msgid="254495218194925271">"Isignali yokudayela isimo esiphuthumayo"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Hlela ukuziphatha lapho ikholi oluphuthumayo lwenziwa"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Sekela ngokulondoloza"</string>
+    <string name="backup_summary_state_on" msgid="6407084627816231202">"Vuliwe"</string>
+    <string name="backup_summary_state_off" msgid="7388321532624105594">"Valiwe"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Isipele ukubuyiselwa"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Idatha yomuntu siqu"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Sekela ngokulondoloza idatha yami"</string>
@@ -2761,6 +2767,12 @@
       <item quantity="other">Hlola izitifiketi</item>
     </plurals>
     <string name="user_settings_title" msgid="3493908927709169019">"Abasebenzisi abaningi"</string>
+    <!-- no translation found for user_settings_footer_text (5947601460660791129) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2153761434649733502) -->
+    <skip />
+    <!-- no translation found for user_settings_footer_text (2844602828189838075) -->
+    <skip />
     <string name="user_list_title" msgid="7937158411137563543">"Abasebenzisi namaphrofayela"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Engeza umsebenzisi noma iphrofayela"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Engeza umsebenzisi"</string>
@@ -2943,14 +2955,10 @@
     <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ukusetshenziswa kwedatha"</string>
     <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"i-hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Amadivayisi axhunyiwe"</string>
-    <!-- no translation found for connected_devices_dashboard_summary (2665221896894251402) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_nfc_summary (3840842725283655533) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_summary (5018708106066758867) -->
-    <skip />
-    <!-- no translation found for connected_devices_dashboard_no_driving_mode_no_nfc_summary (5250078362483148199) -->
-    <skip />
+    <string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"I-Bluetooth, imodi yokushayela, i-NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="3840842725283655533">"I-Bluetooth, imodi yokushayela"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="5018708106066758867">"I-Bluetooth, i-NFC"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"I-Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Izinhlelo zokusebenza nezaziso"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Izimvume, izinhlelo zokusebenza ezienzakalelayo"</string>
     <string name="account_dashboard_title" msgid="5895948991491438911">"Ama-akhawunti"</string>
@@ -2967,7 +2975,6 @@
     <string name="keywords_home" msgid="294182527446892659">"isiqalisi, izinhlelo zokusebenza ezizenzakalelayo"</string>
     <string name="keywords_display" msgid="8910345814565493016">"isikrini, isikrini esithintwayo"</string>
     <string name="keywords_display_brightness_level" msgid="3138350812626210404">"fiphaza isikrini, isikrini esithintwayo, ibhethri, kuyakhanya"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"fiphalisa isikrini, isikrini esithintwayo, ibhethri"</string>
     <string name="keywords_display_night_display" msgid="2534032823231355074">"fiphaza isikrini, ubusuku, i-tint, ebusuku, ukukhanya, umbala wesikrini, umbala wesikrini, umbala, umbala"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"ingemuva, yenza kube ngokwakho, enza ngendlela oyifisayo isibonisi"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"usayizi wombhalo"</string>
@@ -3008,8 +3015,11 @@
     <string name="keywords_sim_status" msgid="1474422416860990564">"inethiwekhi, isimo senethiwekhi yeselula, isimo sesevisi, amandla esignali, uhlobo lwenethiwekhi yeselula, ukuzula, i-iccid"</string>
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"inombolo yomkhiqizo, inguqulo yehadiwe"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"ileveli yepeshi yokuvikelwa kwe-android, inguqulo ye-baseband, inguqulo ye-kernel"</string>
+    <!-- no translation found for keywords_device_feedback (564493721125966719) -->
+    <skip />
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Isibonisi se-Ambient, isibonisi sesikrini sokukhiya"</string>
     <string name="keywords_fingerprint_settings" msgid="239222512315619538">"izigxivizo zeminwe"</string>
+    <string name="keywords_display_auto_brightness" msgid="4130320471533951796">"fiphalisa isikrini, isikrini esithintwayo, ibhethri, ukukhanya okuhlakaniphile, ukukhanya okuguqukayo"</string>
     <string name="keywords_auto_rotate" msgid="5620879898668211494">"zungezisa, phenya, ukupendukisa, i-portrait, i-landscape, umumo, okuqondile, okuvundlile"</string>
     <string name="keywords_system_update_settings" msgid="7752189778843741773">"thuthukisa, i-android"</string>
     <string name="keywords_zen_mode_settings" msgid="6526742836231604995">"i-dnd, ishejuli, izaziso, vimbela, thulisa, ukudlidliza, ukulala, ukusebenza, ukugxila, umsindo, thulisa, nsukuzonke, bonke ubusuko, umculo"</string>
@@ -3092,18 +3102,18 @@
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Vumela amasignali okubuka"</string>
     <string name="zen_mode_settings_category" msgid="3982039687186952865">"Uma kuvulwe okuthi Ungaphazamisi"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"Izaziso"</string>
-    <string name="zen_mode_restrict_notifications_mute" msgid="8649062661635246283">"Bonisa izaziso ngokuthulile"</string>
-    <string name="zen_mode_restrict_notifications_mute_summary" msgid="8450964969807231275">"Izaziso zizothuliswa"</string>
+    <string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Awukho umsindo kusukela kuzaziso"</string>
+    <string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Uzobona izaziso kusikrini sakho"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Uma kufika izaziso, ifoni yakho ngeke yenze umsindo noma idlidlize."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="9070829387109283980">"Fihla izaziso"</string>
-    <string name="zen_mode_restrict_notifications_hide_summary" msgid="3832808022882158781">"Ngeke ubone izaziso ezintsha noma ezikhona"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Akukho okubonakalayo noma umsindo kusukela kuzaziso"</string>
+    <string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Ngeke ubone noma uzwe izaziso"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Ifoni yakho ngeke ibonise izaziso ezilandelayo noma ezikhona, futhi ngeke yenze umsindo noma idlidlizele. Izaziso ngeke zivele uma uswayiphela phansi kusukela phezulu kwesikrini sakho.\n\nKhumbula, izaziso ezibalulekile zomsebenzi wefoni nesimo zisazovela."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Ngokwezifiso"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4250962169561739747">"Nika amandla isilungiselelo sangokwezifiso"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Susa isilungiselelo sangokwezifiso"</string>
-    <string name="zen_mode_restrict_notifications_summary_muted" msgid="4678779044896459009">"Zizovela"</string>
+    <string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Awukho umsindo kusukela kuzaziso"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Kufihlwe kancane"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7805339105802282234">"Afihliwe"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Akukho okubonakalayo noma umsindo kusukela kuzaziso"</string>
     <string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Ukukhawulelwa kwangokwezifiso"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Uma isikrini sivulekile"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Uma isikrini sivalekile"</string>
@@ -3162,19 +3172,13 @@
     <string name="zen_sound_three_allowed" msgid="3455767205934547985">"Kuthulisiwe, kodwa vumela i-<xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g>, ne-<xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>"</string>
     <string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Imilayezo, imicimbi nezikhumbuzi"</string>
     <string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Uma kuvulwe ukungaphazamisi, imilayezo, izikhumbuzi, nemicimbi izothuliswa ngaphandle kwezinto ozivumela ngaphezulu. Ungalungisa izilungiselelo zemilayezo ukuze uvumele abangani bakho, umndeni, noma abanye oxhumana nabo bafinyelele kuwe."</string>
-    <!-- no translation found for zen_onboarding_ok (6131211000824433013) -->
-    <skip />
+    <string name="zen_onboarding_ok" msgid="6131211000824433013">"Kwenziwe"</string>
     <string name="zen_onboarding_settings" msgid="9046451821239946868">"Izilungiselelo"</string>
-    <!-- no translation found for zen_onboarding_new_setting_title (3311718322273907394) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_title (776426065129609376) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_new_setting_summary (6293026064871880706) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_current_setting_summary (1280614488924843713) -->
-    <skip />
-    <!-- no translation found for zen_onboarding_dnd_visual_disturbances_header (1352808651270918932) -->
-    <skip />
+    <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Akukho okubonakalayo noma umsindo kusukela kuzaziso"</string>
+    <string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Awukho umsindo kusukela kuzaziso"</string>
+    <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Ngeke ubone noma uzwe izaziso. Amakholi kusukela koxhumana nabo abafakwe inkanyezi nabafonayo abaphindiwe avunyelwe."</string>
+    <string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Isilungiselelo samanje)"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Shintsha izilungiselelo zokwazisa zokungaphazamisi?"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Imisindo yephrofayela yomsebenzi"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Sebenzisa imisindo yephrofayela yomuntu siqu"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Imisindo iyefana yomsebenzi namaphrofayela omuntu siqu"</string>
@@ -3346,10 +3350,7 @@
     <string name="zen_mode_calls_title" msgid="623395033931747661">"Vumela amakholi"</string>
     <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Uma kuvulwe ukungaphazamisi, amakholi angenayo ayavinjelwa. Ungalungisa izilungiselelo ukuze uvumele abangani bakho, umndeni, noma abanye oxhumana nabo ukuze bakufinyelele."</string>
     <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Oxhumana nabo abafakwe inkanyezi"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="6748832187598909961">
-      <item quantity="one">nabanye abangu-<xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="other">nabanye abangu-<xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-    </plurals>
+    <!-- no translation found for zen_mode_starred_contacts_summary_additional_contacts (500105380255018671) -->
     <string name="zen_mode_messages" msgid="5886440273537510894">"Imilayezo"</string>
     <string name="zen_mode_messages_title" msgid="7729380010396411129">"Vumela imilayezo"</string>
     <string name="zen_mode_all_messages" msgid="8257021584561639816">"Imilayezo"</string>
@@ -3779,10 +3780,8 @@
     <string name="color_temperature" msgid="2070126836910615605">"Ithempelesha yombala opholile"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Sebenzisa imibala yesibonisi esipholile"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"Ukuze usebenzise ukushintshwa kombala, vala isikrini"</string>
-    <string name="connectivity_monitor_switch" msgid="9059759348648583421">"Isingameli sokuxhuma"</string>
-    <string name="connectivity_monitor_switch_summary" msgid="2828658652378866401">"I-ConnectivityMonitor izoqoqa amalogo uma ithola inkinga yokuxhuma nesaziso somyalo kumsebenzisi ukufayela sesiphazamisi"</string>
-    <string name="connectivity_monitor_toast" msgid="5551859612881173028">"Ukuze usebenzise ushintsho lokuqapha ifoni, qalisa kabusha idivayisi"</string>
     <string name="camera_laser_sensor_switch" msgid="8913588990743234440">"Inzwa ye-Laser yekhamera"</string>
+    <string name="logical_camera_default_switch" msgid="3310039627275112685">"Ikhamera eqondile njengokuzenzakalelayo"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Izibuyekezo zesistimu ezenzakalelayo"</string>
     <string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Faka izibuyekezo uma idivayisi iqalisa kabusha"</string>
     <string name="usage" msgid="2977875522080448986">"Ukusetshenziswa"</string>
@@ -4092,8 +4091,12 @@
     <string name="autofill_app" msgid="7338387238377914374">"Isevisi yokugcwalisa ngokuzenzakalela"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"okuzenzakalelayo, gcwalisa, ukugcwalisa okuzenzakalelayo"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Qiniseka ukuthi wethemba lolu hlelo lokusebenza&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; isebenzisa okusesikrinini sakho ukunquma okungagcwaliswa ngokuzenzakalela."</string>
-    <string name="device_theme" msgid="4571803018917608588">"Itimu yedivayisi"</string>
+    <string name="color_theme" msgid="1535685696756738324">"Itimu yombala"</string>
     <string name="default_theme" msgid="7085644992078579076">"Okuzenzakalelayo"</string>
+    <string name="device_theme" msgid="4571803018917608588">"Itimu yedivayisi"</string>
+    <string name="systemui_theme_wallpaper" msgid="5658521610680281172">"Okuzenzakalelayo (kusukela kusithombe sangemuva)"</string>
+    <string name="systemui_theme_light" msgid="7519689709659152866">"Ukukhanya"</string>
+    <string name="systemui_theme_dark" msgid="8708733503912628456">"Emnyama"</string>
     <string name="show_operator_name_title" msgid="805135053530442951">"Igama lenethiwekhi"</string>
     <string name="show_operator_name_summary" msgid="5962567590205757550">"Bonisa igama lenethiwekhi kwibha yesimo"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Umphathi wesitolo: <xliff:g id="STATUS">^1</xliff:g>"</string>
@@ -4105,7 +4108,7 @@
     <string name="carrier_provisioning" msgid="4398683675591893169">"Ulwazi lokuhlinzeka lenkampani yenethiwekhi"</string>
     <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Cupha ukunikezwa kwenkampani yenethiwekhi"</string>
     <string name="zen_suggestion_title" msgid="798067603460192693">"Buyekeza okuthi ungaphazamisi"</string>
-    <string name="zen_suggestion_summary" msgid="4573237195296808909">"Fihla izaziso ukuze uhlale ugxilile"</string>
+    <string name="zen_suggestion_summary" msgid="5928686804697233014">"Misa isikhashana izikhangiso ukuze uhlale ugxilile"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Yini okusha nokujabulisayo?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Thatha uhambo lwefoni yakho entsha"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Thatha uhambo kuthebulethi yakho entsha"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 6c4f300..37462f9 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -230,6 +230,22 @@
         <item translatable="false">@string/wifi_security_psk_generic</item>
     </string-array>
 
+    <!-- Security types for wireless tether -->
+    <string-array name="wifi_tether_security">
+        <!-- Do not translate. -->
+        <item>@string/wifi_security_wpa2</item>
+        <!-- Do not translate. -->
+        <item>@string/wifi_security_none</item>
+    </string-array>
+
+    <!-- Values for security type for wireless tether -->
+    <string-array name="wifi_tether_security_values">
+        <!-- Do not translate. -->
+        <item>4</item>
+        <!-- Do not translate. -->
+        <item>0</item>
+    </string-array>
+
     <!-- Match this with the constants in WifiDialog. --> <skip />
     <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
     <string-array name="wifi_eap_method" translatable="false">
@@ -1080,6 +1096,20 @@
         <item>no</item>
     </string-array>
 
+    <!-- Titles for SystemUI theme preference. -->
+    <string-array name="systemui_theme_entries" >
+        <item>@string/systemui_theme_wallpaper</item>
+        <item>@string/systemui_theme_light</item>
+        <item>@string/systemui_theme_dark</item>
+    </string-array>
+
+    <!-- Values for SystemUI theme preference. -->
+    <string-array name="systemui_theme_values" translatable="false" >
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
     <string-array name="gesture_prevent_ringing_entries" translatable="false">
         <item>@string/prevent_ringing_option_vibrate</item>
         <item>@string/prevent_ringing_option_mute</item>
diff --git a/res/values/bools.xml b/res/values/bools.xml
index 29de06b..fa57b29 100644
--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -58,7 +58,7 @@
     <bool name="config_show_toggle_airplane">true</bool>
 
     <!-- Whether memory from app_info_settings is available or not. -->
-    <bool name="config_show_app_info_settings_memory">true</bool>
+    <bool name="config_show_app_info_settings_memory">false</bool>
 
     <!-- Whether battery from app_info_settings is available or not. -->
     <bool name="config_show_app_info_settings_battery">true</bool>
diff --git a/res/values/config.xml b/res/values/config.xml
index e204b7f..0a73307 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -38,9 +38,6 @@
     <!-- When true enable color temperature setting. -->
     <bool name="config_enableColorTemperature">false</bool>
 
-    <!-- Whether to show Connectivity Monitor switch in Developer Options -->
-    <bool name="config_show_connectivity_monitor">false</bool>
-
     <!-- Whether to show Camera laser sensor switch in Developer Options -->
     <bool name="config_show_camera_laser_sensor">false</bool>
 
@@ -134,4 +131,9 @@
     <!-- Whether or not to show the night light suggestion. -->
     <bool name="config_night_light_suggestion_enabled">true</bool>
 
+    <!-- Whether or not the device is capable of multiple levels of vibration intensity.
+         Note that this is different from whether it can control the vibration amplitude as some
+         devices will be able to vary their amplitude but do not possess enough dynamic range to
+         have distinct intensity levels -->
+    <bool name="config_vibration_supports_multiple_intensities">false</bool>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c7e5436..e64bd87 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -402,6 +402,17 @@
     <!-- Summary for bluetooth item in connection detail page. (phone)-->
     <string name="bluetooth_pref_summary" product="default">Allow your phone to communicate with nearby Bluetooth devices</string>
 
+    <!-- UI debug setting: Disable Bluetooth A2DP hardware offload [CHAR LIMIT=40] -->
+    <string name="bluetooth_disable_a2dp_hw_offload">Disable Bluetooth A2DP hardware offload</string>
+    <!-- UI debug setting: Disable Bluetooth A2DP hardware offload [CHAR LIMIT=20] -->
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_title">Restart Device?</string>
+    <!-- UI debug setting: Disable Bluetooth A2DP hardware offload [CHAR LIMIT=60] -->
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_message">You need to restart your device to change this setting.</string>
+    <!-- UI debug setting: Disable Bluetooth A2DP hardware offload [CHAR LIMIT=10] -->
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm">Restart</string>
+    <!-- UI debug setting: Disable Bluetooth A2DP hardware offload [CHAR LIMIT=10] -->
+    <string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel">Cancel</string>
+
     <!-- Title for Bluetooth device group with media capability group [CHAR LIMIT=none]-->
     <string name="connected_device_available_media_title">Available media devices</string>
     <!-- Title for Bluetooth device group with media capability group [CHAR LIMIT=none]-->
@@ -420,6 +431,8 @@
     <string name="connected_device_previously_connected_title">Previously connected devices</string>
     <!-- Preference screen title for Bluetooth preference to open paired but no connection list [CHAR LIMIT=none]-->
     <string name="connected_device_previously_connected_screen_title">Previously connected</string>
+    <!-- Toast text for hint user bluetooth is turned on [CHAR LIMIT=none]-->
+    <string name="connected_device_bluetooth_turned_on_toast">Bluetooth turned on</string>
 
     <!-- Date & time settings screen title -->
     <string name="date_and_time">Date &amp; time</string>
@@ -480,16 +493,12 @@
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_signal_location_label">Cell Location Info (deprecated):</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_neighboring_location_label">Neighbor Cell Info (deprecated):</string>
-    <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_phy_chan_config">LTE Physical Channel Configuration:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_cell_info_refresh_rate">Cell Info Refresh Rate:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_cellinfo_label">All Cell Measurement Info:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_dcrtinfo_label">Data Connection Real-Time Info:</string>
-    <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_gprs_service_label">Data Service:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_roaming_label">Roaming:</string>
@@ -2740,11 +2749,6 @@
     <!-- Instructions telling the user that the operation to unlock the keyguard with SIM PIN failed. Displayed in one line in a large font.  [CHAR LIMIT=40] -->
     <string name="pin_failed">SIM PIN operation failed!</string>
 
-    <!-- Advanced (used for diagnostics) device info activity title [CHAR LIMIT=40] -->
-    <string name="device_info_settings" product="tablet">Tablet status</string>
-    <!-- Advanced (used for diagnostics) device info activity title [CHAR LIMIT=40] -->
-    <string name="device_info_settings" product="default">Phone status</string>
-
     <!-- About phone screen, list item title.  Takes the user to the screen for seeing and installing system updates. [CHAR LIMIT=40] -->
     <string name="system_update_settings_list_item_title">System updates</string>
     <!-- About phone screen, list item summary.  Takes the user to the screen for seeing and installing system updates. [CHAR LIMIT=40] -->
@@ -6403,11 +6407,15 @@
         <item quantity="other">Check certificates</item>
     </plurals>
 
-    <!-- User settings -->
-    <skip/>
-
     <!-- User settings screen title [CHAR LIMIT=40] -->
     <string name="user_settings_title">Multiple users</string>
+    <!-- User settings screen footer text [CHAR LIMIT=NONE] -->
+    <string name="user_settings_footer_text" product="device">Share your device by adding new users. Each user has a personal space on your device for custom Home screens, accounts, apps, settings, and more.</string>
+    <!-- User settings screen footer text [CHAR LIMIT=NONE] -->
+    <string name="user_settings_footer_text" product="tablet">Share your tablet by adding new users. Each user has a personal space on your tablet for custom Home screens, accounts, apps, settings, and more.</string>
+    <!-- User settings screen footer text [CHAR LIMIT=NONE] -->
+    <string name="user_settings_footer_text" product="default">Share your phone by adding new users. Each user has a personal space on your phone for custom Home screens, accounts, apps, settings, and more.</string>
+
     <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
     <string name="user_list_title">Users &amp; profiles</string>
     <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -6948,7 +6956,6 @@
     <string name="keywords_home">launcher, default, apps</string>
     <string name="keywords_display">screen, touchscreen</string>
     <string name="keywords_display_brightness_level">dim screen, touchscreen, battery, bright</string>
-    <string name="keywords_display_auto_brightness">dim screen, touchscreen, battery</string>
     <string name="keywords_display_night_display">dim screen, night, tint, night shift, brightness, screen color, colour, color</string>
     <string name="keywords_display_wallpaper">background, personalize, customize display</string>
     <string name="keywords_display_font_size">text size</string>
@@ -6989,11 +6996,18 @@
     <string name="keywords_sim_status">network, mobile network state, service state, signal strength, mobile network type, roaming, iccid</string>
     <string name="keywords_model_and_hardware">serial number, hardware version</string>
     <string name="keywords_android_version">android security patch level, baseband version, kernel version</string>
+
+    <!-- Search keyword for Send Device Feedback Setting [CHAR LIMIT=NONE] -->
+    <string name="keywords_device_feedback">bug</string>
+
     <!-- Search keyword for Ambient display settings screen. -->
     <string name="keywords_ambient_display_screen">Ambient display, Lock screen display</string>
     <!-- Search keyword for fingerprint settings. -->
     <string name="keywords_fingerprint_settings">fingerprint</string>
 
+    <!-- Search keywords for adaptive brightness setting [CHAR LIMIT=NONE]-->
+    <string name="keywords_display_auto_brightness">dim screen, touchscreen, battery, smart brightness, dynamic brightness</string>
+
     <!-- List of synonyms for the auto rotate (rotate the virtual display when the device rotates) setting, used to match in settings search [CHAR LIMIT=NONE] -->
     <string name="keywords_auto_rotate">rotate, flip, rotation, portrait, landscape, orientation, vertical, horizontal</string>
 
@@ -7237,15 +7251,15 @@
     <!-- Do not disturb: restrict notifications title [CHAR LIMIT=60] -->
     <string name="zen_mode_restrict_notifications_title">Notifications</string>
     <!-- Do not disturb: Mute notifications option [CHAR LIMIT=60] -->
-    <string name="zen_mode_restrict_notifications_mute">Show notifications silently</string>
+    <string name="zen_mode_restrict_notifications_mute">No sound from notifications</string>
     <!-- Do not disturb:Mute notifications summary [CHAR LIMIT=NONE] -->
-    <string name="zen_mode_restrict_notifications_mute_summary">Notifications will be muted</string>
+    <string name="zen_mode_restrict_notifications_mute_summary">You will see notifications on your screen</string>
     <!-- Do not disturb:Mute notifications footer [CHAR LIMIT=NONE] -->
     <string name="zen_mode_restrict_notifications_mute_footer">When notifications arrive, your phone won\u2019t make a sound or vibrate.</string>
-    <!-- Do not disturb: Hide notifications option [CHAR LIMIT=60] -->
-    <string name="zen_mode_restrict_notifications_hide">Hide notifications</string>
+    <!-- Do not disturb: Hide notifications option [CHAR LIMIT=76] -->
+    <string name="zen_mode_restrict_notifications_hide">No visuals or sound from notifications</string>
     <!-- Do not disturb: Hide notifications summary [CHAR LIMIT=NONE] -->
-    <string name="zen_mode_restrict_notifications_hide_summary">You won\u2019t see new or existing notifications</string>
+    <string name="zen_mode_restrict_notifications_hide_summary">You won\u2019t see or hear notifications</string>
     <!-- Do not disturb: Hide notifications footer [CHAR LIMIT=NONE] -->
     <string name="zen_mode_restrict_notifications_hide_footer">Your phone won\u2019t show new or existing notifications, and won\u2019t make a sound or vibrate. Notifications won\u2019t appear when you swipe down from the top of your screen.\n\nKeep in mind, critical notifications for phone activity and status will still appear.</string>
     <!-- Do not disturb: Custom settings option [CHAR LIMIT=60] -->
@@ -7255,11 +7269,11 @@
     <!-- Do not disturb: restrict notifications page, menu option [CHAR LIMIT=60] -->
     <string name="zen_mode_restrict_notifications_disable_custom">Remove custom setting</string>
     <!-- Do not disturb: restrict notifications page, menu option [CHAR LIMIT=60] -->
-    <string name="zen_mode_restrict_notifications_summary_muted">Will appear</string>
+    <string name="zen_mode_restrict_notifications_summary_muted">No sound from notifications</string>
     <!-- Do not disturb: restrict notifications page, menu option [CHAR LIMIT=60] -->
     <string name="zen_mode_restrict_notifications_summary_custom">Partially hidden</string>
-    <!-- Do not disturb: restrict notifications page, menu option [CHAR LIMIT=60] -->
-    <string name="zen_mode_restrict_notifications_summary_hidden">Hidden</string>
+    <!-- Do not disturb: restrict notifications page, menu option [CHAR LIMIT=100] -->
+    <string name="zen_mode_restrict_notifications_summary_hidden">No visuals or sound from notifications</string>
 
     <!-- Do not disturb: what to block title [CHAR LIMIT = 60] -->
     <string name="zen_mode_what_to_block_title">Custom restrictions</string>
@@ -7402,7 +7416,7 @@
     <string name="zen_onboarding_settings">Settings</string>
 
     <!-- Do not disturb onboarding dialog, title for radio button [CHAR LIMIT=80]-->
-    <string name="zen_onboarding_new_setting_title">No visuals or sounds from notifications</string>
+    <string name="zen_onboarding_new_setting_title">No visuals or sound from notifications</string>
     <!-- Do not disturb onboarding dialog, title for radio button [CHAR LIMIT=80]-->
     <string name="zen_onboarding_current_setting_title">No sound from notifications</string>
     <!-- Do not disturb onboarding dialog, secondary text for radio button [CHAR LIMIT=NONE]-->
@@ -7946,8 +7960,8 @@
 
     <!-- Zen mode settings: Starred contacts summary [CHAR LIMIT=NONE] -->
     <plurals name="zen_mode_starred_contacts_summary_additional_contacts">
-        <item quantity="one">and 1 other</item>
-        <item quantity="other">and <xliff:g id="num_people" example="3">%d</xliff:g> others</item>
+        <item quantity="one">1 other</item>
+        <item quantity="other"><xliff:g id="num_people" example="3">%d</xliff:g> others</item>
     </plurals>
 
     <!-- [CHAR LIMIT=20] Zen mode settings: Messages option -->
@@ -9088,15 +9102,6 @@
     <!-- Toast message letting the user know the color temperature setting is not immediate -->
     <string name="color_temperature_toast">To apply color change, turn off screen</string>
 
-    <!-- UI debug setting: title for ConnectivityMonitor switch [CHAR LIMIT=50] -->
-    <string name="connectivity_monitor_switch">Connectivity Monitor</string>
-
-    <!-- UI debug setting: summary for switch of ConnectivityMonitor [CHAR LIMIT=500] -->
-    <string name="connectivity_monitor_switch_summary">ConnectivityMonitor will collect logs when it detects a connectivity problem and prompt notification to user to file a bug</string>
-
-    <!-- Toast message letting the user know the how to apply connectivity monitor change -->
-    <string name="connectivity_monitor_toast">To apply connectivity monitor change, reboot device</string>
-
     <!-- Title for Camera laser sensor switch [CHAR LIMIT=NONE] -->
     <string name="camera_laser_sensor_switch">Camera Laser Sensor</string>
 
@@ -9856,12 +9861,21 @@
     </string>
 
     <!-- Name of setting for switching device theme [CHAR LIMIT=60] -->
-    <string name="device_theme">Device theme</string>
+    <string name="color_theme">Color theme</string>
     <!-- Name of default device theme [CHAR LIMIT=60] -->
     <string name="default_theme">Default</string>
     <!-- Temporary reboot string, will be removed -->
     <string name="change_theme_reboot" translatable="false">Changing the theme requires a restart.</string>
 
+    <!-- Name of setting for switching the SystemUI theme [CHAR LIMIT=60] -->
+    <string name="device_theme">Device theme</string>
+    <!-- When SystemUI theme is chosen based on the wallpaper color [CHAR LIMIT=60] -->
+    <string name="systemui_theme_wallpaper">Automatic (based on wallpaper)</string>
+    <!-- When SystemUI theme is light [CHAR LIMIT=60] -->
+    <string name="systemui_theme_light">Light</string>
+    <!-- When SystemUI theme is dark [CHAR LIMIT=60] -->
+    <string name="systemui_theme_dark">Dark</string>
+
     <!-- Switch label to show operator name in the status bar [CHAR LIMIT=60] -->
     <string name="show_operator_name_title">Network name</string>
     <!-- Switch summary to show operator name in the status bar [CHAR LIMIT=NONE] -->
@@ -9906,7 +9920,7 @@
     <string name="zen_suggestion_title">Update Do Not Disturb</string>
 
     <!-- Summary label for dnd suggestion, which is displayed in Settings homepage [CHAR LIMIT=100] -->
-    <string name="zen_suggestion_summary">Hide notifications to stay focused</string>
+    <string name="zen_suggestion_summary">Pause notifications to stay focused</string>
 
     <!-- Title label for new device suggestion, which is displayed in Settings homepage [CHAR LIMIT=100] -->
     <string name="new_device_suggestion_title">What\'s new and exciting?</string>
diff --git a/res/xml/app_default_settings.xml b/res/xml/app_default_settings.xml
index da4a33a..3b7c80b 100644
--- a/res/xml/app_default_settings.xml
+++ b/res/xml/app_default_settings.xml
@@ -76,7 +76,7 @@
     <com.android.settings.widget.AppPreference
         android:key="domain_urls"
         android:title="@string/domain_urls_title"
-        android:fragment="com.android.settings.applications.ManageDomainUrls"
+        android:fragment="com.android.settings.applications.managedomainurls.ManageDomainUrls"
         settings:keywords="@string/keywords_default_links"/>
 
     <com.android.settings.widget.WorkOnlyCategory
diff --git a/res/xml/battery_saver_settings.xml b/res/xml/battery_saver_settings.xml
index 116079d..0460459 100644
--- a/res/xml/battery_saver_settings.xml
+++ b/res/xml/battery_saver_settings.xml
@@ -18,32 +18,35 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/battery_saver"
-    android:key="battery_saver">
+    android:key="battery_saver_page">
 
     <!-- Turn on automatically -->
     <SwitchPreference
         android:key="auto_battery_saver"
         android:title="@string/battery_saver_auto_title"
-        settings:controller="com.android.settings.fuelgauge.batterysaver.AutoBatterySaverPreferenceController"/>
+        settings:controller="com.android.settings.fuelgauge.batterysaver.AutoBatterySaverPreferenceController" />
 
     <com.android.settings.widget.SeekBarPreference
         android:key="battery_saver_seek_bar"
         android:title="@string/battery_saver_seekbar_title_placeholder"
         android:max="75"
-        android:min="5"/>
+        android:min="5" />
 
     <com.android.settings.widget.TwoStateButtonPreference
-        android:key="battery_saver_button_container"
+        android:key="battery_saver"
+        android:title="@string/battery_saver"
         android:selectable="false"
         settings:textOn="@string/battery_saver_button_turn_on"
-        settings:textOff="@string/battery_saver_button_turn_off"/>
+        settings:textOff="@string/battery_saver_button_turn_off"
+        settings:platform_slice="true"
+        settings:controller="com.android.settings.fuelgauge.batterysaver.BatterySaverButtonPreferenceController" />
 
     <PreferenceCategory
         android:key="battery_saver_footer">
         <com.android.settingslib.widget.FooterPreference
             android:key="battery_saver_footer_preference"
             android:title="@*android:string/battery_saver_description"
-            android:selectable="false"/>
+            android:selectable="false" />
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/channel_notification_settings.xml b/res/xml/channel_notification_settings.xml
index e16a74f..5afc70d 100644
--- a/res/xml/channel_notification_settings.xml
+++ b/res/xml/channel_notification_settings.xml
@@ -22,32 +22,38 @@
 
     <com.android.settings.applications.LayoutPreference
         android:key="pref_app_header"
+        android:order="1"
         android:layout="@layout/settings_entity_header" />
 
     <com.android.settings.applications.LayoutPreference
         android:key="block"
+        android:order="2"
         android:layout="@layout/styled_switch_bar" />
 
+    <!-- Importance toggle -->
+    <com.android.settingslib.RestrictedSwitchPreference
+        android:key="allow_sound"
+        android:order="3"
+        android:title="@string/allow_interruption"
+        android:summary="@string/allow_interruption_summary" />
+
+    <!-- Importance -->
+    <com.android.settings.RestrictedListPreference
+        android:key="importance"
+        android:order="10"
+        android:title="@string/notification_importance_title" />
+
     <PreferenceCategory
         android:key="channel_advanced"
         android:order="50"
-        settings:initialExpandedChildrenCount="1">
-        <!-- Importance -->
-        <com.android.settings.RestrictedListPreference
-            android:key="importance"
-            android:title="@string/notification_importance_title" />
-
-        <!-- Importance toggle -->
-        <com.android.settingslib.RestrictedSwitchPreference
-            android:key="allow_sound"
-            android:title="@string/allow_interruption"
-            android:summary="@string/allow_interruption_summary" />
+        settings:initialExpandedChildrenCount="0">
 
         <!-- Default ringtone -->
         <com.android.settings.notification.NotificationSoundPreference
             android:key="ringtone"
             android:title="@string/notification_channel_sound_title"
             android:dialogTitle="@string/notification_channel_sound_title"
+            android:order="11"
             android:showSilent="true"
             android:showDefault="true"
             android:ringtoneType="notification" />
@@ -55,23 +61,27 @@
         <!-- Vibration -->
         <com.android.settingslib.RestrictedSwitchPreference
             android:key="vibrate"
+            android:order="12"
             android:title="@string/notification_vibrate_title"
             settings:useAdditionalSummary="true" />
 
         <!-- Visibility Override -->
         <com.android.settings.RestrictedListPreference
             android:key="visibility_override"
+            android:order="13"
             android:title="@string/app_notification_visibility_override_title"/>
 
         <!-- Lights -->
         <com.android.settingslib.RestrictedSwitchPreference
             android:key="lights"
+            android:order="14"
             android:title="@string/notification_show_lights_title"
             settings:useAdditionalSummary="true"/>
 
         <!-- Show badge -->
         <com.android.settingslib.RestrictedSwitchPreference
             android:key="badge"
+            android:order="15"
             android:title="@string/notification_channel_badge_title"
             settings:useAdditionalSummary="true"
             settings:restrictedSwitchSummary="@string/enabled_by_admin"/>
@@ -79,12 +89,14 @@
         <!-- Bypass DND -->
         <com.android.settingslib.RestrictedSwitchPreference
             android:key="bypass_dnd"
+            android:order="16"
             android:title="@string/app_notification_override_dnd_title"
             android:summary="@string/app_notification_override_dnd_summary"
             settings:useAdditionalSummary="true"/>
 
         <Preference
             android:key="app_link"
+            android:order="17"
             android:title="@string/app_settings_link"
             settings:allowDividerAbove="true"/>
     </PreferenceCategory>
diff --git a/res/xml/connected_devices.xml b/res/xml/connected_devices.xml
index 54de927..424ca75 100644
--- a/res/xml/connected_devices.xml
+++ b/res/xml/connected_devices.xml
@@ -52,6 +52,7 @@
     <Preference
         android:key="connection_preferences"
         android:title="@string/connected_device_connections_title"
-        android:fragment="com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment"/>
+        android:fragment="com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment"
+        settings:controller="com.android.settings.connecteddevice.AdvancedConnectedDeviceController"/>
 
 </PreferenceScreen>
diff --git a/res/xml/connected_devices_advanced.xml b/res/xml/connected_devices_advanced.xml
index f81fd79..41d3e9b 100644
--- a/res/xml/connected_devices_advanced.xml
+++ b/res/xml/connected_devices_advanced.xml
@@ -32,12 +32,14 @@
         android:title="@string/nfc_quick_toggle_title"
         android:icon="@drawable/ic_nfc"
         android:summary="@string/nfc_quick_toggle_summary"
+        settings:controller="com.android.settings.nfc.NfcPreferenceController"
         android:order="-7"/>
 
     <com.android.settingslib.RestrictedPreference
         android:fragment="com.android.settings.nfc.AndroidBeam"
         android:key="android_beam_settings"
         android:title="@string/android_beam_settings_title"
+        settings:controller="com.android.settings.nfc.AndroidBeamPreferenceController"
         android:icon="@drawable/ic_android"
         android:order="-6"/>
 
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 2e54904..0575916 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -184,11 +184,6 @@
             android:entryValues="@array/select_logpersist_values" />
 
         <SwitchPreference
-            android:key="connectivity_monitor_switch"
-            android:title="@string/connectivity_monitor_switch"
-            android:summary="@string/connectivity_monitor_switch_summary" />
-
-        <SwitchPreference
             android:key="camera_laser_sensor_switch"
             android:title="@string/camera_laser_sensor_switch" />
 
@@ -254,6 +249,10 @@
             android:title="@string/bluetooth_disable_absolute_volume"
             android:summary="@string/bluetooth_disable_absolute_volume_summary" />
 
+        <SwitchPreference
+            android:key="bluetooth_disable_a2dp_hw_offload"
+            android:title="@string/bluetooth_disable_a2dp_hw_offload" />
+
         <ListPreference
             android:key="bluetooth_select_avrcp_version"
             android:title="@string/bluetooth_select_avrcp_version_string"
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
deleted file mode 100644
index 5f1ce12..0000000
--- a/res/xml/device_info_settings.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  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.
-  -->
-
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:key="device_info_pref_screen"
-    android:title="@string/about_settings">
-
-    <!-- Phone number -->
-    <Preference
-        android:key="phone_number"
-        android:order="0"
-        android:title="@string/status_number"
-        android:summary="@string/summary_placeholder" />
-
-    <!-- SIM status -->
-    <Preference
-        android:key="sim_status"
-        android:order="10"
-        android:title="@string/sim_status_title"
-        settings:keywords="@string/keywords_sim_status"
-        android:summary="@string/summary_placeholder" />
-
-    <!-- Model & hardware -->
-    <Preference
-        android:key="device_model_v1"
-        android:order="21"
-        android:title="@string/hardware_info"
-        settings:keywords="@string/keywords_model_and_hardware"
-        android:summary="@string/summary_placeholder"
-        settings:controller="com.android.settings.deviceinfo.DeviceModelPreferenceController" />
-
-    <!-- IMEI -->
-    <Preference
-        android:key="imei_info"
-        android:order="22"
-        android:title="@string/status_imei"
-        settings:keywords="@string/keywords_imei_info"
-        android:summary="@string/summary_placeholder" />
-
-    <!-- Android version -->
-    <Preference
-        android:key="firmware_version"
-        android:order="32"
-        android:title="@string/firmware_version"
-        settings:keywords="@string/keywords_android_version"
-        android:summary="@string/summary_placeholder"
-        settings:controller=
-            "com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceController" />
-
-    <!--IP address -->
-    <Preference
-        android:key="wifi_ip_address"
-        android:order="34"
-        android:title="@string/wifi_ip_address"
-        android:summary="@string/summary_placeholder"
-        settings:allowDividerAbove="true" />
-
-    <!-- Wi-Fi MAC address -->
-    <Preference
-        android:key="wifi_mac_address"
-        android:order="35"
-        android:title="@string/status_wifi_mac_address"
-        android:summary="@string/summary_placeholder" />
-
-    <!-- Bluetooth address -->
-    <Preference
-        android:key="bt_address"
-        android:order="36"
-        android:title="@string/status_bt_address"
-        android:summary="@string/summary_placeholder" />
-
-
-    <!-- Legal information -->
-    <Preference
-        android:key="legal_container"
-        android:order="37"
-        android:title="@string/legal_information"
-        android:fragment="com.android.settings.LegalSettings"
-        settings:allowDividerAbove="true" />
-
-    <!-- Regulatory labels -->
-    <Preference
-        android:key="regulatory_info"
-        android:order="38"
-        android:title="@string/regulatory_labels">
-        <intent android:action="android.settings.SHOW_REGULATORY_INFO" />
-    </Preference>
-
-    <!-- Safety & regulatory manual -->
-    <Preference
-        android:key="safety_info"
-        android:order="39"
-        android:title="@string/safety_and_regulatory_info">
-        <intent android:action="android.settings.SHOW_SAFETY_AND_REGULATORY_INFO" />
-    </Preference>
-
-    <!-- Manual -->
-    <Preference
-        android:key="manual"
-        android:order="40"
-        android:title="@string/manual">
-        <intent android:action="android.settings.SHOW_MANUAL" />
-    </Preference>
-
-    <!-- Feedback on the device -->
-    <Preference
-        android:key="device_feedback"
-        android:order="41"
-        android:title="@string/device_feedback" />
-
-    <!-- Device FCC equipment id -->
-    <Preference
-        android:key="fcc_equipment_id"
-        android:order="42"
-        android:title="@string/fcc_equipment_id"
-        android:summary="@string/summary_placeholder" />
-
-    <!-- Build number -->
-    <Preference
-        android:key="build_number"
-        android:order="43"
-        android:title="@string/build_number"
-        android:summary="@string/summary_placeholder"
-        settings:allowDividerAbove="true" />
-
-</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index b34fec0..ec8a197 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -132,9 +132,16 @@
 
     <ListPreference
         android:key="theme"
-        android:title="@string/device_theme"
+        android:title="@string/color_theme"
         android:summary="@string/summary_placeholder" />
 
+    <ListPreference
+        android:key="systemui_theme"
+        android:title="@string/device_theme"
+        android:entries="@array/systemui_theme_entries"
+        android:entryValues="@array/systemui_theme_values"
+        settings:controller="com.android.settings.display.SystemUiThemePreferenceController" />
+
     <Preference
         android:key="vr_display_pref"
         android:title="@string/display_vr_pref_title"
diff --git a/res/xml/manage_domain_url_settings.xml b/res/xml/manage_domain_url_settings.xml
index e4e4e47..e820e78 100644
--- a/res/xml/manage_domain_url_settings.xml
+++ b/res/xml/manage_domain_url_settings.xml
@@ -17,4 +17,27 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/domain_urls_title" />
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:title="@string/domain_urls_title"
+    android:key="manage_domain_url_screen">
+
+    <PreferenceCategory
+        android:key="web_action_category"
+        android:title="@string/web_action_section_title"
+        settings:controller="com.android.settings.applications.managedomainurls.WebActionCategoryController">
+        <SwitchPreference
+            android:key="instant_app_web_action_toggle"
+            android:title="@string/web_action_enable_title"
+            android:summary="@string/web_action_enable_summary"
+            settings:controller="com.android.settings.applications.managedomainurls.InstantAppWebActionPreferenceController" />
+        <Preference
+            android:key="instant_app_web_action_pref"
+            android:title="@string/instant_apps_settings"
+            settings:controller="com.android.settings.applications.managedomainurls.InstantAppAccountPreferenceController" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="installed_apps_web_action"
+        android:title="@string/domain_url_section_title"
+        settings:controller="com.android.settings.applications.managedomainurls.DomainAppPreferenceController" />
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml
index 42151fb..b70b613 100644
--- a/res/xml/my_device_info.xml
+++ b/res/xml/my_device_info.xml
@@ -19,8 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="my_device_info_pref_screen"
-    android:title="@string/about_settings"
-    settings:initialExpandedChildrenCount="7">
+    android:title="@string/about_settings">
 
     <com.android.settings.applications.LayoutPreference
         android:key="my_device_info_header"
@@ -154,7 +153,8 @@
     <Preference
         android:key="device_feedback"
         android:order="41"
-        android:title="@string/device_feedback"/>
+        android:title="@string/device_feedback"
+        settings:keywords="@string/keywords_device_feedback" />
 
     <!-- Device FCC equipment id -->
     <Preference
diff --git a/res/xml/network_and_internet.xml b/res/xml/network_and_internet.xml
index 69d8fca..6eda0b0 100644
--- a/res/xml/network_and_internet.xml
+++ b/res/xml/network_and_internet.xml
@@ -68,12 +68,13 @@
         settings:useAdminDisabledSummary="true" />
 
     <com.android.settingslib.RestrictedSwitchPreference
-        android:key="toggle_airplane"
+        android:key="airplane_mode"
         android:title="@string/airplane_mode"
         android:icon="@drawable/ic_airplanemode_active"
         android:disableDependentsState="true"
         android:order="5"
         settings:controller="com.android.settings.network.AirplaneModePreferenceController"
+        settings:platform_slice="true"
         settings:userRestriction="no_airplane_mode"/>
 
     <Preference
diff --git a/res/xml/night_display_settings.xml b/res/xml/night_display_settings.xml
index c90c203..12c8bc7 100644
--- a/res/xml/night_display_settings.xml
+++ b/res/xml/night_display_settings.xml
@@ -45,7 +45,7 @@
 
     <com.android.settings.applications.LayoutPreference
         android:key="night_display_activated"
-        android:title="@string/night_display_status_title"
+        android:title="@string/night_display_title"
         android:selectable="false"
         android:layout="@layout/night_display_activation_button"
         settings:keywords="@string/keywords_display_night_display"
diff --git a/res/xml/smart_battery_detail.xml b/res/xml/smart_battery_detail.xml
index e1246ed..8af3e96 100644
--- a/res/xml/smart_battery_detail.xml
+++ b/res/xml/smart_battery_detail.xml
@@ -30,6 +30,7 @@
         android:key="smart_battery"
         android:title="@string/smart_battery_title"
         android:summary="@string/smart_battery_summary"
+        settings:controller="com.android.settings.fuelgauge.SmartBatteryPreferenceController"
         settings:allowDividerAbove="true"/>
 
     <SwitchPreference
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index ecc9350..54a4190 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -25,7 +25,7 @@
     <!-- Media volume -->
     <com.android.settings.notification.VolumeSeekBarPreference
         android:key="media_volume"
-        android:icon="@*android:drawable/ic_audio_media"
+        android:icon="@drawable/ic_media_stream"
         android:title="@string/media_volume_option_title"
         android:order="-180"
         settings:controller="com.android.settings.notification.MediaVolumePreferenceController"/>
@@ -57,7 +57,7 @@
     <!-- Ring volume -->
     <com.android.settings.notification.VolumeSeekBarPreference
         android:key="ring_volume"
-        android:icon="@*android:drawable/ic_audio_ring_notif"
+        android:icon="@drawable/ic_notifications"
         android:title="@string/ring_volume_option_title"
         android:order="-160"
         settings:controller="com.android.settings.notification.RingVolumePreferenceController"/>
@@ -74,7 +74,7 @@
     <!-- Notification volume -->
     <com.android.settings.notification.VolumeSeekBarPreference
         android:key="notification_volume"
-        android:icon="@*android:drawable/ic_audio_ring_notif"
+        android:icon="@drawable/ic_notifications"
         android:title="@string/notification_volume_option_title"
         android:order="-140"
         settings:controller="com.android.settings.notification.NotificationVolumePreferenceController"/>
diff --git a/res/xml/vpn_app_management.xml b/res/xml/vpn_app_management.xml
index e18a074..bcaa6b0 100644
--- a/res/xml/vpn_app_management.xml
+++ b/res/xml/vpn_app_management.xml
@@ -43,7 +43,7 @@
         <com.android.settingslib.RestrictedPreference
                 android:key="forget_vpn"
                 android:title="@string/vpn_forget_long"
-                android:icon="@drawable/ic_menu_delete"
+                android:icon="@drawable/ic_delete"
                 settings:userRestriction="no_config_vpn"
                 settings:useAdminDisabledSummary="true" />
 </PreferenceScreen>
diff --git a/res/xml/wifi_tether_settings.xml b/res/xml/wifi_tether_settings.xml
index 29afed9..e869483 100644
--- a/res/xml/wifi_tether_settings.xml
+++ b/res/xml/wifi_tether_settings.xml
@@ -20,13 +20,20 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="wifi_tether_settings_screen"
     android:title="@string/wifi_hotspot_checkbox_text"
-    settings:initialExpandedChildrenCount="2">
+    settings:initialExpandedChildrenCount="3">
 
     <com.android.settings.widget.ValidatedEditTextPreference
         android:key="wifi_tether_network_name"
         android:title="@string/wifi_hotspot_name_title"
         android:summary="@string/summary_placeholder" />
 
+    <ListPreference
+        android:key="wifi_tether_security"
+        android:title="@string/wifi_security"
+        android:summary="@string/summary_placeholder"
+        android:entries="@array/wifi_tether_security"
+        android:entryValues="@array/wifi_tether_security_values" />
+
     <com.android.settings.widget.ValidatedEditTextPreference
         android:key="wifi_tether_network_password"
         android:persistent="false"
@@ -35,7 +42,7 @@
     <SwitchPreference
         android:key="wifi_tether_auto_turn_off"
         android:title="@string/wifi_hotspot_auto_off_title"
-        android:summary="@string/wifi_hotspot_auto_off_summary"/>
+        android:summary="@string/wifi_hotspot_auto_off_summary" />
 
     <com.android.settings.widget.HotspotApBandSelectionPreference
         android:key="wifi_tether_network_ap_band"
@@ -43,5 +50,5 @@
         android:dialogLayout="@layout/hotspot_ap_band_selection_dialog"
         android:dialogTitle="@string/wifi_hotspot_ap_band_title"
         android:negativeButtonText="@string/cancel"
-        android:positiveButtonText="@string/apply"/>
+        android:positiveButtonText="@string/apply" />
 </PreferenceScreen>
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index 170db16..c04269c 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -54,8 +54,6 @@
 import android.telephony.CellSignalStrengthGsm;
 import android.telephony.CellSignalStrengthLte;
 import android.telephony.CellSignalStrengthWcdma;
-import android.telephony.DataConnectionRealTimeInfo;
-import android.telephony.NeighboringCellInfo;
 import android.telephony.PreciseCallState;
 import android.telephony.PhoneStateListener;
 import android.telephony.PhysicalChannelConfig;
@@ -193,9 +191,7 @@
     private TextView mMwi;
     private TextView mCfi;
     private TextView mLocation;
-    private TextView mNeighboringCids;
     private TextView mCellInfo;
-    private TextView mDcRtInfoTv;
     private TextView sent;
     private TextView received;
     private TextView mPingHostnameV4;
@@ -235,7 +231,6 @@
 
     private List<CellInfo> mCellInfoResult = null;
     private CellLocation mCellLocationResult = null;
-    private List<NeighboringCellInfo> mNeighboringCellResult = null;
 
     private int mPreferredNetworkTypeResult;
     private int mCellInfoRefreshRateIndex;
@@ -301,12 +296,6 @@
         }
 
         @Override
-        public void onDataConnectionRealTimeInfoChanged(DataConnectionRealTimeInfo dcRtInfo) {
-            log("onDataConnectionRealTimeInfoChanged: dcRtInfo=" + dcRtInfo);
-            updateDcRtInfoTv(dcRtInfo);
-        }
-
-        @Override
         public void onSignalStrengthsChanged(SignalStrength signalStrength) {
             log("onSignalStrengthChanged: SignalStrength=" +signalStrength);
             updateSignalStrength(signalStrength);
@@ -433,10 +422,8 @@
         mMwi = (TextView) findViewById(R.id.mwi);
         mCfi = (TextView) findViewById(R.id.cfi);
         mLocation = (TextView) findViewById(R.id.location);
-        mNeighboringCids = (TextView) findViewById(R.id.neighboring);
         mCellInfo = (TextView) findViewById(R.id.cellinfo);
         mCellInfo.setTypeface(Typeface.MONOSPACE);
-        mDcRtInfoTv = (TextView) findViewById(R.id.dcrtinfo);
 
         sent = (TextView) findViewById(R.id.sent);
         received = (TextView) findViewById(R.id.received);
@@ -520,7 +507,6 @@
         updateDnsCheckState();
         updateNetworkType();
 
-        updateNeighboringCids(mNeighboringCellResult);
         updateLocation(mCellLocationResult);
         updateCellInfo(mCellInfoResult);
 
@@ -714,23 +700,6 @@
 
     }
 
-    private final void updateNeighboringCids(List<NeighboringCellInfo> cids) {
-        StringBuilder sb = new StringBuilder();
-
-        if (cids != null) {
-            if (cids.isEmpty()) {
-                sb.append("no neighboring cells");
-            } else {
-                for (NeighboringCellInfo cell : cids) {
-                    sb.append(cell.toString()).append(" ");
-                }
-            }
-        } else {
-            sb.append("unknown");
-        }
-        mNeighboringCids.setText(sb.toString());
-    }
-
     private final String getCellInfoDisplayString(int i) {
         return (i != Integer.MAX_VALUE) ? Integer.toString(i) : "";
     }
@@ -883,10 +852,6 @@
         mCellInfo.setText(buildCellInfoString(arrayCi));
     }
 
-    private final void updateDcRtInfoTv(DataConnectionRealTimeInfo dcRtInfo) {
-        mDcRtInfoTv.setText(dcRtInfo.toString());
-    }
-
     private final void
     updateMessageWaiting() {
         mMwi.setText(String.valueOf(mMwiValue));
@@ -1079,12 +1044,10 @@
     private final void updateAllCellInfo() {
 
         mCellInfo.setText("");
-        mNeighboringCids.setText("");
         mLocation.setText("");
 
         final Runnable updateAllCellInfoResults = new Runnable() {
             public void run() {
-                updateNeighboringCids(mNeighboringCellResult);
                 updateLocation(mCellLocationResult);
                 updateCellInfo(mCellInfoResult);
             }
@@ -1095,7 +1058,6 @@
             public void run() {
                 mCellInfoResult = mTelephonyManager.getAllCellInfo();
                 mCellLocationResult = mTelephonyManager.getCellLocation();
-                mNeighboringCellResult = mTelephonyManager.getNeighboringCellInfo();
 
                 mHandler.post(updateAllCellInfoResults);
             }
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 0ad964b..651c3a7 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -50,7 +50,6 @@
     public static class DisplaySettingsActivity extends SettingsActivity { /* empty */ }
     public static class NightDisplaySettingsActivity extends SettingsActivity { /* empty */ }
     public static class NightDisplaySuggestionActivity extends NightDisplaySettingsActivity { /* empty */ }
-    public static class DeviceInfoSettingsActivity extends SettingsActivity { /* empty */ }
     public static class MyDeviceInfoActivity extends SettingsActivity { /* empty */ }
     public static class ApplicationSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ManageApplicationsActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 0a0fd1b..5d6ea4d 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -710,19 +710,6 @@
                 WifiDisplaySettings.isAvailable(this), isAdmin)
                 || somethingChanged;
 
-        // Enable/disable the Me Card page.
-        final boolean aboutPhoneV2Enabled = featureFactory
-                .getAccountFeatureProvider()
-                .isAboutPhoneV2Enabled(this);
-        somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,
-                        Settings.MyDeviceInfoActivity.class.getName()),
-                aboutPhoneV2Enabled, isAdmin)
-                || somethingChanged;
-        somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,
-                        Settings.DeviceInfoSettingsActivity.class.getName()),
-                !aboutPhoneV2Enabled, isAdmin)
-                || somethingChanged;
-
         if (UserHandle.MU_ENABLED && !isAdmin) {
 
             // When on restricted users, disable all extra categories (but only the settings ones).
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index cd92a95..7647924 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -781,17 +781,27 @@
     }
 
     private String getVibrationSummary(Context context, @VibrationIntensity int intensity) {
-        switch (intensity) {
-            case Vibrator.VIBRATION_INTENSITY_OFF:
-                return context.getString(R.string.accessibility_vibration_summary_off);
-            case Vibrator.VIBRATION_INTENSITY_LOW:
-                return context.getString(R.string.accessibility_vibration_summary_low);
-            case Vibrator.VIBRATION_INTENSITY_MEDIUM:
-                return context.getString(R.string.accessibility_vibration_summary_medium);
-            case Vibrator.VIBRATION_INTENSITY_HIGH:
-                return context.getString(R.string.accessibility_vibration_summary_high);
-            default:
-                return "";
+        final boolean supportsMultipleIntensities = context.getResources().getBoolean(
+                R.bool.config_vibration_supports_multiple_intensities);
+        if (supportsMultipleIntensities) {
+            switch (intensity) {
+                case Vibrator.VIBRATION_INTENSITY_OFF:
+                    return context.getString(R.string.accessibility_vibration_summary_off);
+                case Vibrator.VIBRATION_INTENSITY_LOW:
+                    return context.getString(R.string.accessibility_vibration_summary_low);
+                case Vibrator.VIBRATION_INTENSITY_MEDIUM:
+                    return context.getString(R.string.accessibility_vibration_summary_medium);
+                case Vibrator.VIBRATION_INTENSITY_HIGH:
+                    return context.getString(R.string.accessibility_vibration_summary_high);
+                default:
+                    return "";
+            }
+        } else {
+            if (intensity == Vibrator.VIBRATION_INTENSITY_OFF) {
+                return context.getString(R.string.switch_on_text);
+            } else {
+                return context.getString(R.string.switch_off_text);
+            }
         }
     }
 
diff --git a/src/com/android/settings/accessibility/AccessibilitySlicePreferenceController.java b/src/com/android/settings/accessibility/AccessibilitySlicePreferenceController.java
index ec988cd..d1a60fa 100644
--- a/src/com/android/settings/accessibility/AccessibilitySlicePreferenceController.java
+++ b/src/com/android/settings/accessibility/AccessibilitySlicePreferenceController.java
@@ -90,6 +90,11 @@
         return getAccessibilityServiceInfo() == null ? UNSUPPORTED_ON_DEVICE : AVAILABLE;
     }
 
+    @Override
+    public boolean isSliceable() {
+        return true;
+    }
+
     private AccessibilityServiceInfo getAccessibilityServiceInfo() {
         final AccessibilityManager accessibilityManager = mContext.getSystemService(
                 AccessibilityManager.class);
diff --git a/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java b/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java
index 9bfc05a..f613c69 100644
--- a/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java
+++ b/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java
@@ -16,6 +16,8 @@
 import android.content.Context;
 import android.os.Bundle;
 import android.provider.Settings;
+import android.text.TextUtils;
+
 import androidx.preference.Preference;
 
 import com.android.settings.R;
@@ -62,6 +64,12 @@
     }
 
     @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(),
+                "screen_magnification_gestures_preference_screen");
+    }
+
+    @Override
     public CharSequence getSummary() {
         int resId = 0;
         if (mIsFromSUW) {
diff --git a/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java b/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java
index e0ba65b..5af5d93 100644
--- a/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java
+++ b/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java
@@ -16,6 +16,8 @@
 import android.content.Context;
 import android.os.Bundle;
 import android.provider.Settings;
+import android.text.TextUtils;
+
 import androidx.preference.Preference;
 
 import com.android.settings.R;
@@ -69,6 +71,12 @@
     }
 
     @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(),
+                "screen_magnification_navbar_preference_screen");
+    }
+
+    @Override
     public CharSequence getSummary() {
         int resId = 0;
         if (mIsFromSUW) {
diff --git a/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java b/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java
index 6340bb1..5f43c2d 100644
--- a/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java
@@ -15,7 +15,9 @@
  */
 package com.android.settings.accessibility;
 
+import android.media.AudioAttributes;
 import android.os.Vibrator;
+import android.os.VibrationEffect;
 import android.provider.Settings;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -44,6 +46,11 @@
     }
 
     @Override
+    protected int getPreviewVibrationAudioAttributesUsage() {
+        return AudioAttributes.USAGE_NOTIFICATION;
+    }
+
+    @Override
     protected int getDefaultVibrationIntensity() {
         Vibrator vibrator = getContext().getSystemService(Vibrator.class);
         return vibrator.getDefaultNotificationVibrationIntensity();
diff --git a/src/com/android/settings/accessibility/OWNERS b/src/com/android/settings/accessibility/OWNERS
index 28dfdef..ba03055 100644
--- a/src/com/android/settings/accessibility/OWNERS
+++ b/src/com/android/settings/accessibility/OWNERS
@@ -1,3 +1,6 @@
 # Default reviewers for this and subdirectories.
 pweaver@google.com
-zork@google.com
\ No newline at end of file
+zork@google.com
+
+per-file HapticFeedbackIntensityPreferenceController.java = michaelwr@google.com
+per-file *Vibration* = michaelwr@google.com
diff --git a/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java b/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java
index ea36833..1d20124 100644
--- a/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java
@@ -16,7 +16,9 @@
 package com.android.settings.accessibility;
 
 import android.graphics.drawable.Drawable;
+import android.media.AudioAttributes;
 import android.os.Vibrator;
+import android.os.VibrationEffect;
 import android.provider.Settings;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -51,6 +53,11 @@
     }
 
     @Override
+    protected int getPreviewVibrationAudioAttributesUsage() {
+        return AudioAttributes.USAGE_ASSISTANCE_SONIFICATION;
+    }
+
+    @Override
     public void onVibrationIntensitySelected(int intensity) {
         // We want to keep HAPTIC_FEEDBACK_ENABLED consistent with this setting since some
         // applications check it directly before triggering their own haptic feedback.
diff --git a/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java b/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java
index e99e32f..ef77535 100644
--- a/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java
+++ b/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java
@@ -81,17 +81,27 @@
    }
 
     public static CharSequence getIntensityString(Context context, int intensity) {
-        switch (intensity) {
-            case Vibrator.VIBRATION_INTENSITY_OFF:
-                return context.getText(R.string.accessibility_vibration_intensity_off);
-            case Vibrator.VIBRATION_INTENSITY_LOW:
-                return context.getText(R.string.accessibility_vibration_intensity_low);
-            case Vibrator.VIBRATION_INTENSITY_MEDIUM:
-                return context.getText(R.string.accessibility_vibration_intensity_medium);
-            case Vibrator.VIBRATION_INTENSITY_HIGH:
-                return context.getText(R.string.accessibility_vibration_intensity_high);
-            default:
-                return "";
+        final boolean supportsMultipleIntensities = context.getResources().getBoolean(
+                R.bool.config_vibration_supports_multiple_intensities);
+        if (supportsMultipleIntensities) {
+            switch (intensity) {
+                case Vibrator.VIBRATION_INTENSITY_OFF:
+                    return context.getString(R.string.accessibility_vibration_intensity_off);
+                case Vibrator.VIBRATION_INTENSITY_LOW:
+                    return context.getString(R.string.accessibility_vibration_intensity_low);
+                case Vibrator.VIBRATION_INTENSITY_MEDIUM:
+                    return context.getString(R.string.accessibility_vibration_intensity_medium);
+                case Vibrator.VIBRATION_INTENSITY_HIGH:
+                    return context.getString(R.string.accessibility_vibration_intensity_high);
+                default:
+                    return "";
+            }
+        } else {
+            if (intensity == Vibrator.VIBRATION_INTENSITY_OFF) {
+                return context.getString(R.string.switch_off_text);
+            } else {
+                return context.getString(R.string.switch_on_text);
+            }
         }
     }
 
diff --git a/src/com/android/settings/accessibility/VibrationPreferenceFragment.java b/src/com/android/settings/accessibility/VibrationPreferenceFragment.java
index 3a82cde..9955783 100644
--- a/src/com/android/settings/accessibility/VibrationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/VibrationPreferenceFragment.java
@@ -21,8 +21,10 @@
 import android.content.Context;
 import android.database.ContentObserver;
 import android.graphics.drawable.Drawable;
+import android.media.AudioAttributes;
 import android.net.Uri;
 import android.os.Handler;
+import android.os.VibrationEffect;
 import android.os.Vibrator;
 import android.provider.Settings;
 import android.util.ArrayMap;
@@ -53,28 +55,15 @@
     final static String KEY_INTENSITY_MEDIUM = "intensity_medium";
     @VisibleForTesting
     final static String KEY_INTENSITY_HIGH = "intensity_high";
+    // KEY_INTENSITY_ON is only used when the device doesn't support multiple intensity levels.
+    @VisibleForTesting
+    final static String KEY_INTENSITY_ON = "intensity_on";
 
     private final Map<String, VibrationIntensityCandidateInfo> mCandidates;
     private final SettingsObserver mSettingsObserver;
 
     public VibrationPreferenceFragment() {
         mCandidates = new ArrayMap<>();
-        mCandidates.put(KEY_INTENSITY_OFF,
-                new VibrationIntensityCandidateInfo(KEY_INTENSITY_OFF,
-                    R.string.accessibility_vibration_intensity_off,
-                    Vibrator.VIBRATION_INTENSITY_OFF));
-        mCandidates.put(KEY_INTENSITY_LOW,
-                new VibrationIntensityCandidateInfo(KEY_INTENSITY_LOW,
-                    R.string.accessibility_vibration_intensity_low,
-                    Vibrator.VIBRATION_INTENSITY_LOW));
-        mCandidates.put(KEY_INTENSITY_MEDIUM,
-                new VibrationIntensityCandidateInfo(KEY_INTENSITY_MEDIUM,
-                    R.string.accessibility_vibration_intensity_medium,
-                    Vibrator.VIBRATION_INTENSITY_MEDIUM));
-        mCandidates.put(KEY_INTENSITY_HIGH,
-                new VibrationIntensityCandidateInfo(KEY_INTENSITY_HIGH,
-                    R.string.accessibility_vibration_intensity_high,
-                    Vibrator.VIBRATION_INTENSITY_HIGH));
         mSettingsObserver = new SettingsObserver();
     }
 
@@ -82,6 +71,39 @@
     public void onAttach(Context context) {
         super.onAttach(context);
         mSettingsObserver.register();
+        if (mCandidates.isEmpty()) {
+            loadCandidates(context);
+        }
+    }
+
+    private void loadCandidates(Context context) {
+        final boolean supportsMultipleIntensities = context.getResources().getBoolean(
+                R.bool.config_vibration_supports_multiple_intensities);
+        if (supportsMultipleIntensities) {
+            mCandidates.put(KEY_INTENSITY_OFF,
+                    new VibrationIntensityCandidateInfo(KEY_INTENSITY_OFF,
+                        R.string.accessibility_vibration_intensity_off,
+                        Vibrator.VIBRATION_INTENSITY_OFF));
+            mCandidates.put(KEY_INTENSITY_LOW,
+                    new VibrationIntensityCandidateInfo(KEY_INTENSITY_LOW,
+                        R.string.accessibility_vibration_intensity_low,
+                        Vibrator.VIBRATION_INTENSITY_LOW));
+            mCandidates.put(KEY_INTENSITY_MEDIUM,
+                    new VibrationIntensityCandidateInfo(KEY_INTENSITY_MEDIUM,
+                        R.string.accessibility_vibration_intensity_medium,
+                        Vibrator.VIBRATION_INTENSITY_MEDIUM));
+            mCandidates.put(KEY_INTENSITY_HIGH,
+                    new VibrationIntensityCandidateInfo(KEY_INTENSITY_HIGH,
+                        R.string.accessibility_vibration_intensity_high,
+                        Vibrator.VIBRATION_INTENSITY_HIGH));
+        } else {
+            mCandidates.put(KEY_INTENSITY_OFF,
+                    new VibrationIntensityCandidateInfo(KEY_INTENSITY_OFF,
+                        R.string.switch_off_text, Vibrator.VIBRATION_INTENSITY_OFF));
+            mCandidates.put(KEY_INTENSITY_ON,
+                    new VibrationIntensityCandidateInfo(KEY_INTENSITY_ON,
+                        R.string.switch_on_text, getDefaultVibrationIntensity()));
+        }
     }
 
     @Override
@@ -105,6 +127,24 @@
      */
     protected void onVibrationIntensitySelected(int intensity) { }
 
+    /**
+     * Play a vibration effect with intensity just selected by user
+     */
+    protected void playVibrationPreview() {
+        Vibrator vibrator = getContext().getSystemService(Vibrator.class);
+        VibrationEffect effect = VibrationEffect.get(VibrationEffect.EFFECT_CLICK);
+        AudioAttributes.Builder builder = new AudioAttributes.Builder();
+        builder.setUsage(getPreviewVibrationAudioAttributesUsage());
+        vibrator.vibrate(effect, builder.build());
+    }
+
+    /**
+     * Get the AudioAttributes usage for vibration preview.
+     */
+    protected int getPreviewVibrationAudioAttributesUsage() {
+        return AudioAttributes.USAGE_UNKNOWN;
+    }
+
     @Override
     protected List<? extends CandidateInfo> getCandidates() {
         List<VibrationIntensityCandidateInfo> candidates = new ArrayList<>(mCandidates.values());
@@ -118,7 +158,10 @@
         final int vibrationIntensity = Settings.System.getInt(getContext().getContentResolver(),
                 getVibrationIntensitySetting(), getDefaultVibrationIntensity());
         for (VibrationIntensityCandidateInfo candidate : mCandidates.values()) {
-            if (candidate.getIntensity() == vibrationIntensity) {
+            final boolean matchesIntensity = candidate.getIntensity() == vibrationIntensity;
+            final boolean matchesOn = candidate.getKey().equals(KEY_INTENSITY_ON)
+                    && vibrationIntensity != Vibrator.VIBRATION_INTENSITY_OFF;
+            if (matchesIntensity || matchesOn) {
                 return candidate.getKey();
             }
         }
@@ -189,6 +232,7 @@
         @Override
         public void onChange(boolean selfChange, Uri uri) {
             updateCandidates();
+            playVibrationPreview();
         }
     }
 }
diff --git a/src/com/android/settings/accounts/AccountFeatureProvider.java b/src/com/android/settings/accounts/AccountFeatureProvider.java
index ecde8fe..2b351a8 100644
--- a/src/com/android/settings/accounts/AccountFeatureProvider.java
+++ b/src/com/android/settings/accounts/AccountFeatureProvider.java
@@ -25,10 +25,4 @@
 public interface AccountFeatureProvider {
     String getAccountType();
     Account[] getAccounts(Context context);
-    /**
-     * Checks whether or not to display the new About Phone page.
-     */
-    default boolean isAboutPhoneV2Enabled(Context context) {
-        return FeatureFlagUtils.isEnabled(context, FeatureFlags.ABOUT_PHONE_V2);
-    }
 }
diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java
index 36e2fca..7cfc657 100644
--- a/src/com/android/settings/accounts/AccountPreferenceController.java
+++ b/src/com/android/settings/accounts/AccountPreferenceController.java
@@ -361,7 +361,7 @@
         RestrictedPreference preference = new RestrictedPreference(
             mParent.getPreferenceManager().getContext());
         preference.setTitle(R.string.remove_managed_profile_label);
-        preference.setIcon(R.drawable.ic_menu_delete);
+        preference.setIcon(R.drawable.ic_delete);
         preference.setOnPreferenceClickListener(this);
         preference.setOrder(ORDER_LAST);
         return preference;
diff --git a/src/com/android/settings/applications/AppStatePowerBridge.java b/src/com/android/settings/applications/AppStatePowerBridge.java
index ce03544..31412a7 100644
--- a/src/com/android/settings/applications/AppStatePowerBridge.java
+++ b/src/com/android/settings/applications/AppStatePowerBridge.java
@@ -15,6 +15,8 @@
  */
 package com.android.settings.applications;
 
+import android.content.Context;
+
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 import com.android.settingslib.applications.ApplicationsState.AppFilter;
@@ -28,10 +30,11 @@
  */
 public class AppStatePowerBridge extends AppStateBaseBridge {
 
-    private final PowerWhitelistBackend mBackend = PowerWhitelistBackend.getInstance();
+    private final PowerWhitelistBackend mBackend;
 
-    public AppStatePowerBridge(ApplicationsState appState, Callback callback) {
+    public AppStatePowerBridge(Context context, ApplicationsState appState, Callback callback) {
         super(appState, callback);
+        mBackend = PowerWhitelistBackend.getInstance(context);
     }
 
     @Override
@@ -50,11 +53,6 @@
         app.extraInfo = mBackend.isWhitelisted(pkg) ? Boolean.TRUE : Boolean.FALSE;
     }
 
-    public static class HighPowerState {
-        public boolean isHighPower;
-        public boolean isSystemHighPower;
-    }
-
     public static final AppFilter FILTER_POWER_WHITELISTED = new CompoundFilter(
             ApplicationsState.FILTER_WITHOUT_DISABLED_UNTIL_USED, new AppFilter() {
         @Override
diff --git a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
index 545b510..d29fc95 100644
--- a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
+++ b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
@@ -17,6 +17,7 @@
 package com.android.settings.applications;
 
 import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ComponentInfo;
@@ -26,8 +27,12 @@
 import android.content.pm.UserInfo;
 import android.os.RemoteException;
 import android.os.UserManager;
+import android.telecom.DefaultDialerManager;
+import android.text.TextUtils;
 import android.util.ArraySet;
 
+import com.android.internal.telephony.SmsApplication;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -122,7 +127,18 @@
 
     @Override
     public Set<String> getKeepEnabledPackages() {
-        return new ArraySet<>();
+        // Find current default phone/sms app. We should keep them enabled.
+        final Set<String> keepEnabledPackages = new ArraySet<>();
+        final String defaultDialer = DefaultDialerManager.getDefaultDialerApplication(mContext);
+        if (!TextUtils.isEmpty(defaultDialer)) {
+            keepEnabledPackages.add(defaultDialer);
+        }
+        final ComponentName defaultSms = SmsApplication.getDefaultSmsApplication(
+                mContext, true /* updateIfNeeded */);
+        if (defaultSms != null) {
+            keepEnabledPackages.add(defaultSms.getPackageName());
+        }
+        return keepEnabledPackages;
     }
 
     private static class CurrentUserAndManagedProfilePolicyInstalledAppCounter
diff --git a/src/com/android/settings/applications/ManageDomainUrls.java b/src/com/android/settings/applications/ManageDomainUrls.java
deleted file mode 100644
index e47792d..0000000
--- a/src/com/android/settings/applications/ManageDomainUrls.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * Copyright (C) 2016 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.applications;
-
-import android.app.Application;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.provider.Settings;
-import android.provider.Settings.Global;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.SwitchPreference;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.Preference.OnPreferenceClickListener;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceViewHolder;
-import android.util.ArraySet;
-import android.view.View;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.Utils;
-import com.android.settings.widget.AppPreference;
-import com.android.settingslib.applications.ApplicationsState;
-import com.android.settingslib.applications.ApplicationsState.AppEntry;
-
-import java.util.ArrayList;
-
-/**
- * Activity to manage how Android handles URL resolution. Includes both per-app
- * handling as well as system handling for Web Actions.
- */
-public class ManageDomainUrls extends SettingsPreferenceFragment
-        implements ApplicationsState.Callbacks, OnPreferenceChangeListener,
-        OnPreferenceClickListener {
-
-    // constant value that can be used to check return code from sub activity.
-    private static final int INSTALLED_APP_DETAILS = 1;
-
-    private ApplicationsState mApplicationsState;
-    private ApplicationsState.Session mSession;
-    private PreferenceGroup mDomainAppList;
-    private SwitchPreference mWebAction;
-    private Preference mInstantAppAccountPreference;
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setAnimationAllowed(true);
-        mApplicationsState = ApplicationsState.getInstance(
-                (Application) getContext().getApplicationContext());
-        mSession = mApplicationsState.newSession(this, getLifecycle());
-        setHasOptionsMenu(true);
-    }
-
-    @Override
-    protected int getPreferenceScreenResId() {
-        return R.xml.manage_domain_url_settings;
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-    }
-
-    @Override
-    public void onRunningStateChanged(boolean running) {
-    }
-
-    @Override
-    public void onPackageListChanged() {
-    }
-
-    @Override
-    public void onRebuildComplete(ArrayList<AppEntry> apps) {
-        if (getContext() == null) {
-            return;
-        }
-
-        final boolean disableWebActions = Global.getInt(getContext().getContentResolver(),
-                Global.ENABLE_EPHEMERAL_FEATURE, 1) == 0;
-        if (disableWebActions) {
-            mDomainAppList = getPreferenceScreen();
-        } else {
-            final PreferenceGroup preferenceScreen = getPreferenceScreen();
-            if (preferenceScreen.getPreferenceCount() == 0) {
-                // add preferences
-                final PreferenceCategory webActionCategory =
-                        new PreferenceCategory(getPrefContext());
-                webActionCategory.setTitle(R.string.web_action_section_title);
-                preferenceScreen.addPreference(webActionCategory);
-
-                // toggle to enable / disable Web Actions [aka Instant Apps]
-                mWebAction = new SwitchPreference(getPrefContext());
-                mWebAction.setTitle(R.string.web_action_enable_title);
-                mWebAction.setSummary(R.string.web_action_enable_summary);
-                mWebAction.setChecked(Settings.Secure.getInt(getContentResolver(),
-                        Settings.Secure.INSTANT_APPS_ENABLED, 1) != 0);
-                mWebAction.setOnPreferenceChangeListener(this);
-                webActionCategory.addPreference(mWebAction);
-
-                // Determine whether we should show the instant apps account chooser setting
-                ComponentName instantAppSettingsComponent = getActivity().getPackageManager()
-                        .getInstantAppResolverSettingsComponent();
-                Intent instantAppSettingsIntent = null;
-                if (instantAppSettingsComponent != null) {
-                    instantAppSettingsIntent =
-                            new Intent().setComponent(instantAppSettingsComponent);
-                }
-                if (instantAppSettingsIntent != null) {
-                    final Intent launchIntent = instantAppSettingsIntent;
-                    // TODO: Make this button actually launch the account chooser.
-                    mInstantAppAccountPreference = new Preference(getPrefContext());
-                    mInstantAppAccountPreference.setTitle(R.string.instant_apps_settings);
-                    mInstantAppAccountPreference.setOnPreferenceClickListener(pref -> {
-                        startActivity(launchIntent);
-                        return true;
-                    });
-                    webActionCategory.addPreference(mInstantAppAccountPreference);
-                }
-
-                // list to manage link handling per app
-                mDomainAppList = new PreferenceCategory(getPrefContext());
-                mDomainAppList.setTitle(R.string.domain_url_section_title);
-                preferenceScreen.addPreference(mDomainAppList);
-            }
-        }
-        rebuildAppList(mDomainAppList, apps);
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (preference == mWebAction) {
-            boolean checked = (boolean) newValue;
-            Settings.Secure.putInt(
-                    getContentResolver(),
-                    Settings.Secure.INSTANT_APPS_ENABLED, checked ? 1 : 0);
-            return true;
-        }
-        return false;
-    }
-
-    private void rebuild() {
-        final ArrayList<AppEntry> apps = mSession.rebuild(
-                ApplicationsState.FILTER_WITH_DOMAIN_URLS, ApplicationsState.ALPHA_COMPARATOR);
-        if (apps != null) {
-            onRebuildComplete(apps);
-        }
-    }
-
-    private void rebuildAppList(PreferenceGroup group, ArrayList<AppEntry> apps) {
-        cacheRemoveAllPrefs(group);
-        final int N = apps.size();
-        for (int i = 0; i < N; i++) {
-            AppEntry entry = apps.get(i);
-            String key = entry.info.packageName + "|" + entry.info.uid;
-            DomainAppPreference preference = (DomainAppPreference) getCachedPreference(key);
-            if (preference == null) {
-                preference = new DomainAppPreference(getPrefContext(), mApplicationsState, entry);
-                preference.setKey(key);
-                preference.setOnPreferenceClickListener(this);
-                group.addPreference(preference);
-            } else {
-                preference.reuse();
-            }
-            preference.setOrder(i);
-        }
-        removeCachedPrefs(group);
-    }
-
-    @Override
-    public void onPackageIconChanged() {
-    }
-
-    @Override
-    public void onPackageSizeChanged(String packageName) {
-    }
-
-    @Override
-    public void onAllSizesComputed() {
-    }
-
-    @Override
-    public void onLauncherInfoChanged() {
-    }
-
-    @Override
-    public void onLoadEntriesCompleted() {
-        rebuild();
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.MANAGE_DOMAIN_URLS;
-    }
-
-    @Override
-    public boolean onPreferenceClick(Preference preference) {
-        if (preference.getClass() == DomainAppPreference.class) {
-            ApplicationsState.AppEntry entry = ((DomainAppPreference) preference).mEntry;
-            AppInfoBase.startAppInfoFragment(AppLaunchSettings.class, R.string.auto_launch_label,
-                    entry.info.packageName, entry.info.uid, this,
-                    INSTALLED_APP_DETAILS, getMetricsCategory());
-            return true;
-        }
-        return false;
-    }
-
-    @VisibleForTesting
-    static class DomainAppPreference extends AppPreference {
-        private final AppEntry mEntry;
-        private final PackageManager mPm;
-        private final ApplicationsState mApplicationsState;
-
-        public DomainAppPreference(final Context context, ApplicationsState applicationsState,
-                AppEntry entry) {
-            super(context);
-            mApplicationsState = applicationsState;
-            mPm = context.getPackageManager();
-            mEntry = entry;
-            mEntry.ensureLabel(getContext());
-            setState();
-            if (mEntry.icon != null) {
-                setIcon(mEntry.icon);
-            }
-        }
-
-        private void setState() {
-            setTitle(mEntry.label);
-            setSummary(getDomainsSummary(mEntry.info.packageName));
-        }
-
-        public void reuse() {
-            setState();
-            notifyChanged();
-        }
-
-        @Override
-        public void onBindViewHolder(PreferenceViewHolder holder) {
-            if (mEntry.icon == null) {
-                holder.itemView.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        // Ensure we have an icon before binding.
-                        mApplicationsState.ensureIcon(mEntry);
-                        // This might trigger us to bind again, but it gives an easy way to only
-                        // load the icon once its needed, so its probably worth it.
-                        setIcon(mEntry.icon);
-                    }
-                });
-            }
-            super.onBindViewHolder(holder);
-            holder.itemView.findViewById(R.id.appendix).setVisibility(View.GONE);
-        }
-
-        private CharSequence getDomainsSummary(String packageName) {
-            // If the user has explicitly said "no" for this package, that's the
-            // string we should show.
-            int domainStatus =
-                    mPm.getIntentVerificationStatusAsUser(packageName, UserHandle.myUserId());
-            if (domainStatus == PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER) {
-                return getContext().getString(R.string.domain_urls_summary_none);
-            }
-            // Otherwise, ask package manager for the domains for this package,
-            // and show the first one (or none if there aren't any).
-            ArraySet<String> result = Utils.getHandledDomains(mPm, packageName);
-            if (result.size() == 0) {
-                return getContext().getString(R.string.domain_urls_summary_none);
-            } else if (result.size() == 1) {
-                return getContext().getString(R.string.domain_urls_summary_one, result.valueAt(0));
-            } else {
-                return getContext().getString(R.string.domain_urls_summary_some, result.valueAt(0));
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/applications/RunningProcessesView.java b/src/com/android/settings/applications/RunningProcessesView.java
index c065af4..5491ad1 100644
--- a/src/com/android/settings/applications/RunningProcessesView.java
+++ b/src/com/android/settings/applications/RunningProcessesView.java
@@ -452,8 +452,7 @@
         final Context context = getContext();
         mColorBar.setProgressTintList(
                 ColorStateList.valueOf(context.getColor(R.color.running_processes_system_ram)));
-        mColorBar.setSecondaryProgressTintList(
-                ColorStateList.valueOf(Utils.getColorAccent(context)));
+        mColorBar.setSecondaryProgressTintList(Utils.getColorAccent(context));
         mColorBar.setSecondaryProgressTintMode(PorterDuff.Mode.SRC);
         mColorBar.setProgressBackgroundTintList(
                 ColorStateList.valueOf(context.getColor(R.color.running_processes_free_ram)));
diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java
index 68ed42a..2250f28 100644
--- a/src/com/android/settings/applications/manageapplications/ManageApplications.java
+++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -893,7 +893,7 @@
             } else if (mManageApplications.mListType == LIST_TYPE_USAGE_ACCESS) {
                 mExtraInfoBridge = new AppStateUsageBridge(mContext, mState, this);
             } else if (mManageApplications.mListType == LIST_TYPE_HIGH_POWER) {
-                mExtraInfoBridge = new AppStatePowerBridge(mState, this);
+                mExtraInfoBridge = new AppStatePowerBridge(mContext, mState, this);
             } else if (mManageApplications.mListType == LIST_TYPE_OVERLAY) {
                 mExtraInfoBridge = new AppStateOverlayBridge(mContext, mState, this);
             } else if (mManageApplications.mListType == LIST_TYPE_WRITE_SETTINGS) {
@@ -1285,7 +1285,8 @@
                 return true;
             }
             ApplicationsState.AppEntry entry = mEntries.get(position);
-            return !PowerWhitelistBackend.getInstance().isSysWhitelisted(entry.info.packageName);
+            return !PowerWhitelistBackend.getInstance(mContext)
+                    .isSysWhitelisted(entry.info.packageName);
         }
 
         @Override
diff --git a/src/com/android/settings/applications/managedomainurls/DomainAppPreference.java b/src/com/android/settings/applications/managedomainurls/DomainAppPreference.java
new file mode 100644
index 0000000..a9feedc
--- /dev/null
+++ b/src/com/android/settings/applications/managedomainurls/DomainAppPreference.java
@@ -0,0 +1,90 @@
+/*
+ * 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.applications.managedomainurls;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.UserHandle;
+import android.util.ArraySet;
+import android.util.IconDrawableFactory;
+import android.view.View;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.widget.AppPreference;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+
+import androidx.preference.PreferenceViewHolder;
+
+public class DomainAppPreference extends AppPreference {
+
+    private final AppEntry mEntry;
+    private final PackageManager mPm;
+    private final IconDrawableFactory mIconDrawableFactory;
+
+    public DomainAppPreference(final Context context, IconDrawableFactory iconFactory,
+            AppEntry entry) {
+        super(context);
+        mIconDrawableFactory = iconFactory;
+        mPm = context.getPackageManager();
+        mEntry = entry;
+        mEntry.ensureLabel(getContext());
+
+        setState();
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder holder) {
+        super.onBindViewHolder(holder);
+        holder.itemView.findViewById(R.id.appendix).setVisibility(View.GONE);
+    }
+
+    public void reuse() {
+        setState();
+        notifyChanged();
+    }
+
+    public AppEntry getEntry() {
+        return mEntry;
+    }
+
+    private void setState() {
+        setTitle(mEntry.label);
+        setIcon(mIconDrawableFactory.getBadgedIcon(mEntry.info));
+        setSummary(getDomainsSummary(mEntry.info.packageName));
+    }
+
+    private CharSequence getDomainsSummary(String packageName) {
+        // If the user has explicitly said "no" for this package, that's the
+        // string we should show.
+        int domainStatus =
+                mPm.getIntentVerificationStatusAsUser(packageName, UserHandle.myUserId());
+        if (domainStatus == PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER) {
+            return getContext().getText(R.string.domain_urls_summary_none);
+        }
+        // Otherwise, ask package manager for the domains for this package,
+        // and show the first one (or none if there aren't any).
+        final ArraySet<String> result = Utils.getHandledDomains(mPm, packageName);
+        if (result.isEmpty()) {
+            return getContext().getText(R.string.domain_urls_summary_none);
+        } else if (result.size() == 1) {
+            return getContext().getString(R.string.domain_urls_summary_one, result.valueAt(0));
+        } else {
+            return getContext().getString(R.string.domain_urls_summary_some, result.valueAt(0));
+        }
+    }
+}
diff --git a/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceController.java b/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceController.java
new file mode 100644
index 0000000..a1b9ab5
--- /dev/null
+++ b/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceController.java
@@ -0,0 +1,175 @@
+/*
+ * 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.applications.managedomainurls;
+
+import android.app.Application;
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.ArrayMap;
+import android.util.IconDrawableFactory;
+
+import com.android.settings.R;
+import com.android.settings.applications.AppInfoBase;
+import com.android.settings.applications.AppLaunchSettings;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
+public class DomainAppPreferenceController extends BasePreferenceController implements
+        ApplicationsState.Callbacks {
+
+    // constant value that can be used to check return code from sub activity.
+    private static final int INSTALLED_APP_DETAILS = 1;
+
+    private int mMetricsCategory;
+    private ApplicationsState mApplicationsState;
+    private ApplicationsState.Session mSession;
+    private ManageDomainUrls mFragment;
+    private PreferenceGroup mDomainAppList;
+    private Map<String, Preference> mPreferenceCache;
+
+    public DomainAppPreferenceController(Context context, String key) {
+        super(context, key);
+        mApplicationsState = ApplicationsState.getInstance(
+                (Application) mContext.getApplicationContext());
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mDomainAppList = (PreferenceGroup) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (preference instanceof DomainAppPreference) {
+            ApplicationsState.AppEntry entry = ((DomainAppPreference) preference).getEntry();
+            AppInfoBase.startAppInfoFragment(AppLaunchSettings.class, R.string.auto_launch_label,
+                    entry.info.packageName, entry.info.uid, mFragment,
+                    INSTALLED_APP_DETAILS, mMetricsCategory);
+            return true;
+        }
+        return false;
+    }
+
+    public void setFragment(ManageDomainUrls fragment) {
+        mFragment = fragment;
+        mMetricsCategory = fragment.getMetricsCategory();
+        mSession = mApplicationsState.newSession(this, mFragment.getLifecycle());
+    }
+
+    @Override
+    public void onRunningStateChanged(boolean running) {
+    }
+
+    @Override
+    public void onPackageListChanged() {
+    }
+
+    @Override
+    public void onRebuildComplete(ArrayList<AppEntry> apps) {
+        if (mContext == null) {
+            return;
+        }
+        rebuildAppList(mDomainAppList, apps);
+    }
+
+    @Override
+    public void onPackageIconChanged() {
+    }
+
+    @Override
+    public void onPackageSizeChanged(String packageName) {
+    }
+
+    @Override
+    public void onAllSizesComputed() {
+    }
+
+    @Override
+    public void onLauncherInfoChanged() {
+    }
+
+    @Override
+    public void onLoadEntriesCompleted() {
+        rebuild();
+    }
+
+    private void cacheAllPrefs(PreferenceGroup group) {
+        mPreferenceCache = new ArrayMap();
+        final int count = group.getPreferenceCount();
+        for (int i = 0; i < count; i++) {
+            Preference p = group.getPreference(i);
+            if (TextUtils.isEmpty(p.getKey())) {
+                continue;
+            }
+            mPreferenceCache.put(p.getKey(), p);
+        }
+    }
+
+    private Preference getCachedPreference(String key) {
+        return mPreferenceCache != null ? mPreferenceCache.remove(key) : null;
+    }
+
+    private void removeCachedPrefs(PreferenceGroup group) {
+        for (Preference p : mPreferenceCache.values()) {
+            group.removePreference(p);
+        }
+        mPreferenceCache = null;
+    }
+
+    private void rebuild() {
+        final ArrayList<AppEntry> apps = mSession.rebuild(
+                ApplicationsState.FILTER_WITH_DOMAIN_URLS, ApplicationsState.ALPHA_COMPARATOR);
+        if (apps != null) {
+            onRebuildComplete(apps);
+        }
+    }
+
+    private void rebuildAppList(PreferenceGroup group, ArrayList<AppEntry> apps) {
+        cacheAllPrefs(group);
+        final int size = apps.size();
+        final Context context = group.getContext();
+        final IconDrawableFactory iconDrawableFactory = IconDrawableFactory.newInstance(context);
+        for (int i = 0; i < size; i++) {
+            final AppEntry entry = apps.get(i);
+            final String key = entry.info.packageName + "|" + entry.info.uid;
+            DomainAppPreference preference = (DomainAppPreference) getCachedPreference(key);
+            if (preference == null) {
+                preference = new DomainAppPreference(context, iconDrawableFactory, entry);
+                preference.setKey(key);
+                group.addPreference(preference);
+            } else {
+                preference.reuse();
+            }
+            preference.setOrder(i);
+        }
+        removeCachedPrefs(group);
+    }
+}
diff --git a/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceController.java b/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceController.java
new file mode 100644
index 0000000..36fd788
--- /dev/null
+++ b/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceController.java
@@ -0,0 +1,71 @@
+/*
+ * 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.applications.managedomainurls;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+
+import com.android.settings.core.BasePreferenceController;
+
+import androidx.preference.Preference;
+
+public class InstantAppAccountPreferenceController extends BasePreferenceController {
+
+    private Intent mLaunchIntent;
+
+    public InstantAppAccountPreferenceController(Context context, String key) {
+        super(context, key);
+        initAppSettingsIntent();
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (mLaunchIntent == null || WebActionCategoryController.isDisableWebActions(mContext)) {
+            return UNSUPPORTED_ON_DEVICE;
+        } else {
+            return AVAILABLE;
+        }
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (!getPreferenceKey().equals(preference.getKey())) {
+            return false;
+        }
+        // TODO: Make this button actually launch the account chooser.
+        if (mLaunchIntent != null) {
+            mContext.startActivity(mLaunchIntent);
+        }
+        return true;
+    }
+
+    private void initAppSettingsIntent() {
+        // Determine whether we should show the instant apps account chooser setting
+        ComponentName instantAppSettingsComponent =
+                mContext.getPackageManager().getInstantAppResolverSettingsComponent();
+        Intent instantAppSettingsIntent = null;
+        if (instantAppSettingsComponent != null) {
+            instantAppSettingsIntent =
+                    new Intent().setComponent(instantAppSettingsComponent);
+        }
+
+        if (instantAppSettingsIntent != null) {
+            mLaunchIntent = instantAppSettingsIntent;
+        }
+    }
+}
diff --git a/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceController.java b/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceController.java
new file mode 100644
index 0000000..77abfe7
--- /dev/null
+++ b/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceController.java
@@ -0,0 +1,46 @@
+/*
+ * 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.applications.managedomainurls;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.core.TogglePreferenceController;
+
+public class InstantAppWebActionPreferenceController extends TogglePreferenceController {
+
+    public InstantAppWebActionPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return WebActionCategoryController.isDisableWebActions(mContext)
+                ? UNSUPPORTED_ON_DEVICE
+                : AVAILABLE;
+    }
+
+    public boolean isChecked() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.INSTANT_APPS_ENABLED, 1) == 1;
+    }
+
+    public boolean setChecked(boolean isChecked) {
+        return Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.INSTANT_APPS_ENABLED, isChecked ? 1 : 0);
+    }
+}
diff --git a/src/com/android/settings/applications/managedomainurls/ManageDomainUrls.java b/src/com/android/settings/applications/managedomainurls/ManageDomainUrls.java
new file mode 100644
index 0000000..16f954a
--- /dev/null
+++ b/src/com/android/settings/applications/managedomainurls/ManageDomainUrls.java
@@ -0,0 +1,77 @@
+/*
+ * 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.applications.managedomainurls;
+
+import static com.android.settingslib.search.SearchIndexable.MOBILE;
+
+import android.content.Context;
+import android.provider.SearchIndexableResource;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settingslib.search.SearchIndexable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Activity to manage how Android handles URL resolution. Includes both per-app
+ * handling as well as system handling for Web Actions.
+ */
+@SearchIndexable(forTarget = MOBILE)
+public class ManageDomainUrls extends DashboardFragment {
+
+    private static final String TAG = "ManageDomainUrls";
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        use(DomainAppPreferenceController.class).setFragment(this);
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.manage_domain_url_settings;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.MANAGE_DOMAIN_URLS;
+    }
+
+    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+                        boolean enabled) {
+                    final ArrayList<SearchIndexableResource> result = new ArrayList<>();
+
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.manage_domain_url_settings;
+                    result.add(sir);
+                    return result;
+                }
+            };
+}
diff --git a/src/com/android/settings/applications/managedomainurls/WebActionCategoryController.java b/src/com/android/settings/applications/managedomainurls/WebActionCategoryController.java
new file mode 100644
index 0000000..5aa57db
--- /dev/null
+++ b/src/com/android/settings/applications/managedomainurls/WebActionCategoryController.java
@@ -0,0 +1,39 @@
+/*
+ * 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.applications.managedomainurls;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.core.BasePreferenceController;
+
+public class WebActionCategoryController extends BasePreferenceController {
+
+    public WebActionCategoryController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return isDisableWebActions(mContext) ? UNSUPPORTED_ON_DEVICE : AVAILABLE;
+    }
+
+    public static boolean isDisableWebActions(Context context) {
+        return Settings.Global.getInt(context.getContentResolver(),
+                Settings.Global.ENABLE_EPHEMERAL_FEATURE, 1) == 0;
+    }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
index 85be84c..61bed17 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
@@ -46,7 +46,7 @@
     @VisibleForTesting
     Preference mPreference;
     private LocalBluetoothManager mLocalManager;
-    private LocalBluetoothAdapter mLocalAdapter;
+    protected LocalBluetoothAdapter mLocalAdapter;
 
     /**
      * Constructor exclusively used for Slice.
@@ -77,8 +77,10 @@
 
     @Override
     public void onStart() {
-        mContext.registerReceiver(mReceiver,
-                new IntentFilter(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED));
+        final IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED);
+        intentFilter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
+        mContext.registerReceiver(mReceiver, intentFilter);
     }
 
     @Override
@@ -93,7 +95,7 @@
 
     @Override
     public void updateState(Preference preference) {
-        updateDeviceName(preference);
+        updatePreferenceState(preference);
     }
 
     @Override
@@ -129,7 +131,7 @@
      *
      * @param preference to set the summary for
      */
-    protected void updateDeviceName(final Preference preference) {
+    protected void updatePreferenceState(final Preference preference) {
         preference.setSelectable(false);
         preference.setSummary(getSummary());
     }
@@ -150,8 +152,10 @@
 
             if (TextUtils.equals(action, BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED)) {
                 if (mPreference != null && mLocalAdapter != null && mLocalAdapter.isEnabled()) {
-                    updateDeviceName(mPreference);
+                    updatePreferenceState(mPreference);
                 }
+            } else if (TextUtils.equals(action, BluetoothAdapter.ACTION_STATE_CHANGED)) {
+                updatePreferenceState(mPreference);
             }
         }
     };
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java
index 933145e..3b07bd3 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java
@@ -58,8 +58,9 @@
     }
 
     @Override
-    protected void updateDeviceName(final Preference preference) {
+    protected void updatePreferenceState(final Preference preference) {
         preference.setSummary(getSummary());
+        preference.setVisible(mLocalAdapter != null && mLocalAdapter.isEnabled());
     }
 
     @Override
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingController.java b/src/com/android/settings/bluetooth/BluetoothPairingController.java
index 7d2d7b4..5120cc0 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingController.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingController.java
@@ -57,6 +57,7 @@
     private int mPasskey;
     private String mDeviceName;
     private LocalBluetoothProfile mPbapClientProfile;
+    private boolean mPbapAllowed;
 
     /**
      * Creates an instance of a BluetoothPairingController.
@@ -87,15 +88,20 @@
     @Override
     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         if (isChecked) {
-            mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
+            mPbapAllowed = true;
         } else {
-            mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
+            mPbapAllowed = false;
         }
     }
 
     @Override
     public void onDialogPositiveClick(BluetoothPairingDialogFragment dialog) {
         if (getDialogType() == USER_ENTRY_DIALOG) {
+            if (mPbapAllowed) {
+                mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
+            } else {
+                mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
+            }
             onPair(mUserInput);
         } else {
             onPair(null);
@@ -104,6 +110,7 @@
 
     @Override
     public void onDialogNegativeClick(BluetoothPairingDialogFragment dialog) {
+        mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
         onCancel();
     }
 
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
index b3f6096..2f52aef 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
@@ -22,6 +22,7 @@
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.os.Bundle;
+import android.widget.Toast;
 import androidx.annotation.VisibleForTesting;
 import android.util.Log;
 
@@ -166,6 +167,9 @@
     public void onBluetoothStateChanged(int bluetoothState) {
         super.onBluetoothStateChanged(bluetoothState);
         updateContent(bluetoothState);
+        if (bluetoothState == BluetoothAdapter.STATE_ON) {
+            showBluetoothTurnedOnToast();
+        }
     }
 
     @Override
@@ -205,4 +209,9 @@
         return KEY_AVAIL_DEVICES;
     }
 
+    @VisibleForTesting
+    void showBluetoothTurnedOnToast() {
+        Toast.makeText(getContext(), R.string.connected_device_bluetooth_turned_on_toast,
+                Toast.LENGTH_SHORT).show();
+    }
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
new file mode 100644
index 0000000..e0ed98d
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
@@ -0,0 +1,148 @@
+/*
+ * 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.bluetooth;
+
+import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
+
+import android.annotation.ColorInt;
+import android.app.PendingIntent;
+import android.bluetooth.BluetoothAdapter;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.Uri;
+import android.provider.SettingsSlicesContract;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.SubSettings;
+import com.android.settings.connecteddevice.BluetoothDashboardFragment;
+import com.android.settings.search.DatabaseIndexingUtils;
+import com.android.settings.slices.SliceBroadcastReceiver;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.SliceAction;
+
+/**
+ * Utility class to build a Bluetooth Slice, and handle all associated actions.
+ */
+public class BluetoothSliceBuilder {
+
+    private static final String TAG = "BluetoothSliceBuilder";
+
+    /**
+     * Backing Uri for the Bluetooth Slice.
+     */
+    public static final Uri BLUETOOTH_URI = new Uri.Builder()
+            .scheme(ContentResolver.SCHEME_CONTENT)
+            .authority(SettingsSlicesContract.AUTHORITY)
+            .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
+            .appendPath(SettingsSlicesContract.KEY_BLUETOOTH)
+            .build();
+
+    /**
+     * Action notifying a change on the BluetoothSlice.
+     */
+    public static final String ACTION_BLUETOOTH_SLICE_CHANGED =
+            "com.android.settings.bluetooth.action.BLUETOOTH_MODE_CHANGED";
+
+    public static final IntentFilter INTENT_FILTER = new IntentFilter();
+
+    static {
+        INTENT_FILTER.addAction(BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED);
+        INTENT_FILTER.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
+    }
+
+    private BluetoothSliceBuilder() {
+    }
+
+    /**
+     * Return a Bluetooth Slice bound to {@link #BLUETOOTH_URI}.
+     * <p>
+     * Note that you should register a listener for {@link #INTENT_FILTER} to get changes for
+     * Bluetooth.
+     */
+    public static Slice getSlice(Context context) {
+        final boolean isBluetoothEnabled = isBluetoothEnabled();
+        final CharSequence title = context.getText(R.string.bluetooth_settings);
+        final IconCompat icon = IconCompat.createWithResource(context,
+                R.drawable.ic_settings_bluetooth);
+        @ColorInt final int color = com.android.settings.Utils.getColorAccent(
+                context).getDefaultColor();
+        final PendingIntent toggleAction = getBroadcastIntent(context);
+        final PendingIntent primaryAction = getPrimaryAction(context);
+        final SliceAction primarySliceAction = new SliceAction(primaryAction, icon, title);
+        final SliceAction toggleSliceAction = new SliceAction(toggleAction, null /* actionTitle */,
+                isBluetoothEnabled);
+
+        return new ListBuilder(context, BLUETOOTH_URI, ListBuilder.INFINITY)
+                .setAccentColor(color)
+                .addRow(b -> b
+                        .setTitle(title)
+                        .addEndItem(toggleSliceAction)
+                        .setPrimaryAction(primarySliceAction))
+                .build();
+    }
+
+    public static Intent getIntent(Context context) {
+        final String screenTitle = context.getText(R.string.bluetooth_settings_title).toString();
+        final Uri contentUri = new Uri.Builder().appendPath(
+                SettingsSlicesContract.KEY_BLUETOOTH).build();
+        return DatabaseIndexingUtils.buildSearchResultPageIntent(context,
+                BluetoothDashboardFragment.class.getName(), null /* key */, screenTitle,
+                MetricsProto.MetricsEvent.SETTINGS_CONNECTED_DEVICE_CATEGORY)
+                .setClassName(context.getPackageName(), SubSettings.class.getName())
+                .setData(contentUri);
+    }
+
+    /**
+     * Update the current Bluetooth status to the boolean value keyed by
+     * {@link android.app.slice.Slice#EXTRA_TOGGLE_STATE} on {@param intent}.
+     */
+    public static void handleUriChange(Context context, Intent intent) {
+        final boolean newBluetoothState = intent.getBooleanExtra(EXTRA_TOGGLE_STATE, false);
+        final LocalBluetoothAdapter adapter = LocalBluetoothManager.getInstance(context,
+                null /* callback */).getBluetoothAdapter();
+
+        adapter.setBluetoothEnabled(newBluetoothState);
+        // Do not notifyChange on Uri. The service takes longer to update the current value than it
+        // does for the Slice to check the current value again. Let {@link SliceBroadcastRelay}
+        // handle it.
+    }
+
+    private static boolean isBluetoothEnabled() {
+        final BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+        return adapter.isEnabled();
+    }
+
+    private static PendingIntent getPrimaryAction(Context context) {
+        final Intent intent = getIntent(context);
+        return PendingIntent.getActivity(context, 0 /* requestCode */,
+                intent, 0 /* flags */);
+    }
+
+    private static PendingIntent getBroadcastIntent(Context context) {
+        final Intent intent = new Intent(ACTION_BLUETOOTH_SLICE_CHANGED)
+                .setClass(context, SliceBroadcastReceiver.class);
+        return PendingIntent.getBroadcast(context, 0 /* requestCode */, intent,
+                PendingIntent.FLAG_CANCEL_CURRENT);
+    }
+}
diff --git a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java
new file mode 100644
index 0000000..2ff96a7
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 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.connecteddevice;
+
+import android.content.Context;
+import android.provider.Settings;
+import androidx.annotation.VisibleForTesting;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.nfc.NfcPreferenceController;
+
+/**
+ * Controller that used to show which component is available
+ */
+public class AdvancedConnectedDeviceController extends BasePreferenceController {
+
+    private static final String DRIVING_MODE_SETTINGS_ENABLED =
+            "gearhead:driving_mode_settings_enabled";
+
+    public AdvancedConnectedDeviceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        return mContext.getText(getConnectedDevicesSummaryResourceId(mContext));
+    }
+
+    /**
+     * Get Connected Devices summary that depend on {@link NfcPreferenceController} or
+     * diving mode are available
+     */
+    public static int getConnectedDevicesSummaryResourceId(Context context) {
+        final NfcPreferenceController nfcPreferenceController =
+                new NfcPreferenceController(context, NfcPreferenceController.KEY_TOGGLE_NFC);
+
+        return getConnectedDevicesSummaryResourceId(nfcPreferenceController,
+                isDrivingModeAvailable(context));
+    }
+
+    @VisibleForTesting
+    static boolean isDrivingModeAvailable(Context context) {
+        return Settings.System.
+                getInt(context.getContentResolver(), DRIVING_MODE_SETTINGS_ENABLED, 0) == 1;
+    }
+
+    @VisibleForTesting
+    static int getConnectedDevicesSummaryResourceId(NfcPreferenceController
+            nfcPreferenceController, boolean isDrivingModeAvailable) {
+        final int resId;
+
+        if (nfcPreferenceController.isAvailable()) {
+            if (isDrivingModeAvailable) {
+                // NFC available, driving mode available
+                resId = R.string.connected_devices_dashboard_summary;
+            } else {
+                // NFC available, driving mode not available
+                resId = R.string.connected_devices_dashboard_no_driving_mode_summary;
+            }
+        } else {
+            if (isDrivingModeAvailable) {
+                // NFC not available, driving mode available
+                resId = R.string.connected_devices_dashboard_no_nfc_summary;
+            } else {
+                // NFC not available, driving mode not available
+                resId = R.string.connected_devices_dashboard_no_driving_mode_no_nfc_summary;
+            }
+        }
+
+        return resId;
+    }
+}
diff --git a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
index e437b76..e9d291d 100644
--- a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
@@ -24,7 +24,6 @@
 import com.android.settings.bluetooth.BluetoothFilesPreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.nfc.AndroidBeamPreferenceController;
-import com.android.settings.nfc.NfcPreferenceController;
 import com.android.settings.print.PrintSettingPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -43,6 +42,8 @@
 
     private static final String TAG = "AdvancedConnectedDeviceFrag";
 
+    static final String KEY_BLUETOOTH = "bluetooth_settings";
+
     @Override
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.CONNECTION_DEVICE_ADVANCED;
@@ -72,25 +73,15 @@
             Lifecycle lifecycle) {
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
 
-        final AndroidBeamPreferenceController beamPreferenceController =
-                new AndroidBeamPreferenceController(context);
-        controllers.add(beamPreferenceController);
-
         controllers.add(new BluetoothFilesPreferenceController(context));
         controllers.add(new BluetoothOnWhileDrivingPreferenceController(context));
 
         final PrintSettingPreferenceController printerController =
                 new PrintSettingPreferenceController(context);
-        final NfcPreferenceController nfcPreferenceController =
-                new NfcPreferenceController(context);
 
         if (lifecycle != null) {
-            lifecycle.addObserver(beamPreferenceController);
             lifecycle.addObserver(printerController);
-            lifecycle.addObserver(nfcPreferenceController);
         }
-
-        controllers.add(nfcPreferenceController);
         controllers.add(printerController);
 
         return controllers;
@@ -117,6 +108,9 @@
                         keys.add(AndroidBeamPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
                     }
 
+                    // Parent duplicate
+                    keys.add(KEY_BLUETOOTH);
+
                     return keys;
                 }
 
diff --git a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
index e61bf84..bb58cc3 100644
--- a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
@@ -111,17 +111,10 @@
                     final List<SearchIndexableRaw> result = new ArrayList<>();
 
                     // Add the activity title
-                    SearchIndexableRaw data = new SearchIndexableRaw(context);
+                    final SearchIndexableRaw data = new SearchIndexableRaw(context);
                     data.title = context.getString(R.string.bluetooth_settings_title);
-                    data.screenTitle = context.getString(R.string.settings_label);
+                    data.screenTitle = context.getString(R.string.bluetooth_settings_title);
                     data.keywords = context.getString(R.string.keywords_bluetooth_settings);
-                    data.intentTargetPackage = context.getPackageName();
-                    data.intentTargetClass = BluetoothDashboardFragment.class.getName();
-                    data.intentAction = new SubSettingLauncher(context)
-                            .setDestination(ScanningSettings.class.getName())
-                            .setSourceMetricsCategory(MetricsProto.MetricsEvent.BLUETOOTH_FRAGMENT)
-                            .toIntent()
-                            .getAction();
                     data.key = KEY_BLUETOOTH_SCREEN;
                     result.add(data);
 
diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
index cb9b871..a17dd87 100644
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
@@ -26,8 +26,11 @@
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.nfc.NfcPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.search.SearchIndexable;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -62,11 +65,31 @@
     }
 
     @Override
+    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getLifecycle());
+    }
+
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
+            Lifecycle lifecycle) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        final DiscoverableFooterPreferenceController discoverableFooterPreferenceController =
+                new DiscoverableFooterPreferenceController(context);
+        controllers.add(discoverableFooterPreferenceController);
+
+        if (lifecycle != null) {
+            lifecycle.addObserver(discoverableFooterPreferenceController);
+        }
+
+        return controllers;
+    }
+
+    @Override
     public void onAttach(Context context) {
         super.onAttach(context);
         use(AvailableMediaDeviceGroupController.class).init(this);
         use(ConnectedDeviceGroupController.class).init(this);
         use(PreviouslyConnectedDevicePreferenceController.class).init(this);
+        use(DiscoverableFooterPreferenceController.class).init(this);
     }
 
     @VisibleForTesting
@@ -74,25 +97,17 @@
 
         private final Context mContext;
         private final SummaryLoader mSummaryLoader;
-        private final NfcPreferenceController mNfcPreferenceController;
 
         public SummaryProvider(Context context, SummaryLoader summaryLoader) {
             mContext = context;
             mSummaryLoader = summaryLoader;
-            mNfcPreferenceController = new NfcPreferenceController(context);
         }
 
-
         @Override
         public void setListening(boolean listening) {
             if (listening) {
-                if (mNfcPreferenceController.isAvailable()) {
-                    mSummaryLoader.setSummary(this,
-                            mContext.getString(R.string.connected_devices_dashboard_summary));
-                } else {
-                    mSummaryLoader.setSummary(this, mContext.getString(
-                            R.string.connected_devices_dashboard_no_nfc_summary));
-                }
+                mSummaryLoader.setSummary(this, mContext.getText(AdvancedConnectedDeviceController.
+                        getConnectedDevicesSummaryResourceId(mContext)));
             }
         }
     }
@@ -120,6 +135,12 @@
                 }
 
                 @Override
+                public List<AbstractPreferenceController> createPreferenceControllers(Context
+                        context) {
+                    return buildPreferenceControllers(context, null /* lifecycle */);
+                }
+
+                @Override
                 public List<String> getNonIndexableKeys(Context context) {
                     List<String> keys = super.getNonIndexableKeys(context);
                     // Disable because they show dynamic data
diff --git a/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java b/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java
new file mode 100644
index 0000000..a1fb4c1
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java
@@ -0,0 +1,145 @@
+/*
+ * 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.connecteddevice;
+
+import android.bluetooth.BluetoothAdapter;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.text.BidiFormatter;
+import android.text.TextUtils;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.bluetooth.AlwaysDiscoverable;
+import com.android.settings.bluetooth.Utils;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.R;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.widget.FooterPreference;
+import com.android.settingslib.widget.FooterPreferenceMixin;
+
+/**
+ * Controller that shows and updates the bluetooth device name
+ */
+public class DiscoverableFooterPreferenceController extends BasePreferenceController
+        implements LifecycleObserver, OnResume, OnPause {
+    private static final String KEY = "discoverable_footer_preference";
+
+    @VisibleForTesting
+    BroadcastReceiver mBluetoothChangedReceiver;
+    private FooterPreferenceMixin mFooterPreferenceMixin;
+    private FooterPreference mPreference;
+    private LocalBluetoothManager mLocalManager;
+    private LocalBluetoothAdapter mLocalAdapter;
+    private AlwaysDiscoverable mAlwaysDiscoverable;
+
+    public DiscoverableFooterPreferenceController(Context context) {
+        super(context, KEY);
+        mLocalManager = Utils.getLocalBtManager(context);
+        if (mLocalManager == null) {
+            return;
+        }
+        mLocalAdapter = mLocalManager.getBluetoothAdapter();
+        mAlwaysDiscoverable = new AlwaysDiscoverable(context, mLocalAdapter);
+        initReceiver();
+    }
+
+    private void initReceiver() {
+        mBluetoothChangedReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                if (intent.getAction().equals(BluetoothAdapter.ACTION_STATE_CHANGED)) {
+                    final int state = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE,
+                            BluetoothAdapter.ERROR);
+                    updateFooterPreferenceTitle(state);
+                }
+            }
+        };
+    }
+
+    public void init(DashboardFragment fragment) {
+        mFooterPreferenceMixin = new FooterPreferenceMixin(fragment, fragment.getLifecycle());
+    }
+
+    @VisibleForTesting
+    void init(FooterPreferenceMixin footerPreferenceMixin, FooterPreference preference,
+            AlwaysDiscoverable alwaysDiscoverable) {
+        mFooterPreferenceMixin = footerPreferenceMixin;
+        mPreference = preference;
+        mAlwaysDiscoverable = alwaysDiscoverable;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        addFooterPreference(screen);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
+                ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
+    }
+
+    private void addFooterPreference(PreferenceScreen screen) {
+        mPreference = mFooterPreferenceMixin.createFooterPreference();
+        mPreference.setKey(KEY);
+        screen.addPreference(mPreference);
+    }
+
+    @Override
+    public void onResume() {
+        mContext.registerReceiver(mBluetoothChangedReceiver,
+                new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED));
+        mAlwaysDiscoverable.start();
+        updateFooterPreferenceTitle(mLocalAdapter.getState());
+    }
+
+    @Override
+    public void onPause() {
+        mContext.unregisterReceiver(mBluetoothChangedReceiver);
+        mAlwaysDiscoverable.stop();
+    }
+
+    private void updateFooterPreferenceTitle (int bluetoothState) {
+        if (bluetoothState == BluetoothAdapter.STATE_ON) {
+            mPreference.setTitle(getPreferenceTitle());
+        } else {
+            mPreference.setTitle(R.string.bluetooth_off_footer);
+        }
+    }
+
+    private CharSequence getPreferenceTitle() {
+        final String deviceName = mLocalAdapter.getName();
+        if (TextUtils.isEmpty(deviceName)) {
+            return null;
+        }
+
+        return TextUtils.expandTemplate(
+                mContext.getText(R.string.bluetooth_device_name_summary),
+                BidiFormatter.getInstance().unicodeWrap(deviceName));
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/core/BasePreferenceController.java b/src/com/android/settings/core/BasePreferenceController.java
index 7110b77..b18581a 100644
--- a/src/com/android/settings/core/BasePreferenceController.java
+++ b/src/com/android/settings/core/BasePreferenceController.java
@@ -235,6 +235,33 @@
     }
 
     /**
+     * Determines if the controller should be used as a Slice.
+     * <p>
+     *     Important criteria for a Slice are:
+     *     - Must be secure
+     *     - Must not be a privacy leak
+     *     - Must be understandable as a stand-alone Setting.
+     * <p>
+     *     This does not guarantee the setting is available. {@link #isAvailable()} should sill be
+     *     called.
+     *
+     * @return {@code true} if the controller should be used externally as a Slice.
+     */
+    public boolean isSliceable() {
+        return false;
+    }
+
+    /**
+     * @return {@code true} if the setting update asynchronously.
+     * <p>
+     * For example, a Wifi controller would return true, because it needs to update the radio
+     * and wait for it to turn on.
+     */
+    public boolean hasAsyncUpdate() {
+        return false;
+    }
+
+    /**
      * Updates non-indexable keys for search provider.
      *
      * Called by SearchIndexProvider#getNonIndexableKeys
diff --git a/src/com/android/settings/core/FeatureFlags.java b/src/com/android/settings/core/FeatureFlags.java
index e77c27b..a1bce23 100644
--- a/src/com/android/settings/core/FeatureFlags.java
+++ b/src/com/android/settings/core/FeatureFlags.java
@@ -22,7 +22,6 @@
 public class FeatureFlags {
     public static final String BATTERY_DISPLAY_APP_LIST = "settings_battery_display_app_list";
     public static final String ZONE_PICKER_V2 = "settings_zone_picker_v2";
-    public static final String ABOUT_PHONE_V2 = "settings_about_phone_v2";
     public static final String BLUETOOTH_WHILE_DRIVING = "settings_bluetooth_while_driving";
     public static final String DATA_USAGE_SETTINGS_V2 = "settings_data_usage_v2";
     public static final String AUDIO_SWITCHER_SETTINGS = "settings_audio_switcher";
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index aab3512..6cf29597 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -36,7 +36,6 @@
 import com.android.settings.applications.AppAndNotificationDashboardFragment;
 import com.android.settings.applications.DefaultAppSettings;
 import com.android.settings.applications.DirectoryAccessDetails;
-import com.android.settings.applications.ManageDomainUrls;
 import com.android.settings.applications.ProcessStatsSummary;
 import com.android.settings.applications.ProcessStatsUi;
 import com.android.settings.applications.UsageAccessDetails;
@@ -50,6 +49,7 @@
 import com.android.settings.applications.appops.BackgroundCheckSummary;
 import com.android.settings.applications.assist.ManageAssist;
 import com.android.settings.applications.manageapplications.ManageApplications;
+import com.android.settings.applications.managedomainurls.ManageDomainUrls;
 import com.android.settings.backup.PrivacySettings;
 import com.android.settings.backup.ToggleBackupSettingFragment;
 import com.android.settings.bluetooth.BluetoothDeviceDetailsFragment;
@@ -62,7 +62,6 @@
 import com.android.settings.datausage.DataUsageSummaryLegacy;
 import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;
 import com.android.settings.development.DevelopmentSettingsDashboardFragment;
-import com.android.settings.deviceinfo.DeviceInfoSettings;
 import com.android.settings.deviceinfo.PrivateVolumeForget;
 import com.android.settings.deviceinfo.PrivateVolumeSettings;
 import com.android.settings.deviceinfo.PublicVolumeSettings;
@@ -79,9 +78,9 @@
 import com.android.settings.gestures.DoubleTapPowerSettings;
 import com.android.settings.gestures.DoubleTapScreenSettings;
 import com.android.settings.gestures.DoubleTwistGestureSettings;
-import com.android.settings.gestures.SwipeUpGestureSettings;
 import com.android.settings.gestures.PickupGestureSettings;
 import com.android.settings.gestures.SwipeToNotificationSettings;
+import com.android.settings.gestures.SwipeUpGestureSettings;
 import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment;
 import com.android.settings.inputmethod.KeyboardLayoutPickerFragment;
 import com.android.settings.inputmethod.PhysicalKeyboardFragment;
@@ -106,10 +105,8 @@
 import com.android.settings.notification.SoundSettings;
 import com.android.settings.notification.ZenAccessSettings;
 import com.android.settings.notification.ZenModeAutomationSettings;
-import com.android.settings.notification.ZenModeMsgEventReminderSettings;
 import com.android.settings.notification.ZenModeBlockedEffectsSettings;
 import com.android.settings.notification.ZenModeEventRuleSettings;
-import com.android.settings.notification.ZenModeRestrictNotificationsSettings;
 import com.android.settings.notification.ZenModeScheduleRuleSettings;
 import com.android.settings.notification.ZenModeSettings;
 import com.android.settings.password.ChooseLockPassword;
@@ -161,7 +158,6 @@
             UserDictionaryList.class.getName(),
             UserDictionarySettings.class.getName(),
             DisplaySettings.class.getName(),
-            DeviceInfoSettings.class.getName(),
             MyDeviceInfoFragment.class.getName(),
             ManageApplications.class.getName(),
             ManageAssist.class.getName(),
@@ -296,7 +292,6 @@
             // Home page > System
             Settings.LanguageAndInputSettingsActivity.class.getName(),
             Settings.DateTimeSettingsActivity.class.getName(),
-            Settings.DeviceInfoSettingsActivity.class.getName(),
             Settings.EnterprisePrivacySettingsActivity.class.getName(),
             Settings.MyDeviceInfoActivity.class.getName(),
     };
diff --git a/src/com/android/settings/dashboard/RoundedHomepageIcon.java b/src/com/android/settings/dashboard/RoundedHomepageIcon.java
index 77acaf3..9848034 100644
--- a/src/com/android/settings/dashboard/RoundedHomepageIcon.java
+++ b/src/com/android/settings/dashboard/RoundedHomepageIcon.java
@@ -22,12 +22,16 @@
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
-import androidx.annotation.VisibleForTesting;
+import android.util.Log;
 
 import com.android.settings.R;
 
+import androidx.annotation.VisibleForTesting;
+
 public class RoundedHomepageIcon extends LayerDrawable {
 
+    private static final String TAG = "RoundedHomepageIcon";
+
     @VisibleForTesting(otherwise = NONE)
     int mBackgroundColor = -1;
 
@@ -44,5 +48,6 @@
     public void setBackgroundColor(int color) {
         mBackgroundColor = color;
         getDrawable(0).setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
+        Log.d(TAG, "Setting background color " + mBackgroundColor);
     }
 }
diff --git a/src/com/android/settings/dashboard/conditional/BatterySaverCondition.java b/src/com/android/settings/dashboard/conditional/BatterySaverCondition.java
index 621f371..ab7f792 100644
--- a/src/com/android/settings/dashboard/conditional/BatterySaverCondition.java
+++ b/src/com/android/settings/dashboard/conditional/BatterySaverCondition.java
@@ -47,7 +47,7 @@
 
     @Override
     public Drawable getIcon() {
-        return new BatterySaverDrawable(mManager.getContext(), 0);
+        return mManager.getContext().getDrawable(R.drawable.ic_battery_saver_accent_24dp);
     }
 
     @Override
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
index 4a3bc33..da0991b 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
@@ -120,7 +120,7 @@
         final Icon icon = suggestion.getIcon();
         final Drawable drawable = mCache.getIcon(icon);
         if (drawable != null && (suggestion.getFlags() & Suggestion.FLAG_ICON_TINTABLE) != 0) {
-            drawable.setTint(Utils.getColorAccent(mContext));
+            drawable.setTintList(Utils.getColorAccent(mContext));
         }
         holder.icon.setImageDrawable(drawable);
         holder.title.setText(suggestion.getTitle());
diff --git a/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java b/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java
new file mode 100644
index 0000000..6ba0a80
--- /dev/null
+++ b/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 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.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.SwitchPreference;
+import androidx.preference.Preference;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class BluetoothA2dpHwOffloadPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+    private static final String PREFERENCE_KEY = "bluetooth_disable_a2dp_hw_offload";
+    private final DevelopmentSettingsDashboardFragment mFragment;
+
+    static final String A2DP_OFFLOAD_DISABLED_PROPERTY = "persist.bluetooth.a2dp_offload.disabled";
+    static final String A2DP_OFFLOAD_SUPPORTED_PROPERTY = "ro.bluetooth.a2dp_offload.supported";
+
+    public BluetoothA2dpHwOffloadPreferenceController(Context context,
+            DevelopmentSettingsDashboardFragment fragment) {
+        super(context);
+        mFragment = fragment;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return PREFERENCE_KEY;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        BluetoothA2dpHwOffloadRebootDialog.show(mFragment, this);
+        return false;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        final boolean offloadSupported =
+                SystemProperties.getBoolean(A2DP_OFFLOAD_SUPPORTED_PROPERTY, false);
+        if (offloadSupported) {
+            final boolean offloadDisabled =
+                    SystemProperties.getBoolean(A2DP_OFFLOAD_DISABLED_PROPERTY, false);
+            ((SwitchPreference) mPreference).setChecked(offloadDisabled);
+        } else {
+            mPreference.setEnabled(false);
+            ((SwitchPreference) mPreference).setChecked(true);
+        }
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
+        final boolean offloadSupported =
+                SystemProperties.getBoolean(A2DP_OFFLOAD_SUPPORTED_PROPERTY, false);
+        if (offloadSupported) {
+            ((SwitchPreference) mPreference).setChecked(false);
+            SystemProperties.set(A2DP_OFFLOAD_DISABLED_PROPERTY, "false");
+        } else {
+            ((SwitchPreference) mPreference).setChecked(true);
+            SystemProperties.set(A2DP_OFFLOAD_DISABLED_PROPERTY, "true");
+        }
+    }
+
+    public void onA2dpHwDialogConfirmed() {
+        final boolean offloadDisabled =
+                SystemProperties.getBoolean(A2DP_OFFLOAD_DISABLED_PROPERTY, false);
+        SystemProperties.set(A2DP_OFFLOAD_DISABLED_PROPERTY, Boolean.toString(!offloadDisabled));
+    }
+
+}
diff --git a/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java b/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java
new file mode 100644
index 0000000..6fe03dd
--- /dev/null
+++ b/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 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.development;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.FragmentManager;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.os.PowerManager;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
+public class BluetoothA2dpHwOffloadRebootDialog extends InstrumentedDialogFragment
+        implements DialogInterface.OnClickListener {
+
+    public static final String TAG = "BluetoothA2dpHwOffloadReboot";
+
+    public static void show(DevelopmentSettingsDashboardFragment host,
+            BluetoothA2dpHwOffloadPreferenceController controller) {
+        final FragmentManager manager = host.getActivity().getFragmentManager();
+        if (manager.findFragmentByTag(TAG) == null) {
+            final BluetoothA2dpHwOffloadRebootDialog dialog =
+                    new BluetoothA2dpHwOffloadRebootDialog();
+            dialog.setTargetFragment(host, 0 /* requestCode */);
+            dialog.show(manager, TAG);
+        }
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DIALOG_BLUETOOTH_DISABLE_A2DP_HW_OFFLOAD;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        return new AlertDialog.Builder(getActivity())
+                .setMessage(R.string.bluetooth_disable_a2dp_hw_offload_dialog_message)
+                .setTitle(R.string.bluetooth_disable_a2dp_hw_offload_dialog_title)
+                .setPositiveButton(
+                        R.string.bluetooth_disable_a2dp_hw_offload_dialog_confirm, this)
+                .setNegativeButton(
+                        R.string.bluetooth_disable_a2dp_hw_offload_dialog_cancel, this)
+                .create();
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        final OnA2dpHwDialogConfirmedListener host =
+                (OnA2dpHwDialogConfirmedListener) getTargetFragment();
+        if (host == null) {
+            return;
+        }
+        if (which == DialogInterface.BUTTON_POSITIVE) {
+            host.onA2dpHwDialogConfirmed();
+            PowerManager pm = getContext().getSystemService(PowerManager.class);
+            pm.reboot(null);
+        }
+    }
+
+    public interface OnA2dpHwDialogConfirmedListener {
+        /**
+         * Called when the user presses reboot on the warning dialog.
+         */
+        void onA2dpHwDialogConfirmed();
+    }
+}
diff --git a/src/com/android/settings/development/ConnectivityMonitorPreferenceController.java b/src/com/android/settings/development/ConnectivityMonitorPreferenceController.java
deleted file mode 100644
index de5b2cc..0000000
--- a/src/com/android/settings/development/ConnectivityMonitorPreferenceController.java
+++ /dev/null
@@ -1,100 +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.os.SystemProperties;
-import androidx.preference.SwitchPreference;
-import androidx.preference.Preference;
-import android.text.TextUtils;
-import android.widget.Toast;
-
-import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
-public class ConnectivityMonitorPreferenceController extends DeveloperOptionsPreferenceController
-        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
-
-    private static final String KEY_CONNECTIVITY_MONITOR_SWITCH = "connectivity_monitor_switch";
-    @VisibleForTesting
-    static final String BUILD_TYPE = "ro.build.type";
-    @VisibleForTesting
-    static final String PROPERTY_CONNECTIVITY_MONITOR = "persist.radio.enable_tel_mon";
-
-    @VisibleForTesting
-    static final String ENABLED_STATUS = "enabled";
-    @VisibleForTesting
-    static final String DISABLED_STATUS = "disabled";
-    @VisibleForTesting
-    static final String USER_ENABLED_STATUS = "user_enabled";
-    @VisibleForTesting
-    static final String USER_DISABLED_STATUS = "user_disabled";
-
-    @VisibleForTesting
-    static final String USERDEBUG_BUILD = "userdebug";
-    @VisibleForTesting
-    static final String ENG_BUILD = "eng";
-
-    public ConnectivityMonitorPreferenceController(Context context) {
-        super(context);
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_CONNECTIVITY_MONITOR_SWITCH;
-    }
-
-    @Override
-    public boolean isAvailable() {
-        final String buildType = SystemProperties.get(BUILD_TYPE);
-        return mContext.getResources().getBoolean(R.bool.config_show_connectivity_monitor)
-                && (TextUtils.equals(buildType, USERDEBUG_BUILD)
-                || TextUtils.equals(buildType, ENG_BUILD));
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        final boolean isEnabled = (Boolean) newValue;
-        SystemProperties.set(PROPERTY_CONNECTIVITY_MONITOR,
-                isEnabled ? USER_ENABLED_STATUS : USER_DISABLED_STATUS);
-        Toast.makeText(mContext, R.string.connectivity_monitor_toast,
-                Toast.LENGTH_LONG).show();
-        return true;
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        final boolean enabled = isConnectivityMonitorEnabled();
-        ((SwitchPreference) mPreference).setChecked(enabled);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchDisabled() {
-        super.onDeveloperOptionsSwitchDisabled();
-        SystemProperties.set(PROPERTY_CONNECTIVITY_MONITOR, USER_DISABLED_STATUS);
-        ((SwitchPreference) mPreference).setChecked(false);
-    }
-
-    private boolean isConnectivityMonitorEnabled() {
-        final String cmStatus = SystemProperties.get(PROPERTY_CONNECTIVITY_MONITOR,
-                DISABLED_STATUS);
-        return TextUtils.equals(ENABLED_STATUS, cmStatus) || TextUtils.equals(USER_ENABLED_STATUS,
-                cmStatus);
-    }
-}
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index ba3653a..769f4da 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -58,7 +58,8 @@
 @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
 public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFragment
         implements SwitchBar.OnSwitchChangeListener, OemUnlockDialogHost, AdbDialogHost,
-        AdbClearKeysDialogHost, LogPersistDialogHost {
+        AdbClearKeysDialogHost, LogPersistDialogHost,
+        BluetoothA2dpHwOffloadRebootDialog.OnA2dpHwDialogConfirmedListener {
 
     private static final String TAG = "DevSettingsDashboard";
 
@@ -272,6 +273,13 @@
     }
 
     @Override
+    public void onA2dpHwDialogConfirmed() {
+        final BluetoothA2dpHwOffloadPreferenceController controller =
+                getDevelopmentOptionsController(BluetoothA2dpHwOffloadPreferenceController.class);
+        controller.onA2dpHwDialogConfirmed();
+    }
+
+    @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         boolean handledResult = false;
         for (AbstractPreferenceController controller : mPreferenceControllers) {
@@ -397,7 +405,6 @@
         controllers.add(new VerifyAppsOverUsbPreferenceController(context));
         controllers.add(new LogdSizePreferenceController(context));
         controllers.add(new LogPersistPreferenceController(context, fragment, lifecycle));
-        controllers.add(new ConnectivityMonitorPreferenceController(context));
         controllers.add(new CameraLaserSensorPreferenceController(context));
         controllers.add(new WifiDisplayCertificationPreferenceController(context));
         controllers.add(new WifiVerboseLoggingPreferenceController(context));
@@ -407,6 +414,7 @@
         controllers.add(new BluetoothDeviceNoNamePreferenceController(context));
         controllers.add(new BluetoothAbsoluteVolumePreferenceController(context));
         controllers.add(new BluetoothAvrcpVersionPreferenceController(context));
+        controllers.add(new BluetoothA2dpHwOffloadPreferenceController(context, fragment));
         controllers.add(new BluetoothAudioCodecPreferenceController(context, lifecycle,
                 bluetoothA2dpConfigStore));
         controllers.add(new BluetoothAudioSampleRatePreferenceController(context, lifecycle,
diff --git a/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java b/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java
index 3d551cd..46b493f 100644
--- a/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java
+++ b/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java
@@ -19,20 +19,23 @@
 import static android.os.UserHandle.USER_SYSTEM;
 
 import android.content.Context;
+import android.content.om.IOverlayManager;
+import android.content.om.OverlayInfo;
 import android.content.pm.PackageManager;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.text.TextUtils;
+import android.view.DisplayCutout;
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
-import android.text.TextUtils;
-import android.view.DisplayCutout;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.wrapper.OverlayManagerWrapper;
-import com.android.settings.wrapper.OverlayManagerWrapper.OverlayInfo;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class EmulateDisplayCutoutPreferenceController extends
@@ -41,7 +44,7 @@
 
     private static final String KEY = "display_cutout_emulation";
 
-    private final OverlayManagerWrapper mOverlayManager;
+    private final IOverlayManager mOverlayManager;
     private final boolean mAvailable;
 
     private ListPreference mPreference;
@@ -49,7 +52,7 @@
 
     @VisibleForTesting
     EmulateDisplayCutoutPreferenceController(Context context, PackageManager packageManager,
-            OverlayManagerWrapper overlayManager) {
+            IOverlayManager overlayManager) {
         super(context);
         mOverlayManager = overlayManager;
         mPackageManager = packageManager;
@@ -57,7 +60,8 @@
     }
 
     public EmulateDisplayCutoutPreferenceController(Context context) {
-        this(context, context.getPackageManager(), new OverlayManagerWrapper());
+        this(context, context.getPackageManager(), IOverlayManager.Stub
+                .asInterface(ServiceManager.getService(Context.OVERLAY_SERVICE)));
     }
 
     @Override
@@ -102,10 +106,14 @@
         }
 
         final boolean result;
-        if (TextUtils.isEmpty(packageName)) {
-            result = mOverlayManager.setEnabled(currentPackageName, false, USER_SYSTEM);
-        } else {
-            result = mOverlayManager.setEnabledExclusiveInCategory(packageName, USER_SYSTEM);
+        try {
+            if (TextUtils.isEmpty(packageName)) {
+                result = mOverlayManager.setEnabled(currentPackageName, false, USER_SYSTEM);
+            } else {
+                result = mOverlayManager.setEnabledExclusiveInCategory(packageName, USER_SYSTEM);
+            }
+        } catch (RemoteException re) {
+            throw re.rethrowFromSystemServer();
         }
         updateState(mPreference);
         return result;
@@ -145,13 +153,17 @@
     }
 
     private OverlayInfo[] getOverlayInfos() {
-        @SuppressWarnings("unchecked") List<OverlayInfo> overlayInfos =
-                mOverlayManager.getOverlayInfosForTarget("android", USER_SYSTEM);
-        for (int i = overlayInfos.size() - 1; i >= 0; i--) {
-            if (!DisplayCutout.EMULATION_OVERLAY_CATEGORY.equals(
-                    overlayInfos.get(i).category)) {
-                overlayInfos.remove(i);
+        List<OverlayInfo> overlayInfos;
+        try {
+            overlayInfos = mOverlayManager.getOverlayInfosForTarget("android", USER_SYSTEM);
+            for (int i = overlayInfos.size() - 1; i >= 0; i--) {
+                if (!DisplayCutout.EMULATION_OVERLAY_CATEGORY.equals(
+                        overlayInfos.get(i).category)) {
+                    overlayInfos.remove(i);
+                }
             }
+        } catch (RemoteException re) {
+            throw re.rethrowFromSystemServer();
         }
         return overlayInfos.toArray(new OverlayInfo[overlayInfos.size()]);
     }
diff --git a/src/com/android/settings/deviceinfo/DeviceInfoSettings.java b/src/com/android/settings/deviceinfo/DeviceInfoSettings.java
deleted file mode 100644
index e2df2c1..0000000
--- a/src/com/android/settings/deviceinfo/DeviceInfoSettings.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright (C) 2008 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.deviceinfo;
-
-import android.app.Activity;
-import android.app.Fragment;
-import android.content.Context;
-import android.content.Intent;
-import android.provider.SearchIndexableResource;
-import android.telephony.TelephonyManager;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceController;
-import com.android.settings.deviceinfo.imei.ImeiInfoPreferenceController;
-import com.android.settings.deviceinfo.simstatus.SimStatusPreferenceController;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.search.SearchIndexable;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import androidx.annotation.VisibleForTesting;
-
-@SearchIndexable
-public class DeviceInfoSettings extends DashboardFragment implements Indexable {
-
-    private static final String LOG_TAG = "DeviceInfoSettings";
-
-    private static final String KEY_LEGAL_CONTAINER = "legal_container";
-
-    @VisibleForTesting
-    static final int SIM_PREFERENCES_COUNT = 3;
-    @VisibleForTesting
-    static final int NON_SIM_PREFERENCES_COUNT = 2;
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        use(FirmwareVersionPreferenceController.class).setHost(this /*parent*/);
-        use(DeviceModelPreferenceController.class).setHost(this /* parent */);
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.DEVICEINFO;
-    }
-
-    @Override
-    public int getHelpResource() {
-        return R.string.help_uri_about;
-    }
-
-    @Override
-    public int getInitialExpandedChildCount() {
-        final TelephonyManager telephonyManager = (TelephonyManager) getContext()
-                .getSystemService(Context.TELEPHONY_SERVICE);
-        return Math.max(SIM_PREFERENCES_COUNT,
-                SIM_PREFERENCES_COUNT * telephonyManager.getPhoneCount())
-                + NON_SIM_PREFERENCES_COUNT;
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        final BuildNumberPreferenceController buildNumberPreferenceController =
-                use(BuildNumberPreferenceController.class);
-        if (buildNumberPreferenceController.onActivityResult(requestCode, resultCode, data)) {
-            return;
-        }
-        super.onActivityResult(requestCode, resultCode, data);
-    }
-
-    @Override
-    protected String getLogTag() {
-        return LOG_TAG;
-    }
-
-    @Override
-    protected int getPreferenceScreenResId() {
-        return R.xml.device_info_settings;
-    }
-
-    @Override
-    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
-        return buildPreferenceControllers(context, getActivity(), this /* fragment */,
-                getLifecycle());
-    }
-
-    private static class SummaryProvider implements SummaryLoader.SummaryProvider {
-
-        private final SummaryLoader mSummaryLoader;
-
-        public SummaryProvider(SummaryLoader summaryLoader) {
-            mSummaryLoader = summaryLoader;
-        }
-
-        @Override
-        public void setListening(boolean listening) {
-            if (listening) {
-                mSummaryLoader.setSummary(this, DeviceModelPreferenceController.getDeviceModel());
-            }
-        }
-    }
-
-    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
-            = new SummaryLoader.SummaryProviderFactory() {
-        @Override
-        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
-                SummaryLoader summaryLoader) {
-            return new SummaryProvider(summaryLoader);
-        }
-    };
-
-    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
-            Activity activity, Fragment fragment, Lifecycle lifecycle) {
-        final List<AbstractPreferenceController> controllers = new ArrayList<>();
-        controllers.add(new PhoneNumberPreferenceController(context));
-        controllers.add(new SimStatusPreferenceController(context, fragment));
-        controllers.add(new ImeiInfoPreferenceController(context, fragment));
-        controllers.add(new IpAddressPreferenceController(context, lifecycle));
-        controllers.add(new WifiMacAddressPreferenceController(context, lifecycle));
-        controllers.add(new BluetoothAddressPreferenceController(context, lifecycle));
-        controllers.add(new RegulatoryInfoPreferenceController(context));
-        controllers.add(new SafetyInfoPreferenceController(context));
-        controllers.add(new ManualPreferenceController(context));
-        controllers.add(new FeedbackPreferenceController(fragment, context));
-        controllers.add(new FccEquipmentIdPreferenceController(context));
-        controllers.add(
-                new BuildNumberPreferenceController(context, activity, fragment, lifecycle));
-        return controllers;
-    }
-
-    /**
-     * For Search.
-     */
-    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider() {
-
-                @Override
-                public List<SearchIndexableResource> getXmlResourcesToIndex(
-                        Context context, boolean enabled) {
-                    final SearchIndexableResource sir = new SearchIndexableResource(context);
-                    sir.xmlResId = R.xml.device_info_settings;
-                    return Arrays.asList(sir);
-                }
-
-                @Override
-                public List<AbstractPreferenceController> createPreferenceControllers(
-                        Context context) {
-                    return buildPreferenceControllers(context, null /*activity */,
-                            null /* fragment */, null /* lifecycle */);
-                }
-
-                @Override
-                public List<String> getNonIndexableKeys(Context context) {
-                    List<String> keys = super.getNonIndexableKeys(context);
-                    keys.add(KEY_LEGAL_CONTAINER);
-                    return keys;
-                }
-            };
-}
diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
index 4c3ad63..7aa7138 100644
--- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
@@ -67,7 +67,7 @@
 
         Drawable icon;
         if (VolumeInfo.ID_PRIVATE_INTERNAL.equals(volume.getId())) {
-            icon = context.getDrawable(R.drawable.ic_settings_storage);
+            icon = context.getDrawable(R.drawable.ic_storage);
         } else {
             icon = context.getDrawable(R.drawable.ic_sim_sd);
         }
diff --git a/src/com/android/settings/deviceinfo/StorageWizardBase.java b/src/com/android/settings/deviceinfo/StorageWizardBase.java
index 40fc249..47481f3 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardBase.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardBase.java
@@ -162,7 +162,7 @@
     protected void setIcon(int resId) {
         final GlifLayout layout = getGlifLayout();
         final Drawable icon = getDrawable(resId).mutate();
-        icon.setTint(Utils.getColorAccent(layout.getContext()));
+        icon.setTintList(Utils.getColorAccent(layout.getContext()));
         layout.setIcon(icon);
     }
 
diff --git a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
index 20c5bc4..557f369 100644
--- a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
+++ b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
@@ -19,6 +19,7 @@
 import android.content.Intent;
 import android.os.UserHandle;
 import android.provider.Settings;
+import android.text.TextUtils;
 
 import com.android.internal.hardware.AmbientDisplayConfiguration;
 import com.android.settings.R;
@@ -55,6 +56,11 @@
     }
 
     @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(), "ambient_display_always_on");
+    }
+
+    @Override
     public boolean isChecked() {
         return mConfig.alwaysOnEnabled(MY_USER);
     }
diff --git a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
index 10775c4..a6abe82 100644
--- a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
+++ b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
@@ -20,6 +20,7 @@
 import android.content.Intent;
 import android.os.UserHandle;
 import android.provider.Settings;
+import android.text.TextUtils;
 
 import com.android.internal.hardware.AmbientDisplayConfiguration;
 import com.android.settings.R;
@@ -91,6 +92,11 @@
     }
 
     @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(), "ambient_display_notification");
+    }
+
+    @Override
     //TODO (b/69808376): Remove result payload
     public ResultPayload getResultPayload() {
         final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(mContext,
diff --git a/src/com/android/settings/display/AutoBrightnessPreferenceController.java b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
index 564e27a..7c93d28 100644
--- a/src/com/android/settings/display/AutoBrightnessPreferenceController.java
+++ b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
@@ -16,6 +16,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.provider.Settings;
+import android.text.TextUtils;
 
 import com.android.settings.DisplaySettings;
 import com.android.settings.core.TogglePreferenceController;
@@ -61,6 +62,11 @@
     }
 
     @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(), "auto_brightness");
+    }
+
+    @Override
     public ResultPayload getResultPayload() {
         // TODO remove result payload
         final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(mContext,
diff --git a/src/com/android/settings/display/AutoRotatePreferenceController.java b/src/com/android/settings/display/AutoRotatePreferenceController.java
index 749f6e6..6bdf75a 100644
--- a/src/com/android/settings/display/AutoRotatePreferenceController.java
+++ b/src/com/android/settings/display/AutoRotatePreferenceController.java
@@ -15,6 +15,7 @@
 
 import android.content.Context;
 import androidx.preference.Preference;
+import android.text.TextUtils;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.view.RotationPolicy;
@@ -71,7 +72,12 @@
     @Override
     public int getAvailabilityStatus() {
         return RotationPolicy.isRotationLockToggleVisible(mContext)
-                ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(), "auto_rotate");
     }
 
     @Override
diff --git a/src/com/android/settings/display/ColorModePreferenceController.java b/src/com/android/settings/display/ColorModePreferenceController.java
index 31f5393..ebb4370 100644
--- a/src/com/android/settings/display/ColorModePreferenceController.java
+++ b/src/com/android/settings/display/ColorModePreferenceController.java
@@ -49,6 +49,9 @@
     @Override
     public CharSequence getSummary() {
         final int colorMode = getColorDisplayController().getColorMode();
+        if (colorMode == ColorDisplayController.COLOR_MODE_AUTOMATIC) {
+            return mContext.getText(R.string.color_mode_option_automatic);
+        }
         if (colorMode == ColorDisplayController.COLOR_MODE_SATURATED) {
             return mContext.getText(R.string.color_mode_option_saturated);
         }
diff --git a/src/com/android/settings/display/ColorModePreferenceFragment.java b/src/com/android/settings/display/ColorModePreferenceFragment.java
index f3873e2..ab17c72 100644
--- a/src/com/android/settings/display/ColorModePreferenceFragment.java
+++ b/src/com/android/settings/display/ColorModePreferenceFragment.java
@@ -26,7 +26,7 @@
 import com.android.settings.widget.RadioButtonPickerFragment;
 import com.android.settingslib.widget.CandidateInfo;
 
-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.List;
 
 @SuppressWarnings("WeakerAccess")
@@ -39,6 +39,8 @@
     static final String KEY_COLOR_MODE_BOOSTED = "color_mode_boosted";
     @VisibleForTesting
     static final String KEY_COLOR_MODE_SATURATED = "color_mode_saturated";
+    @VisibleForTesting
+    static final String KEY_COLOR_MODE_AUTOMATIC = "color_mode_automatic";
 
     private ColorDisplayController mController;
 
@@ -78,21 +80,41 @@
 
     @Override
     protected List<? extends CandidateInfo> getCandidates() {
-        Context c = getContext();
-        return Arrays.asList(
-            new ColorModeCandidateInfo(c.getText(R.string.color_mode_option_natural),
-                    KEY_COLOR_MODE_NATURAL, true /* enabled */),
-            new ColorModeCandidateInfo(c.getText(R.string.color_mode_option_boosted),
-                    KEY_COLOR_MODE_BOOSTED, true /* enabled */),
-            new ColorModeCandidateInfo(c.getText(R.string.color_mode_option_saturated),
-                    KEY_COLOR_MODE_SATURATED, true /* enabled */)
-        );
+        final Context c = getContext();
+        final int[] availableColorModes = c.getResources().getIntArray(
+                com.android.internal.R.array.config_availableColorModes);
+
+        List<ColorModeCandidateInfo> candidates = new ArrayList<ColorModeCandidateInfo>();
+        if (availableColorModes != null) {
+            for (int colorMode : availableColorModes) {
+                if (colorMode == ColorDisplayController.COLOR_MODE_NATURAL) {
+                    candidates.add(new ColorModeCandidateInfo(
+                                c.getText(R.string.color_mode_option_natural),
+                                KEY_COLOR_MODE_NATURAL, true /* enabled */));
+                } else if (colorMode == ColorDisplayController.COLOR_MODE_BOOSTED) {
+                    candidates.add(new ColorModeCandidateInfo(
+                                c.getText(R.string.color_mode_option_boosted),
+                                KEY_COLOR_MODE_BOOSTED, true /* enabled */));
+                } else if (colorMode == ColorDisplayController.COLOR_MODE_SATURATED) {
+                    candidates.add(new ColorModeCandidateInfo(
+                                c.getText(R.string.color_mode_option_saturated),
+                                KEY_COLOR_MODE_SATURATED, true /* enabled */));
+                } else if (colorMode == ColorDisplayController.COLOR_MODE_AUTOMATIC) {
+                    candidates.add(new ColorModeCandidateInfo(
+                                c.getText(R.string.color_mode_option_automatic),
+                                KEY_COLOR_MODE_AUTOMATIC, true /* enabled */));
+                }
+            }
+        }
+        return candidates;
     }
 
     @Override
     protected String getDefaultKey() {
         final int colorMode = mController.getColorMode();
-        if (colorMode == ColorDisplayController.COLOR_MODE_SATURATED) {
+        if (colorMode == ColorDisplayController.COLOR_MODE_AUTOMATIC) {
+            return KEY_COLOR_MODE_AUTOMATIC;
+        } else if (colorMode == ColorDisplayController.COLOR_MODE_SATURATED) {
             return KEY_COLOR_MODE_SATURATED;
         } else if (colorMode == ColorDisplayController.COLOR_MODE_BOOSTED) {
             return KEY_COLOR_MODE_BOOSTED;
@@ -112,6 +134,9 @@
             case KEY_COLOR_MODE_SATURATED:
                 mController.setColorMode(ColorDisplayController.COLOR_MODE_SATURATED);
                 break;
+            case KEY_COLOR_MODE_AUTOMATIC:
+                mController.setColorMode(ColorDisplayController.COLOR_MODE_AUTOMATIC);
+                break;
         }
         return true;
     }
diff --git a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
index 6e30f6f..ffc7386 100644
--- a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
@@ -19,6 +19,7 @@
 import android.content.Context;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
+import android.text.TextUtils;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
@@ -54,6 +55,11 @@
     }
 
     @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(), "night_display_activated");
+    }
+
+    @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
 
diff --git a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
index f5bc49a..048e084 100644
--- a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
@@ -16,9 +16,12 @@
 
 package com.android.settings.display;
 
-import android.content.Context;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
+
+import android.content.Context;
+import android.text.TextUtils;
+
 import com.android.internal.app.ColorDisplayController;
 import com.android.settings.core.SliderPreferenceController;
 import com.android.settings.widget.SeekBarPreference;
@@ -43,6 +46,11 @@
     }
 
     @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(), "night_display_temperature");
+    }
+
+    @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
         final SeekBarPreference preference = (SeekBarPreference) screen.findPreference(
diff --git a/src/com/android/settings/display/SystemUiThemePreferenceController.java b/src/com/android/settings/display/SystemUiThemePreferenceController.java
new file mode 100644
index 0000000..3816f88
--- /dev/null
+++ b/src/com/android/settings/display/SystemUiThemePreferenceController.java
@@ -0,0 +1,72 @@
+/*
+ * 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.display;
+
+import static android.provider.Settings.Secure.THEME_MODE;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.util.FeatureFlagUtils;
+
+import com.android.settings.core.BasePreferenceController;
+
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+/**
+ * Setting where user can pick if SystemUI will be light, dark or try to match
+ * the wallpaper colors.
+ */
+public class SystemUiThemePreferenceController extends BasePreferenceController
+        implements Preference.OnPreferenceChangeListener {
+
+    private ListPreference mSystemUiThemePref;
+
+    public SystemUiThemePreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        boolean enabled = FeatureFlagUtils.isEnabled(mContext, "settings_systemui_theme");
+        return enabled ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mSystemUiThemePref = (ListPreference) screen.findPreference(getPreferenceKey());
+        int value = Settings.Secure.getInt(mContext.getContentResolver(), THEME_MODE, 0);
+        mSystemUiThemePref.setValue(Integer.toString(value));
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        int value = Integer.parseInt((String) newValue);
+        Settings.Secure.putInt(mContext.getContentResolver(), THEME_MODE, value);
+        refreshSummary(preference);
+        return true;
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        int value = Settings.Secure.getInt(mContext.getContentResolver(), THEME_MODE, 0);
+        int index = mSystemUiThemePref.findIndexOfValue(Integer.toString(value));
+        return mSystemUiThemePref.getEntries()[index];
+    }
+}
diff --git a/src/com/android/settings/display/ThemePreferenceController.java b/src/com/android/settings/display/ThemePreferenceController.java
index 2cdf7e2..c71a7ab 100644
--- a/src/com/android/settings/display/ThemePreferenceController.java
+++ b/src/com/android/settings/display/ThemePreferenceController.java
@@ -13,23 +13,22 @@
  */
 package com.android.settings.display;
 
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_THEME;
+
 import android.content.Context;
+import android.content.om.IOverlayManager;
+import android.content.om.OverlayInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.UserHandle;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
 import android.text.TextUtils;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.wrapper.OverlayManagerWrapper;
-import com.android.settings.wrapper.OverlayManagerWrapper.OverlayInfo;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
@@ -37,7 +36,9 @@
 import java.util.List;
 import java.util.Objects;
 
-import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_THEME;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
 
 public class ThemePreferenceController extends AbstractPreferenceController implements
         PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
@@ -45,16 +46,16 @@
     private static final String KEY_THEME = "theme";
 
     private final MetricsFeatureProvider mMetricsFeatureProvider;
-    private final OverlayManagerWrapper mOverlayService;
+    private final IOverlayManager mOverlayService;
     private final PackageManager mPackageManager;
 
     public ThemePreferenceController(Context context) {
-        this(context, ServiceManager.getService(Context.OVERLAY_SERVICE) != null
-                ? new OverlayManagerWrapper() : null);
+        this(context, IOverlayManager.Stub
+                .asInterface(ServiceManager.getService(Context.OVERLAY_SERVICE)));
     }
 
     @VisibleForTesting
-    ThemePreferenceController(Context context, OverlayManagerWrapper overlayManager) {
+    ThemePreferenceController(Context context, IOverlayManager overlayManager) {
         super(context);
         mOverlayService = overlayManager;
         mPackageManager = context.getPackageManager();
@@ -77,7 +78,7 @@
     @Override
     public void updateState(Preference preference) {
         ListPreference pref = (ListPreference) preference;
-        String[] pkgs = getAvailableThemes();
+        String[] pkgs = getAvailableThemes(false /* currentThemeOnly */);
         CharSequence[] labels = new CharSequence[pkgs.length];
         for (int i = 0; i < pkgs.length; i++) {
             try {
@@ -109,11 +110,15 @@
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
-        String current = getTheme();
+        String current = getCurrentTheme();
         if (Objects.equals(newValue, current)) {
             return true;
         }
-        mOverlayService.setEnabledExclusiveInCategory((String) newValue, UserHandle.myUserId());
+        try {
+            mOverlayService.setEnabledExclusiveInCategory((String) newValue, UserHandle.myUserId());
+        } catch (RemoteException re) {
+            throw re.rethrowFromSystemServer();
+        }
         return true;
     }
 
@@ -129,39 +134,43 @@
         }
     }
 
-    private String getTheme() {
-        List<OverlayInfo> infos = mOverlayService.getOverlayInfosForTarget("android",
-                UserHandle.myUserId());
-        for (int i = 0, size = infos.size(); i < size; i++) {
-            if (infos.get(i).isEnabled() && isTheme(infos.get(i))) {
-                return infos.get(i).packageName;
-            }
-        }
-        return null;
-    }
-
     @Override
     public boolean isAvailable() {
         if (mOverlayService == null) return false;
-        String[] themes = getAvailableThemes();
+        String[] themes = getAvailableThemes(false /* currentThemeOnly */);
         return themes != null && themes.length > 1;
     }
 
 
     @VisibleForTesting
     String getCurrentTheme() {
-        return getTheme();
+        String[] themePackages = getAvailableThemes(true /* currentThemeOnly */);
+        return themePackages.length < 1 ? null : themePackages[0];
     }
 
     @VisibleForTesting
-    String[] getAvailableThemes() {
-        List<OverlayInfo> infos = mOverlayService.getOverlayInfosForTarget("android",
-                UserHandle.myUserId());
-        List<String> pkgs = new ArrayList<>(infos.size());
-        for (int i = 0, size = infos.size(); i < size; i++) {
-            if (isTheme(infos.get(i))) {
-                pkgs.add(infos.get(i).packageName);
+    String[] getAvailableThemes(boolean currentThemeOnly) {
+        List<OverlayInfo> infos;
+        List<String> pkgs;
+        try {
+            infos = mOverlayService.getOverlayInfosForTarget("android", UserHandle.myUserId());
+            pkgs = new ArrayList<>(infos.size());
+            for (int i = 0, size = infos.size(); i < size; i++) {
+                if (isTheme(infos.get(i))) {
+                    if (infos.get(i).isEnabled() && currentThemeOnly) {
+                        return new String[] {infos.get(i).packageName};
+                    } else {
+                        pkgs.add(infos.get(i).packageName);
+                    }
+                }
             }
+        } catch (RemoteException re) {
+            throw re.rethrowFromSystemServer();
+        }
+
+        // Current enabled theme is not found.
+        if (currentThemeOnly) {
+            return new String[0];
         }
         return pkgs.toArray(new String[pkgs.size()]);
     }
diff --git a/src/com/android/settings/fingerprint/FingerprintLocationAnimationView.java b/src/com/android/settings/fingerprint/FingerprintLocationAnimationView.java
index a26883a..0812f2d 100644
--- a/src/com/android/settings/fingerprint/FingerprintLocationAnimationView.java
+++ b/src/com/android/settings/fingerprint/FingerprintLocationAnimationView.java
@@ -62,7 +62,7 @@
                 R.fraction.fingerprint_sensor_location_fraction_x, 1, 1);
         mFractionCenterY = getResources().getFraction(
                 R.fraction.fingerprint_sensor_location_fraction_y, 1, 1);
-        @ColorInt int colorAccent = Utils.getColorAccent(context);
+        @ColorInt int colorAccent = Utils.getColorAccentDefaultColor(context);
         mDotPaint.setAntiAlias(true);
         mPulsePaint.setAntiAlias(true);
         mDotPaint.setColor(colorAccent);
diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java
index 5e301da..0fd3f8b 100644
--- a/src/com/android/settings/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/fingerprint/FingerprintSettings.java
@@ -605,6 +605,10 @@
             final Drawable highlight = getHighlightDrawable();
             if (highlight != null && fpref != null) {
                 final View view = fpref.getView();
+                if (view == null) {
+                    // FingerprintPreference is not bound to UI yet, so view is null.
+                    return;
+                }
                 final int centerX = view.getWidth() / 2;
                 final int centerY = view.getHeight() / 2;
                 highlight.setHotspot(centerX, centerY);
diff --git a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
index add6023..a2ba9a9 100644
--- a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
@@ -48,6 +48,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
+import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.widget.ActionButtonPreference;
@@ -73,7 +74,7 @@
  * An easy way to handle them is to delegate them to {@link #handleDialogClick(int)} and
  * {@link #handleActivityResult(int, int, Intent)} in this controller.
  */
-//TODO(b/35810915): Make AppInfoDashboardFragment use this controller
+//TODO(80312809): Merge this class into {@link AppActionButtonPreferenceController}
 public class AppButtonsPreferenceController extends AbstractPreferenceController implements
         PreferenceControllerMixin, LifecycleObserver, OnResume, OnDestroy,
         ApplicationsState.Callbacks {
@@ -100,17 +101,18 @@
 
     private final int mRequestUninstall;
     private final int mRequestRemoveDeviceAdmin;
+    private final DevicePolicyManager mDpm;
+    private final UserManager mUserManager;
+    private final PackageManager mPm;
+    private final SettingsActivity mActivity;
+    private final Fragment mFragment;
+    private final MetricsFeatureProvider mMetricsFeatureProvider;
+    private final ApplicationFeatureProvider mApplicationFeatureProvider;
+    private final int mUserId;
 
     private ApplicationsState.Session mSession;
-    private DevicePolicyManager mDpm;
-    private UserManager mUserManager;
-    private PackageManager mPm;
-    private SettingsActivity mActivity;
-    private Fragment mFragment;
     private RestrictedLockUtils.EnforcedAdmin mAppsControlDisallowedAdmin;
-    private MetricsFeatureProvider mMetricsFeatureProvider;
 
-    private int mUserId;
     private boolean mUpdatedSysApp = false;
     private boolean mListeningToPackageRemove = false;
     private boolean mFinishing = false;
@@ -127,8 +129,9 @@
                     "Fragment should implement AppButtonsDialogListener");
         }
 
-        mMetricsFeatureProvider = FeatureFactory.getFactory(activity).getMetricsFeatureProvider();
-
+        final FeatureFactory factory = FeatureFactory.getFactory(activity);
+        mMetricsFeatureProvider = factory.getMetricsFeatureProvider();
+        mApplicationFeatureProvider = factory.getApplicationFeatureProvider(activity);
         mState = state;
         mDpm = dpm;
         mUserManager = userManager;
@@ -538,11 +541,11 @@
             // Disable button for core system applications.
             mButtonsPref.setButton1Text(R.string.disable_text)
                     .setButton1Positive(false);
-
         } else if (mAppEntry.info.enabled && !isDisabledUntilUsed()) {
             mButtonsPref.setButton1Text(R.string.disable_text)
                     .setButton1Positive(false);
-            disableable = true;
+            disableable = !mApplicationFeatureProvider.getKeepEnabledPackages()
+                    .contains(mAppEntry.info.packageName);
         } else {
             mButtonsPref.setButton1Text(R.string.enable_text)
                     .setButton1Positive(true);
diff --git a/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java b/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java
index 362325a..cd384f1 100644
--- a/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java
@@ -56,7 +56,7 @@
 
     public BackgroundActivityPreferenceController(Context context,
             InstrumentedPreferenceFragment fragment, int uid, String packageName) {
-        this(context, fragment, uid, packageName, PowerWhitelistBackend.getInstance());
+        this(context, fragment, uid, packageName, PowerWhitelistBackend.getInstance(context));
     }
 
     @VisibleForTesting
@@ -129,6 +129,7 @@
     @VisibleForTesting
     void showDialog(boolean restricted) {
         final AppInfo appInfo = new AppInfo.Builder()
+                .setUid(mUid)
                 .setPackageName(mTargetPackage)
                 .build();
         BatteryTip tip = restricted
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
index 7038fad..d1ce8b8 100644
--- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
@@ -22,6 +22,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.BatteryManager;
+import android.os.PowerManager;
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.PreferenceFragment;
 import androidx.preference.PreferenceScreen;
@@ -57,6 +58,7 @@
     private final Activity mActivity;
     private final PreferenceFragment mHost;
     private final Lifecycle mLifecycle;
+    private final PowerManager mPowerManager;
 
     private LayoutPreference mBatteryLayoutPref;
 
@@ -69,6 +71,7 @@
         if (mLifecycle != null) {
             mLifecycle.addObserver(this);
         }
+        mPowerManager = context.getSystemService(PowerManager.class);
     }
 
     @Override
@@ -115,6 +118,7 @@
 
         mBatteryMeterView.setBatteryLevel(info.batteryLevel);
         mBatteryMeterView.setCharging(!info.discharging);
+        mBatteryMeterView.setPowerSave(mPowerManager.isPowerSaveMode());
     }
 
     public void quickUpdateHeaderPreference() {
@@ -127,6 +131,7 @@
         // Set battery level and charging status
         mBatteryMeterView.setBatteryLevel(batteryLevel);
         mBatteryMeterView.setCharging(!discharging);
+        mBatteryMeterView.setPowerSave(mPowerManager.isPowerSaveMode());
         mBatteryPercentText.setText(Utils.formatPercentage(batteryLevel));
 
         // clear all the summaries
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index 5003254..e442a07 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -363,7 +363,7 @@
         mThinLineWidth = (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
                 2, getResources().getDisplayMetrics());
 
-        int accentColor = Utils.getColorAccent(mContext);
+        int accentColor = Utils.getColorAccentDefaultColor(mContext);
         mBatteryBackgroundPaint.setColor(accentColor);
         mBatteryBackgroundPaint.setStyle(Paint.Style.FILL);
         mBatteryGoodPaint.setARGB(128, 0, 128, 0);
diff --git a/src/com/android/settings/fuelgauge/BatteryMeterView.java b/src/com/android/settings/fuelgauge/BatteryMeterView.java
index bd7586b..35045c8 100644
--- a/src/com/android/settings/fuelgauge/BatteryMeterView.java
+++ b/src/com/android/settings/fuelgauge/BatteryMeterView.java
@@ -37,6 +37,7 @@
     ColorFilter mErrorColorFilter;
     @VisibleForTesting
     ColorFilter mAccentColorFilter;
+    private boolean mPowerSaveEnabled;
 
     public BatteryMeterView(Context context) {
         this(context, null, 0);
@@ -73,6 +74,15 @@
         }
     }
 
+    public void setPowerSave(boolean powerSave) {
+        mDrawable.setPowerSave(powerSave);
+        mPowerSaveEnabled = powerSave;
+    }
+
+    public boolean getPowerSave() {
+        return mPowerSaveEnabled;
+    }
+
     public int getBatteryLevel() {
         return mDrawable.getBatteryLevel();
     }
diff --git a/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java
index 7adc41b..69511ac 100644
--- a/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java
@@ -48,7 +48,7 @@
         mFragment = fragment;
         mSettingsActivity = settingsActivity;
         mPackageName = packageName;
-        mBackend = PowerWhitelistBackend.getInstance();
+        mBackend = PowerWhitelistBackend.getInstance(mSettingsActivity);
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/fuelgauge/HighPowerDetail.java b/src/com/android/settings/fuelgauge/HighPowerDetail.java
index 4f70700..7dfa0be 100644
--- a/src/com/android/settings/fuelgauge/HighPowerDetail.java
+++ b/src/com/android/settings/fuelgauge/HighPowerDetail.java
@@ -67,12 +67,13 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mBatteryUtils = BatteryUtils.getInstance(getContext());
-        mBackend = PowerWhitelistBackend.getInstance();
+        final Context context = getContext();
+        mBatteryUtils = BatteryUtils.getInstance(context);
+        mBackend = PowerWhitelistBackend.getInstance(context);
 
         mPackageName = getArguments().getString(AppInfoBase.ARG_PACKAGE_NAME);
         mPackageUid = getArguments().getInt(AppInfoBase.ARG_PACKAGE_UID);
-        PackageManager pm = getContext().getPackageManager();
+        final PackageManager pm = context.getPackageManager();
         try {
             mLabel = pm.getApplicationInfo(mPackageName, 0).loadLabel(pm);
         } catch (NameNotFoundException e) {
@@ -171,10 +172,10 @@
     }
 
     public static CharSequence getSummary(Context context, String pkg) {
-        PowerWhitelistBackend powerWhitelist = PowerWhitelistBackend.getInstance();
+        PowerWhitelistBackend powerWhitelist = PowerWhitelistBackend.getInstance(context);
         return context.getString(powerWhitelist.isSysWhitelisted(pkg) ? R.string.high_power_system
                 : powerWhitelist.isWhitelisted(pkg) ? R.string.high_power_on
-                : R.string.high_power_off);
+                        : R.string.high_power_off);
     }
 
     public static void show(Fragment caller, int uid, String packageName, int requestCode) {
diff --git a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java
index 18cb476..d74f9b1 100644
--- a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java
+++ b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.fuelgauge;
 
-import android.app.AppOpsManager;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
@@ -35,6 +34,11 @@
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.fuelgauge.batterytip.AppInfo;
+import com.android.settings.fuelgauge.batterytip.BatteryTipDialogFragment;
+import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController;
+import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
+import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip;
+import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip;
 import com.android.settings.widget.AppCheckBoxPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.widget.FooterPreferenceMixin;
@@ -44,7 +48,8 @@
 /**
  * Fragment to show a list of anomaly apps, where user could handle these anomalies
  */
-public class RestrictedAppDetails extends DashboardFragment {
+public class RestrictedAppDetails extends DashboardFragment implements
+        BatteryTipPreferenceController.BatteryTipListener {
 
     public static final String TAG = "RestrictedAppDetails";
 
@@ -143,12 +148,14 @@
                         Utils.getBadgedIcon(mIconDrawableFactory, mPackageManager,
                                 appInfo.packageName,
                                 UserHandle.getUserId(appInfo.uid)));
+                checkBoxPreference.setKey(getKeyFromAppInfo(appInfo));
                 checkBoxPreference.setOnPreferenceChangeListener((pref, value) -> {
-                    // change the toggle
-                    final int mode = (Boolean) value ? AppOpsManager.MODE_IGNORED
-                            : AppOpsManager.MODE_ALLOWED;
-                    mBatteryUtils.setForceAppStandby(appInfo.uid, appInfo.packageName, mode);
-                    return true;
+                    final BatteryTipDialogFragment fragment = createDialogFragment(appInfo,
+                            (Boolean) value);
+                    fragment.setTargetFragment(this, 0 /* requestCode */);
+                    fragment.show(getFragmentManager(), TAG);
+
+                    return false;
                 });
                 mRestrictedAppListGroup.addPreference(checkBoxPreference);
             } catch (PackageManager.NameNotFoundException e) {
@@ -157,4 +164,35 @@
         }
     }
 
+    @Override
+    public void onBatteryTipHandled(BatteryTip batteryTip) {
+        final AppInfo appInfo;
+        final boolean isRestricted = batteryTip instanceof RestrictAppTip;
+        if (isRestricted) {
+            appInfo = ((RestrictAppTip) batteryTip).getRestrictAppList().get(0);
+        } else {
+            appInfo = ((UnrestrictAppTip) batteryTip).getUnrestrictAppInfo();
+        }
+
+        CheckBoxPreference preference = (CheckBoxPreference) mRestrictedAppListGroup
+                .findPreference(getKeyFromAppInfo(appInfo));
+        if (preference != null) {
+            preference.setChecked(isRestricted);
+        }
+    }
+
+    @VisibleForTesting
+    BatteryTipDialogFragment createDialogFragment(AppInfo appInfo, boolean toRestrict) {
+        final BatteryTip batteryTip = toRestrict
+                ? new RestrictAppTip(BatteryTip.StateType.NEW, appInfo)
+                : new UnrestrictAppTip(BatteryTip.StateType.NEW, appInfo);
+
+        return BatteryTipDialogFragment.newInstance(
+                batteryTip, getMetricsCategory());
+    }
+
+    @VisibleForTesting
+    String getKeyFromAppInfo(AppInfo appInfo) {
+        return appInfo.uid + "," + appInfo.packageName;
+    }
 }
diff --git a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java
index fbd779c..d4dc4d2 100644
--- a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java
@@ -19,6 +19,8 @@
 
 import android.content.Context;
 import android.provider.Settings;
+import android.text.TextUtils;
+
 import androidx.preference.SwitchPreference;
 import androidx.preference.Preference;
 
@@ -49,6 +51,11 @@
     }
 
     @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(), "smart_battery");
+    }
+
+    @Override
     public void updateState(Preference preference) {
         super.updateState(preference);
         final boolean smartBatteryOn = Settings.Global.getInt(mContext.getContentResolver(),
diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
index f5d3a97..00b890d 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
@@ -18,36 +18,45 @@
 
 import android.content.Context;
 import android.os.PowerManager;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
 
+import com.android.settings.core.TogglePreferenceController;
 import com.android.settings.fuelgauge.BatterySaverReceiver;
-import com.android.settings.widget.TwoStateButtonPreferenceController;
-import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settings.widget.TwoStateButtonPreference;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
 import com.android.settingslib.fuelgauge.BatterySaverUtils;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 /**
  * Controller to update the battery saver button
  */
 public class BatterySaverButtonPreferenceController extends
-        TwoStateButtonPreferenceController implements
+        TogglePreferenceController implements
         LifecycleObserver, OnStart, OnStop, BatterySaverReceiver.BatterySaverListener {
-    private static final String KEY = "battery_saver_button_container";
-    private BatterySaverReceiver mBatterySaverReceiver;
-    @VisibleForTesting
-    PowerManager mPowerManager;
 
-    public BatterySaverButtonPreferenceController(Context context, Lifecycle lifecycle) {
-        super(context, KEY);
+    private final BatterySaverReceiver mBatterySaverReceiver;
+    private final PowerManager mPowerManager;
+
+    private TwoStateButtonPreference mPreference;
+
+    public BatterySaverButtonPreferenceController(Context context, String key) {
+        super(context, key);
         mPowerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
         mBatterySaverReceiver = new BatterySaverReceiver(context);
         mBatterySaverReceiver.setBatterySaverListener(this);
-        if (lifecycle != null) {
-            lifecycle.addObserver(this);
-        }
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public boolean isSliceable() {
+        return true;
     }
 
     @Override
@@ -61,29 +70,43 @@
     }
 
     @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = (TwoStateButtonPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean isChecked() {
+        return mPowerManager.isPowerSaveMode();
+    }
+
+    @Override
+    public boolean setChecked(boolean stateOn) {
+        // This screen already shows a warning, so we don't need another warning.
+        return BatterySaverUtils.setPowerSaveMode(mContext, stateOn,
+                false /* needFirstTimeWarning */);
+    }
+
+    @Override
     public void updateState(Preference preference) {
         super.updateState(preference);
-        setButtonVisibility(!mPowerManager.isPowerSaveMode());
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return AVAILABLE;
-    }
-
-    @Override
-    public void onButtonClicked(boolean stateOn) {
-        // This screen already shows a warning, so we don't need another warning.
-        BatterySaverUtils.setPowerSaveMode(mContext,  stateOn, /*needFirstTimeWarning*/ false);
+        if (mPreference != null) {
+            mPreference.setChecked(isChecked());
+        }
     }
 
     @Override
     public void onPowerSaveModeChanged() {
-        setButtonVisibility(!mPowerManager.isPowerSaveMode());
+        final boolean isChecked = isChecked();
+        if (mPreference != null && mPreference.isChecked() != isChecked) {
+            mPreference.setChecked(isChecked);
+        }
     }
 
     @Override
     public void onBatteryChanged(boolean pluggedIn) {
-        setButtonEnabled(!pluggedIn);
+        if (mPreference != null) {
+            mPreference.setButtonEnabled(!pluggedIn);
+        }
     }
 }
diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java
index aa16fc9..5288970 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java
@@ -75,7 +75,6 @@
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new AutoBatterySaverPreferenceController(context));
         controllers.add(new AutoBatterySeekBarPreferenceController(context, lifecycle));
-        controllers.add(new BatterySaverButtonPreferenceController(context, lifecycle));
         return controllers;
     }
 
diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
index eef416d..f7793aa 100644
--- a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
+++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
@@ -30,12 +30,8 @@
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.os.Process;
 import android.os.StatsDimensionsValue;
-import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
 
@@ -46,7 +42,6 @@
 import android.util.Pair;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.internal.os.BatteryStatsHelper;
 import com.android.internal.util.ArrayUtils;
 import com.android.settings.R;
 import com.android.settings.fuelgauge.BatteryUtils;
@@ -103,7 +98,8 @@
             final BatteryUtils batteryUtils = BatteryUtils.getInstance(this);
             final ContentResolver contentResolver = getContentResolver();
             final UserManager userManager = getSystemService(UserManager.class);
-            final PowerWhitelistBackend powerWhitelistBackend = PowerWhitelistBackend.getInstance();
+            final PowerWhitelistBackend powerWhitelistBackend =
+                    PowerWhitelistBackend.getInstance(context);
             final PowerUsageFeatureProvider powerUsageFeatureProvider = FeatureFactory
                     .getFactory(this).getPowerUsageFeatureProvider(this);
             final MetricsFeatureProvider metricsFeatureProvider = FeatureFactory
diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java
index 1ec3221..59b5c15 100644
--- a/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java
+++ b/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java
@@ -59,7 +59,7 @@
             final AppInfo appInfo = appInfos.get(i);
             final String packageName = appInfo.packageName;
             // Force app standby, then app can't run in the background
-            mBatteryUtils.setForceAppStandby(mBatteryUtils.getPackageUid(packageName), packageName,
+            mBatteryUtils.setForceAppStandby(appInfo.uid, packageName,
                     AppOpsManager.MODE_IGNORED);
             if (CollectionUtils.isEmpty(appInfo.anomalyTypes)) {
                 // Only log context if there is no anomaly type
diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java
index 27acf46..ea40107 100644
--- a/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java
+++ b/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java
@@ -23,6 +23,7 @@
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.fuelgauge.BatteryUtils;
+import com.android.settings.fuelgauge.batterytip.AppInfo;
 import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip;
 
 /**
@@ -44,12 +45,12 @@
      */
     @Override
     public void handlePositiveAction(int metricsKey) {
-        final String packageName = mUnRestrictAppTip.getPackageName();
+        final AppInfo appInfo = mUnRestrictAppTip.getUnrestrictAppInfo();
         // Clear force app standby, then app can run in the background
-        mBatteryUtils.setForceAppStandby(mBatteryUtils.getPackageUid(packageName), packageName,
+        mBatteryUtils.setForceAppStandby(appInfo.uid, appInfo.packageName,
                 AppOpsManager.MODE_ALLOWED);
         mMetricsFeatureProvider.action(mContext,
-                MetricsProto.MetricsEvent.ACTION_TIP_UNRESTRICT_APP, packageName, Pair.create(
-                        MetricsProto.MetricsEvent.FIELD_CONTEXT, metricsKey));
+                MetricsProto.MetricsEvent.ACTION_TIP_UNRESTRICT_APP, appInfo.packageName,
+                Pair.create(MetricsProto.MetricsEvent.FIELD_CONTEXT, metricsKey));
     }
 }
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java
index 9aa8363..c2e45b1 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java
@@ -103,6 +103,7 @@
         } else {
             mState = tip.getState();
             mShowDialog = tip.shouldShowDialog();
+            mRestrictAppList = ((RestrictAppTip) tip).mRestrictAppList;
         }
     }
 
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTip.java
index 93de9b7..18ab3c2 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTip.java
@@ -72,6 +72,10 @@
         // Do nothing
     }
 
+    public AppInfo getUnrestrictAppInfo() {
+        return mAppInfo;
+    }
+
     @Override
     public void writeToParcel(Parcel dest, int flags) {
         super.writeToParcel(dest, flags);
diff --git a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java
index b8b7239..4433dd6 100644
--- a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java
+++ b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java
@@ -23,6 +23,7 @@
 import android.content.SharedPreferences;
 import android.provider.Settings;
 import androidx.annotation.VisibleForTesting;
+import android.text.TextUtils;
 
 import com.android.settings.R;
 import com.android.settings.search.DatabaseIndexingUtils;
@@ -62,6 +63,11 @@
     }
 
     @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(), "gesture_double_tap_power");
+    }
+
+    @Override
     protected String getVideoPrefKey() {
         return PREF_KEY_VIDEO;
     }
diff --git a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java
index 2afd3e0..c99fd3f 100644
--- a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java
+++ b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java
@@ -22,6 +22,8 @@
 import android.content.SharedPreferences;
 import android.os.UserHandle;
 import android.provider.Settings;
+import android.text.TextUtils;
+
 import androidx.preference.Preference;
 import androidx.annotation.VisibleForTesting;
 
@@ -74,7 +76,23 @@
         if (mAmbientConfig == null) {
             mAmbientConfig = new AmbientDisplayConfiguration(mContext);
         }
-        return mAmbientConfig.pulseOnDoubleTapAvailable() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+
+        // No hardware support for Double Tap
+        if (!mAmbientConfig.doubleTapSensorAvailable()) {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+
+        // Can't change Double Tap when AOD is enabled.
+        if (!mAmbientConfig.ambientDisplayAvailable()) {
+            return DISABLED_DEPENDENT_SETTING;
+        }
+
+        return AVAILABLE;
+    }
+
+    @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(), "gesture_double_tap_screen");
     }
 
     @Override
diff --git a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java
index 313e67b..6a72dc4 100644
--- a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java
+++ b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java
@@ -72,6 +72,11 @@
     }
 
     @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(), "gesture_double_twist");
+    }
+
+    @Override
     protected String getVideoPrefKey() {
         return PREF_KEY_VIDEO;
     }
diff --git a/src/com/android/settings/gestures/PickupGesturePreferenceController.java b/src/com/android/settings/gestures/PickupGesturePreferenceController.java
index f1dcf95..6d01e52 100644
--- a/src/com/android/settings/gestures/PickupGesturePreferenceController.java
+++ b/src/com/android/settings/gestures/PickupGesturePreferenceController.java
@@ -25,6 +25,7 @@
 import android.os.UserHandle;
 import android.provider.Settings;
 import androidx.annotation.VisibleForTesting;
+import android.text.TextUtils;
 
 import com.android.internal.hardware.AmbientDisplayConfiguration;
 import com.android.settings.R;
@@ -68,7 +69,23 @@
         if (mAmbientConfig == null) {
             mAmbientConfig = new AmbientDisplayConfiguration(mContext);
         }
-        return mAmbientConfig.pulseOnPickupAvailable() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+
+        // No hardware support for Pickup Gesture
+        if (!mAmbientConfig.dozePulsePickupSensorAvailable()) {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+
+        // Can't change Pickup Gesture when AOD is enabled.
+        if (!mAmbientConfig.ambientDisplayAvailable()) {
+            return DISABLED_DEPENDENT_SETTING;
+        }
+
+        return AVAILABLE;
+    }
+
+    @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(), "gesture_pick_up");
     }
 
     @Override
diff --git a/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java b/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java
index bb6a26d..104abf9 100644
--- a/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java
+++ b/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java
@@ -21,6 +21,7 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.provider.Settings;
+import android.text.TextUtils;
 
 import com.android.settings.Utils;
 
@@ -60,6 +61,11 @@
     }
 
     @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(), "gesture_swipe_down_fingerprint");
+    }
+
+    @Override
     public boolean setChecked(boolean isChecked) {
         setSwipeToNotification(mContext, isChecked);
         return true;
diff --git a/src/com/android/settings/gestures/SwipeUpPreferenceController.java b/src/com/android/settings/gestures/SwipeUpPreferenceController.java
index b4695cc..f48d21b 100644
--- a/src/com/android/settings/gestures/SwipeUpPreferenceController.java
+++ b/src/com/android/settings/gestures/SwipeUpPreferenceController.java
@@ -22,6 +22,7 @@
 import android.content.pm.PackageManager;
 import android.os.UserManager;
 import android.provider.Settings;
+import android.text.TextUtils;
 
 import com.android.internal.R;
 
@@ -61,6 +62,11 @@
     }
 
     @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(), "gesture_swipe_up");
+    }
+
+    @Override
     protected String getVideoPrefKey() {
         return PREF_KEY_VIDEO;
     }
diff --git a/src/com/android/settings/location/LocationSliceBuilder.java b/src/com/android/settings/location/LocationSliceBuilder.java
new file mode 100644
index 0000000..63c4be8
--- /dev/null
+++ b/src/com/android/settings/location/LocationSliceBuilder.java
@@ -0,0 +1,96 @@
+/*
+ * 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.location;
+
+import static android.provider.SettingsSlicesContract.KEY_LOCATION;
+
+import static androidx.slice.builders.ListBuilder.ICON_IMAGE;
+
+import android.annotation.ColorInt;
+import android.app.PendingIntent;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.provider.SettingsSlicesContract;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.SubSettings;
+import com.android.settings.Utils;
+import com.android.settings.search.DatabaseIndexingUtils;
+
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.SliceAction;
+
+/**
+ * Utility class to build an intent-based Location Slice.
+ */
+public class LocationSliceBuilder {
+
+    /**
+     * Backing Uri for the Location Slice.
+     */
+    public static final Uri LOCATION_URI = new Uri.Builder()
+            .scheme(ContentResolver.SCHEME_CONTENT)
+            .authority(SettingsSlicesContract.AUTHORITY)
+            .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
+            .appendPath(KEY_LOCATION)
+            .build();
+
+    private LocationSliceBuilder() {
+    }
+
+    /**
+     * Return a Location Slice bound to {@link #LOCATION_URI}.
+     */
+    public static Slice getSlice(Context context) {
+        final IconCompat icon = IconCompat.createWithResource(context,
+                R.drawable.ic_signal_location);
+        final String title = context.getString(R.string.location_settings_title);
+        @ColorInt final int color = Utils.getColorAccentDefaultColor(context);
+        final PendingIntent primaryAction = getPrimaryAction(context);
+        final SliceAction primarySliceAction = new SliceAction(primaryAction, icon, title);
+
+        return new ListBuilder(context, LOCATION_URI, ListBuilder.INFINITY)
+                .setAccentColor(color)
+                .addRow(b -> b
+                        .setTitle(title)
+                        .setTitleItem(icon, ICON_IMAGE)
+                        .setPrimaryAction(primarySliceAction))
+                .build();
+    }
+
+    public static Intent getIntent(Context context) {
+        final String screenTitle = context.getText(R.string.location_settings_title).toString();
+        final Uri contentUri = new Uri.Builder().appendPath(KEY_LOCATION).build();
+        return DatabaseIndexingUtils.buildSearchResultPageIntent(context,
+                LocationSettings.class.getName(), KEY_LOCATION, screenTitle,
+                MetricsEvent.LOCATION)
+                .setClassName(context.getPackageName(), SubSettings.class.getName())
+                .setData(contentUri);
+    }
+
+    private static PendingIntent getPrimaryAction(Context context) {
+        final Intent intent = getIntent(context);
+        return PendingIntent.getActivity(context, 0 /* requestCode */,
+                intent, 0 /* flags */);
+    }
+}
diff --git a/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelper.java b/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelper.java
new file mode 100644
index 0000000..de542ac
--- /dev/null
+++ b/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelper.java
@@ -0,0 +1,295 @@
+/*
+ * 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.mobilenetwork;
+
+import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
+
+import android.app.PendingIntent;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.net.Uri;
+import android.os.PersistableBundle;
+import androidx.core.graphics.drawable.IconCompat;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.util.Log;
+
+import androidx.slice.Slice;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.SliceAction;
+
+import com.android.ims.ImsManager;
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.slices.SettingsSliceProvider;
+import com.android.settings.slices.SliceBroadcastReceiver;
+import com.android.settings.slices.SliceBuilderUtils;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+/**
+ * Helper class to control slices for enhanced 4g LTE settings.
+ */
+public class Enhanced4gLteSliceHelper {
+
+    private static final String TAG = "Enhanced4gLteSliceHelper";
+
+    /**
+     * Settings slice path to enhanced 4g LTE setting.
+     */
+    public static final String PATH_ENHANCED_4G_LTE = "enhanced_4g_lte";
+
+    /**
+     * Action passed for changes to enhanced 4g LTE slice (toggle).
+     */
+    public static final String ACTION_ENHANCED_4G_LTE_CHANGED =
+            "com.android.settings.mobilenetwork.action.ENHANCED_4G_LTE_CHANGED";
+
+    /**
+     * Slice Uri for Enhanced 4G slice
+     */
+    public static final Uri SLICE_URI = new Uri.Builder()
+            .scheme(ContentResolver.SCHEME_CONTENT)
+            .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+            .appendPath(PATH_ENHANCED_4G_LTE)
+            .build();
+    /**
+     * Action for mobile network settings activity which
+     * allows setting configuration for Enhanced 4G LTE
+     * related settings
+     */
+    public static final String ACTION_MOBILE_NETWORK_SETTINGS_ACTIVITY =
+            "android.settings.NETWORK_OPERATOR_SETTINGS";
+
+    /**
+     * Timeout for querying enhanced 4g lte setting from ims manager.
+     */
+    private static final int TIMEOUT_MILLIS = 2000;
+
+    private final Context mContext;
+
+    /**
+     * Phone package name
+     */
+    private static final String PACKAGE_PHONE = "com.android.phone";
+
+    /**
+     * String resource type
+     */
+    private static final String RESOURCE_TYPE_STRING = "string";
+
+    /**
+     * Enhanced 4g lte mode title variant resource name
+     */
+    private static final String RESOURCE_ENHANCED_4G_LTE_MODE_TITLE_VARIANT =
+          "enhanced_4g_lte_mode_title_variant";
+
+    @VisibleForTesting
+    public Enhanced4gLteSliceHelper(Context context) {
+        mContext = context;
+    }
+
+    /**
+     * Returns Slice object for enhanced_4g_lte settings.
+     *
+     * If enhanced 4g LTE is not supported for the current carrier, this method will return slice
+     * with not supported message.
+     *
+     * If enhanced 4g LTE is not editable for the current carrier, this method will return slice
+     * with not editable message.
+     *
+     * If enhanced 4g LTE setting can be changed, this method will return the slice to toggle
+     * enhanced 4g LTE option with ACTION_ENHANCED_4G_LTE_CHANGED as endItem.
+     */
+    public Slice createEnhanced4gLteSlice(Uri sliceUri) {
+        final int subId = getDefaultVoiceSubId();
+
+        if (subId <= SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            Log.d(TAG, "Invalid subscription Id");
+            return null;
+        }
+
+        final ImsManager imsManager = getImsManager(subId);
+
+        if (!imsManager.isVolteEnabledByPlatform()
+                || !imsManager.isVolteProvisionedOnDevice()) {
+            Log.d(TAG, "Setting is either not provisioned or not enabled by Platform");
+            return null;
+        }
+
+        if (isCarrierConfigManagerKeyEnabled(
+                CarrierConfigManager.KEY_HIDE_ENHANCED_4G_LTE_BOOL, subId, false)
+                || !isCarrierConfigManagerKeyEnabled(
+                CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL, subId,
+                true)) {
+            Log.d(TAG, "Setting is either hidden or not editable");
+            return null;
+        }
+
+        try {
+            return getEnhanced4gLteSlice(sliceUri,
+                    isEnhanced4gLteModeEnabled(imsManager), subId);
+        } catch (InterruptedException | TimeoutException | ExecutionException e) {
+            Log.e(TAG, "Unable to read the current Enhanced 4g LTE status", e);
+            return null;
+        }
+    }
+
+    private boolean isEnhanced4gLteModeEnabled(ImsManager imsManager)
+            throws InterruptedException, ExecutionException, TimeoutException {
+        final FutureTask<Boolean> isEnhanced4gLteOnTask = new FutureTask<>(new Callable<Boolean>() {
+            @Override
+            public Boolean call() {
+                return imsManager.isEnhanced4gLteModeSettingEnabledByUser();
+            }
+        });
+        final ExecutorService executor = Executors.newSingleThreadExecutor();
+        executor.execute(isEnhanced4gLteOnTask);
+
+        return isEnhanced4gLteOnTask.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+    }
+
+    /**
+     * Builds a toggle slice where the intent takes you to the Enhanced 4G LTE page and the toggle
+     * enables/disables Enhanced 4G LTE mode setting.
+     */
+    private Slice getEnhanced4gLteSlice(Uri sliceUri, boolean isEnhanced4gLteEnabled, int subId) {
+        final IconCompat icon = IconCompat.createWithResource(mContext,
+                R.drawable.ic_launcher_settings);
+
+        return new ListBuilder(mContext, sliceUri, ListBuilder.INFINITY)
+                .setAccentColor(Utils.getColorAccentDefaultColor(mContext))
+                .addRow(b -> b
+                        .setTitle(getEnhanced4glteModeTitle(subId))
+                        .addEndItem(
+                                new SliceAction(
+                                        getBroadcastIntent(ACTION_ENHANCED_4G_LTE_CHANGED),
+                                        null /* actionTitle */, isEnhanced4gLteEnabled))
+                        .setPrimaryAction(new SliceAction(
+                                getActivityIntent(ACTION_MOBILE_NETWORK_SETTINGS_ACTIVITY),
+                                icon,
+                                getEnhanced4glteModeTitle(subId))))
+                .build();
+    }
+
+    protected ImsManager getImsManager(int subId) {
+        return ImsManager.getInstance(mContext, SubscriptionManager.getPhoneId(subId));
+    }
+
+    /**
+     * Handles Enhanced 4G LTE mode setting change from Enhanced 4G LTE slice and posts
+     * notification. Should be called when intent action is ACTION_ENHANCED_4G_LTE_CHANGED
+     *
+     * @param intent action performed
+     */
+    public void handleEnhanced4gLteChanged(Intent intent) {
+        final int subId = getDefaultVoiceSubId();
+
+        if (subId > SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            final ImsManager imsManager = getImsManager(subId);
+            if (imsManager.isVolteEnabledByPlatform()
+                    && imsManager.isVolteProvisionedOnDevice()) {
+                final boolean currentValue = imsManager.isEnhanced4gLteModeSettingEnabledByUser()
+                        && imsManager.isNonTtyOrTtyOnVolteEnabled();
+                final boolean newValue = intent.getBooleanExtra(EXTRA_TOGGLE_STATE,
+                        currentValue);
+                if (newValue != currentValue) {
+                    imsManager.setEnhanced4gLteModeSetting(newValue);
+                }
+            }
+        }
+        // notify change in slice in any case to get re-queried. This would result in displaying
+        // appropriate message with the updated setting.
+        final Uri uri = SliceBuilderUtils.getUri(PATH_ENHANCED_4G_LTE, false /*isPlatformSlice*/);
+        mContext.getContentResolver().notifyChange(uri, null);
+    }
+
+    private CharSequence getEnhanced4glteModeTitle(int subId) {
+        CharSequence ret = mContext.getText(R.string.enhanced_4g_lte_mode_title);
+        try {
+            if (isCarrierConfigManagerKeyEnabled(
+                    CarrierConfigManager.KEY_ENHANCED_4G_LTE_TITLE_VARIANT_BOOL,
+                    subId,
+                    false)) {
+                final PackageManager manager = mContext.getPackageManager();
+                final Resources resources = manager.getResourcesForApplication(
+                        PACKAGE_PHONE);
+                final int resId = resources.getIdentifier(
+                        RESOURCE_ENHANCED_4G_LTE_MODE_TITLE_VARIANT,
+                        RESOURCE_TYPE_STRING, PACKAGE_PHONE);
+                ret = resources.getText(resId);
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.e(TAG, "package name not found");
+        }
+        return ret;
+    }
+
+    /**
+     * Returns {@code true} when the key is enabled for the carrier, and {@code false} otherwise.
+     */
+    private boolean isCarrierConfigManagerKeyEnabled(String key,
+            int subId, boolean defaultValue) {
+        final CarrierConfigManager configManager = getCarrierConfigManager();
+        boolean ret = defaultValue;
+        if (configManager != null) {
+            final PersistableBundle bundle = configManager.getConfigForSubId(subId);
+            if (bundle != null) {
+                ret = bundle.getBoolean(key, defaultValue);
+            }
+        }
+        return ret;
+    }
+
+    protected CarrierConfigManager getCarrierConfigManager() {
+        return mContext.getSystemService(CarrierConfigManager.class);
+    }
+
+    private PendingIntent getBroadcastIntent(String action) {
+        final Intent intent = new Intent(action);
+        intent.setClass(mContext, SliceBroadcastReceiver.class);
+        return PendingIntent.getBroadcast(mContext, 0 /* requestCode */, intent,
+                PendingIntent.FLAG_CANCEL_CURRENT);
+    }
+
+    /**
+     * Returns the current default voice subId obtained from SubscriptionManager
+     */
+    protected int getDefaultVoiceSubId() {
+        return SubscriptionManager.getDefaultVoiceSubscriptionId();
+    }
+
+    /**
+     * Returns PendingIntent to start activity specified by action
+     */
+    private PendingIntent getActivityIntent(String action) {
+        final Intent intent = new Intent(action);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, 0 /* flags */);
+    }
+}
+
diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java
index b4ef0d2..0eddd9e 100644
--- a/src/com/android/settings/network/AirplaneModePreferenceController.java
+++ b/src/com/android/settings/network/AirplaneModePreferenceController.java
@@ -15,14 +15,14 @@
  */
 package com.android.settings.network;
 
+import static android.provider.SettingsSlicesContract.KEY_AIRPLANE_MODE;
+
 import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.SystemProperties;
-import androidx.preference.SwitchPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
+import android.text.TextUtils;
 
 import com.android.internal.telephony.TelephonyIntents;
 import com.android.internal.telephony.TelephonyProperties;
@@ -35,14 +35,16 @@
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
+import androidx.preference.SwitchPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 public class AirplaneModePreferenceController extends TogglePreferenceController
         implements LifecycleObserver, OnResume, OnPause,
         AirplaneModeEnabler.OnAirplaneModeChangedListener {
 
     public static final int REQUEST_CODE_EXIT_ECM = 1;
 
-    public static final String KEY_TOGGLE_AIRPLANE = "toggle_airplane";
-
     private static final String EXIT_ECM_RESULT = "exit_ecm_result";
 
     private Fragment mFragment;
@@ -50,7 +52,6 @@
     private AirplaneModeEnabler mAirplaneModeEnabler;
     private SwitchPreference mAirplaneModePreference;
 
-
     public AirplaneModePreferenceController(Context context, String key) {
         super(context, key);
         mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
@@ -63,7 +64,7 @@
 
     @Override
     public boolean handlePreferenceTreeClick(Preference preference) {
-        if (KEY_TOGGLE_AIRPLANE.equals(preference.getKey()) && Boolean.parseBoolean(
+        if (KEY_AIRPLANE_MODE.equals(preference.getKey()) && Boolean.parseBoolean(
                 SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE))) {
             // In ECM mode launch ECM app dialog
             if (mFragment != null) {
@@ -91,6 +92,11 @@
     }
 
     @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(), "toggle_airplane");
+    }
+
+    @Override
     @AvailabilityStatus
     public int getAvailabilityStatus() {
         return isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
diff --git a/src/com/android/settings/network/ApnEditor.java b/src/com/android/settings/network/ApnEditor.java
index 2200368..5b59fea 100644
--- a/src/com/android/settings/network/ApnEditor.java
+++ b/src/com/android/settings/network/ApnEditor.java
@@ -721,7 +721,7 @@
         // If it's a new APN, then cancel will delete the new entry in onPause
         if (!mNewApn && !mReadOnlyApn) {
             menu.add(0, MENU_DELETE, 0, R.string.menu_delete)
-                .setIcon(R.drawable.ic_menu_delete);
+                .setIcon(R.drawable.ic_delete);
         }
         menu.add(0, MENU_SAVE, 0, R.string.menu_save)
             .setIcon(android.R.drawable.ic_menu_save);
diff --git a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
index 8c41f19..0627cb3 100644
--- a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
+++ b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
@@ -15,6 +15,7 @@
  */
 package com.android.settings.network;
 
+import static android.net.ConnectivityManager.PRIVATE_DNS_DEFAULT_MODE_FALLBACK;
 import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OFF;
 import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC;
 import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME;
@@ -79,8 +80,11 @@
     static final String HOSTNAME_KEY = Settings.Global.PRIVATE_DNS_SPECIFIER;
 
     public static String getModeFromSettings(ContentResolver cr) {
-        final String mode = Settings.Global.getString(cr, MODE_KEY);
-        return PRIVATE_DNS_MAP.containsKey(mode) ? mode : PRIVATE_DNS_MODE_OPPORTUNISTIC;
+        String mode = Settings.Global.getString(cr, MODE_KEY);
+        if (!PRIVATE_DNS_MAP.containsKey(mode)) {
+            mode = Settings.Global.getString(cr, Settings.Global.PRIVATE_DNS_DEFAULT_MODE);
+        }
+        return PRIVATE_DNS_MAP.containsKey(mode) ? mode : PRIVATE_DNS_DEFAULT_MODE_FALLBACK;
     }
 
     public static String getHostnameFromSettings(ContentResolver cr) {
diff --git a/src/com/android/settings/network/PrivateDnsPreferenceController.java b/src/com/android/settings/network/PrivateDnsPreferenceController.java
index f127e6f..13e5bf3 100644
--- a/src/com/android/settings/network/PrivateDnsPreferenceController.java
+++ b/src/com/android/settings/network/PrivateDnsPreferenceController.java
@@ -19,6 +19,9 @@
 import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OFF;
 import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC;
 import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME;
+import static android.provider.Settings.Global.PRIVATE_DNS_DEFAULT_MODE;
+import static android.provider.Settings.Global.PRIVATE_DNS_MODE;
+import static android.provider.Settings.Global.PRIVATE_DNS_SPECIFIER;
 
 import android.content.Context;
 import android.content.ContentResolver;
@@ -51,8 +54,9 @@
     private static final String KEY_PRIVATE_DNS_SETTINGS = "private_dns_settings";
 
     private static final Uri[] SETTINGS_URIS = new Uri[]{
-        Settings.Global.getUriFor(Settings.Global.PRIVATE_DNS_MODE),
-        Settings.Global.getUriFor(Settings.Global.PRIVATE_DNS_SPECIFIER),
+        Settings.Global.getUriFor(PRIVATE_DNS_MODE),
+        Settings.Global.getUriFor(PRIVATE_DNS_DEFAULT_MODE),
+        Settings.Global.getUriFor(PRIVATE_DNS_SPECIFIER),
     };
 
     private final Handler mHandler;
diff --git a/src/com/android/settings/network/VpnPreferenceController.java b/src/com/android/settings/network/VpnPreferenceController.java
index 5213a71..cb68d27 100644
--- a/src/com/android/settings/network/VpnPreferenceController.java
+++ b/src/com/android/settings/network/VpnPreferenceController.java
@@ -28,9 +28,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
+import android.provider.SettingsSlicesContract;
 import android.util.Log;
 import android.util.SparseArray;
 
@@ -47,6 +45,10 @@
 
 import java.util.List;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 
 public class VpnPreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
@@ -83,7 +85,7 @@
         // Manually set dependencies for Wifi when not toggleable.
         if (mToggleable == null || !mToggleable.contains(Settings.Global.RADIO_WIFI)) {
             if (mPreference != null) {
-                mPreference.setDependency(AirplaneModePreferenceController.KEY_TOGGLE_AIRPLANE);
+                mPreference.setDependency(SettingsSlicesContract.KEY_AIRPLANE_MODE);
             }
         }
     }
diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java
index 4e90680..48780df 100644
--- a/src/com/android/settings/nfc/AndroidBeam.java
+++ b/src/com/android/settings/nfc/AndroidBeam.java
@@ -25,7 +25,9 @@
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.Switch;
+import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
@@ -75,7 +77,13 @@
             mBeamDisallowedByOnlyAdmin = true;
             return new View(getContext());
         }
-        mView = inflater.inflate(R.layout.android_beam, container, false);
+        mView = inflater.inflate(R.layout.preference_footer, container, false);
+
+        ImageView iconInfo = mView.findViewById(android.R.id.icon);
+        iconInfo.setImageResource(R.drawable.ic_info_outline_24dp);
+        TextView textInfo = mView.findViewById(android.R.id.title);
+        textInfo.setText(R.string.android_beam_explained);
+
         return mView;
     }
 
diff --git a/src/com/android/settings/nfc/AndroidBeamEnabler.java b/src/com/android/settings/nfc/AndroidBeamEnabler.java
index 5041a3e..1808775 100644
--- a/src/com/android/settings/nfc/AndroidBeamEnabler.java
+++ b/src/com/android/settings/nfc/AndroidBeamEnabler.java
@@ -20,7 +20,6 @@
 import android.nfc.NfcAdapter;
 import android.os.UserHandle;
 import android.os.UserManager;
-import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settingslib.RestrictedLockUtils;
@@ -36,18 +35,14 @@
 
     public AndroidBeamEnabler(Context context, RestrictedPreference preference) {
         super(context);
-
         mPreference = preference;
-
         mBeamDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(context,
                 UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId());
-
         if (!isNfcAvailable()) {
             // NFC is not supported
             mPreference.setEnabled(false);
             return;
         }
-
         if (mBeamDisallowedBySystem) {
             mPreference.setEnabled(false);
         }
diff --git a/src/com/android/settings/nfc/AndroidBeamPreferenceController.java b/src/com/android/settings/nfc/AndroidBeamPreferenceController.java
index 739f00e..12ab1b7 100644
--- a/src/com/android/settings/nfc/AndroidBeamPreferenceController.java
+++ b/src/com/android/settings/nfc/AndroidBeamPreferenceController.java
@@ -16,34 +16,75 @@
 package com.android.settings.nfc;
 
 import android.content.Context;
+import android.nfc.NfcAdapter;
+import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
-import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.core.BasePreferenceController;
 import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
-public class AndroidBeamPreferenceController extends BaseNfcPreferenceController {
+import java.util.List;
+
+public class AndroidBeamPreferenceController extends BasePreferenceController
+        implements LifecycleObserver, OnResume, OnPause {
 
     public static final String KEY_ANDROID_BEAM_SETTINGS = "android_beam_settings";
+    private final NfcAdapter mNfcAdapter;
+    private AndroidBeamEnabler mAndroidBeamEnabler;
+    private NfcAirplaneModeObserver mAirplaneModeObserver;
 
-    public AndroidBeamPreferenceController(Context context) {
-        super(context);
+    public AndroidBeamPreferenceController(Context context, String key) {
+        super(context, key);
+        mNfcAdapter = NfcAdapter.getDefaultAdapter(context);
     }
 
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
         if (!isAvailable()) {
+            mAndroidBeamEnabler = null;
             return;
         }
 
-        mNfcEnabler = new AndroidBeamEnabler(mContext, (RestrictedPreference) mPreference);
+        final RestrictedPreference restrictedPreference =
+                (RestrictedPreference) screen.findPreference(getPreferenceKey());
+        mAndroidBeamEnabler = new AndroidBeamEnabler(mContext, restrictedPreference);
+
+        // Manually set dependencies for NFC when not toggleable.
+        if (!NfcPreferenceController.isToggleableInAirplaneMode(mContext)) {
+            mAirplaneModeObserver = new NfcAirplaneModeObserver(mContext, mNfcAdapter,
+                    (Preference) restrictedPreference);
+        }
     }
 
     @Override
-    public String getPreferenceKey() {
-        return KEY_ANDROID_BEAM_SETTINGS;
+    @AvailabilityStatus
+    public int getAvailabilityStatus() {
+        return mNfcAdapter != null
+                ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public void onResume() {
+        if (mAirplaneModeObserver != null) {
+            mAirplaneModeObserver.register();
+        }
+        if (mAndroidBeamEnabler != null) {
+            mAndroidBeamEnabler.resume();
+        }
+    }
+
+    @Override
+    public void onPause() {
+        if (mAirplaneModeObserver != null) {
+            mAirplaneModeObserver.unregister();
+        }
+        if (mAndroidBeamEnabler != null) {
+            mAndroidBeamEnabler.pause();
+        }
     }
 }
diff --git a/src/com/android/settings/nfc/BaseNfcPreferenceController.java b/src/com/android/settings/nfc/BaseNfcPreferenceController.java
deleted file mode 100644
index e8e7dfd..0000000
--- a/src/com/android/settings/nfc/BaseNfcPreferenceController.java
+++ /dev/null
@@ -1,138 +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.nfc;
-
-import android.content.Context;
-import android.database.ContentObserver;
-import android.net.Uri;
-import android.nfc.NfcAdapter;
-import android.os.Handler;
-import android.provider.Settings;
-
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnPause;
-import com.android.settingslib.core.lifecycle.events.OnResume;
-
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
-public abstract class BaseNfcPreferenceController extends AbstractPreferenceController
-        implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
-
-    protected BaseNfcEnabler mNfcEnabler;
-    private NfcAdapter mNfcAdapter;
-    private int mAirplaneMode;
-    private AirplaneModeObserver mAirplaneModeObserver;
-    protected Preference mPreference;
-
-    public BaseNfcPreferenceController(Context context) {
-        super(context);
-        mNfcAdapter = NfcAdapter.getDefaultAdapter(context);
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        if (!isAvailable()) {
-            mNfcEnabler = null;
-            return;
-        }
-
-        mPreference = screen.findPreference(getPreferenceKey());
-
-        // Manually set dependencies for NFC when not toggleable.
-        if (!isToggleableInAirplaneMode(mContext)) {
-            mAirplaneModeObserver = new AirplaneModeObserver();
-            updateNfcPreference();
-        }
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return mNfcAdapter != null;
-    }
-
-    public abstract String getPreferenceKey();
-
-    @Override
-    public void onResume() {
-        if (mAirplaneModeObserver != null) {
-            mAirplaneModeObserver.register();
-        }
-        if (mNfcEnabler != null) {
-            mNfcEnabler.resume();
-        }
-    }
-
-    @Override
-    public void onPause() {
-        if (mAirplaneModeObserver != null) {
-            mAirplaneModeObserver.unregister();
-        }
-        if (mNfcEnabler != null) {
-            mNfcEnabler.pause();
-        }
-    }
-
-    private void updateNfcPreference() {
-        final int airplaneMode = Settings.Global.getInt(
-                mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, mAirplaneMode);
-        if (airplaneMode == mAirplaneMode) {
-            return;
-        }
-        mAirplaneMode = airplaneMode;
-        boolean toggleable = mAirplaneMode != 1;
-        if (toggleable) {
-            mNfcAdapter.enable();
-        } else {
-            mNfcAdapter.disable();
-        }
-        mPreference.setEnabled(toggleable);
-    }
-
-    public static boolean isToggleableInAirplaneMode(Context context) {
-        String toggleable = Settings.Global.getString(context.getContentResolver(),
-                Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
-        return toggleable != null && toggleable.contains(Settings.Global.RADIO_NFC);
-    }
-
-    private final class AirplaneModeObserver extends ContentObserver {
-        private final Uri AIRPLANE_MODE_URI =
-                Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON);
-
-        private AirplaneModeObserver() {
-            super(new Handler());
-        }
-
-        public void register() {
-            mContext.getContentResolver().registerContentObserver(AIRPLANE_MODE_URI, false, this);
-        }
-
-        public void unregister() {
-            mContext.getContentResolver().unregisterContentObserver(this);
-        }
-
-        @Override
-        public void onChange(boolean selfChange, Uri uri) {
-            super.onChange(selfChange, uri);
-            updateNfcPreference();
-        }
-    }
-
-}
diff --git a/src/com/android/settings/nfc/NfcAirplaneModeObserver.java b/src/com/android/settings/nfc/NfcAirplaneModeObserver.java
new file mode 100644
index 0000000..d0ce045
--- /dev/null
+++ b/src/com/android/settings/nfc/NfcAirplaneModeObserver.java
@@ -0,0 +1,81 @@
+/*
+ * 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.nfc;
+
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.nfc.NfcAdapter;
+import android.os.Handler;
+import android.os.Looper;
+import android.provider.Settings;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
+/**
+ * NfcAirplaneModeObserver is a helper to manage the Nfc on/off when airplane mode status
+ * is changed.
+ */
+public class NfcAirplaneModeObserver extends ContentObserver {
+
+    private final Context mContext;
+    private final NfcAdapter mNfcAdapter;
+    private final Preference mPreference;
+    private int mAirplaneMode;
+
+    @VisibleForTesting
+    final static Uri AIRPLANE_MODE_URI =
+            Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON);
+
+    public NfcAirplaneModeObserver(Context context, NfcAdapter nfcAdapter, Preference preference) {
+        super(new Handler(Looper.getMainLooper()));
+        mContext = context;
+        mNfcAdapter = nfcAdapter;
+        mPreference = preference;
+        updateNfcPreference();
+    }
+
+    public void register() {
+        mContext.getContentResolver().registerContentObserver(AIRPLANE_MODE_URI, false, this);
+    }
+
+    public void unregister() {
+        mContext.getContentResolver().unregisterContentObserver(this);
+    }
+
+    @Override
+    public void onChange(boolean selfChange, Uri uri) {
+        super.onChange(selfChange, uri);
+        updateNfcPreference();
+    }
+
+    private void updateNfcPreference() {
+        final int airplaneMode = Settings.Global.getInt(
+                mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, mAirplaneMode);
+        if (airplaneMode == mAirplaneMode) {
+            return;
+        }
+
+        mAirplaneMode = airplaneMode;
+        boolean toggleable = mAirplaneMode != 1;
+        if (toggleable) {
+            mNfcAdapter.enable();
+        } else {
+            mNfcAdapter.disable();
+        }
+        mPreference.setEnabled(toggleable);
+    }
+}
diff --git a/src/com/android/settings/nfc/NfcEnabler.java b/src/com/android/settings/nfc/NfcEnabler.java
index 82011a0..507a053 100644
--- a/src/com/android/settings/nfc/NfcEnabler.java
+++ b/src/com/android/settings/nfc/NfcEnabler.java
@@ -18,52 +18,21 @@
 
 import android.content.Context;
 import android.nfc.NfcAdapter;
-import androidx.preference.Preference;
 import androidx.preference.SwitchPreference;
 
+
 /**
  * NfcEnabler is a helper to manage the Nfc on/off checkbox preference. It turns on/off Nfc
  * and ensures the summary of the preference reflects the current state.
  */
-public class NfcEnabler extends BaseNfcEnabler implements Preference.OnPreferenceChangeListener {
+public class NfcEnabler extends BaseNfcEnabler {
     private final SwitchPreference mPreference;
 
     public NfcEnabler(Context context, SwitchPreference preference) {
         super(context);
-
         mPreference = preference;
     }
 
-    public void resume() {
-        super.resume();
-        if (isNfcAvailable()) {
-            mPreference.setOnPreferenceChangeListener(this);
-        }
-    }
-
-    public void pause() {
-        super.pause();
-        if (isNfcAvailable()) {
-            mPreference.setOnPreferenceChangeListener(null);
-        }
-    }
-
-    public boolean onPreferenceChange(Preference preference, Object value) {
-        // Turn NFC on/off
-
-        final boolean desiredState = (Boolean) value;
-        mPreference.setChecked(desiredState);
-        mPreference.setEnabled(false);
-
-        if (desiredState) {
-            mNfcAdapter.enable();
-        } else {
-            mNfcAdapter.disable();
-        }
-
-        return false;
-    }
-
     @Override
     protected void handleNfcStateChanged(int newState) {
         switch (newState) {
diff --git a/src/com/android/settings/nfc/NfcPreferenceController.java b/src/com/android/settings/nfc/NfcPreferenceController.java
index a00aa32..e1fa1b3 100644
--- a/src/com/android/settings/nfc/NfcPreferenceController.java
+++ b/src/com/android/settings/nfc/NfcPreferenceController.java
@@ -16,35 +16,118 @@
 package com.android.settings.nfc;
 
 import android.content.Context;
+import android.content.IntentFilter;
+import android.nfc.NfcAdapter;
+import android.provider.Settings;
+
+import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 import androidx.preference.SwitchPreference;
 
-import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.core.TogglePreferenceController;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
+import java.util.List;
 
-public class NfcPreferenceController extends BaseNfcPreferenceController {
+public class NfcPreferenceController extends TogglePreferenceController
+        implements LifecycleObserver, OnResume, OnPause {
 
     public static final String KEY_TOGGLE_NFC = "toggle_nfc";
+    private final NfcAdapter mNfcAdapter;
+    private NfcEnabler mNfcEnabler;
+    private NfcAirplaneModeObserver mAirplaneModeObserver;
 
-    public NfcPreferenceController(Context context) {
-        super(context);
+    public NfcPreferenceController(Context context, String key) {
+        super(context, key);
+        mNfcAdapter = NfcAdapter.getDefaultAdapter(context);
     }
 
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
         if (!isAvailable()) {
+            mNfcEnabler = null;
             return;
         }
 
-        mNfcEnabler = new NfcEnabler(mContext, (SwitchPreference) mPreference);
+        final SwitchPreference switchPreference =
+                (SwitchPreference) screen.findPreference(getPreferenceKey());
+
+        mNfcEnabler = new NfcEnabler(mContext, switchPreference);
+
+        // Manually set dependencies for NFC when not toggleable.
+        if (!isToggleableInAirplaneMode(mContext)) {
+            mAirplaneModeObserver = new NfcAirplaneModeObserver(mContext,
+                    mNfcAdapter, (Preference) switchPreference);
+        }
     }
 
     @Override
-    public String getPreferenceKey() {
-        return KEY_TOGGLE_NFC;
+    public boolean isChecked() {
+        return mNfcAdapter.isEnabled();
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        if (isChecked) {
+            mNfcAdapter.enable();
+        } else {
+            mNfcAdapter.disable();
+        }
+        return true;
+    }
+
+    @Override
+    @AvailabilityStatus
+    public int getAvailabilityStatus() {
+        return mNfcAdapter != null
+                ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public IntentFilter getIntentFilter() {
+        final IntentFilter filter = new IntentFilter();
+        filter.addAction(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED);
+        filter.addAction(NfcAdapter.EXTRA_ADAPTER_STATE);
+        return filter;
+    }
+
+    @Override
+    public boolean hasAsyncUpdate() {
+        return true;
+    }
+
+    @Override
+    public boolean isSliceable() {
+        return true;
+    }
+
+    @Override
+    public void onResume() {
+        if (mAirplaneModeObserver != null) {
+            mAirplaneModeObserver.register();
+        }
+        if (mNfcEnabler != null) {
+            mNfcEnabler.resume();
+        }
+    }
+
+    @Override
+    public void onPause() {
+        if (mAirplaneModeObserver != null) {
+            mAirplaneModeObserver.unregister();
+        }
+        if (mNfcEnabler != null) {
+            mNfcEnabler.pause();
+        }
+    }
+
+    public static boolean isToggleableInAirplaneMode(Context context) {
+        final String toggleable = Settings.Global.getString(context.getContentResolver(),
+                Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
+        return toggleable != null && toggleable.contains(Settings.Global.RADIO_NFC);
     }
 }
diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java
index 8233581..6e03842 100644
--- a/src/com/android/settings/nfc/PaymentSettings.java
+++ b/src/com/android/settings/nfc/PaymentSettings.java
@@ -20,12 +20,15 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.provider.SearchIndexableResource;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.content.pm.UserInfo;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
@@ -111,6 +114,11 @@
 
                 @Override
                 protected boolean isPageSearchEnabled(Context context) {
+                    final UserManager userManager = context.getSystemService(UserManager.class);
+                    final UserInfo myUserInfo = userManager.getUserInfo(UserHandle.myUserId());
+                    if (myUserInfo.isGuest()) {
+                        return false;
+                    }
                     final PackageManager pm = context.getPackageManager();
                     return pm.hasSystemFeature(PackageManager.FEATURE_NFC);
                 }
diff --git a/src/com/android/settings/notification/AlarmVolumePreferenceController.java b/src/com/android/settings/notification/AlarmVolumePreferenceController.java
index 3c238aa..92a1e90 100644
--- a/src/com/android/settings/notification/AlarmVolumePreferenceController.java
+++ b/src/com/android/settings/notification/AlarmVolumePreferenceController.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.media.AudioManager;
+import android.text.TextUtils;
 
 import com.android.settings.R;
 
@@ -37,6 +38,11 @@
     }
 
     @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(), "alarm_volume");
+    }
+
+    @Override
     public String getPreferenceKey() {
         return KEY_ALARM_VOLUME;
     }
diff --git a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
index c9e190f..6576e02 100644
--- a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
@@ -28,10 +28,10 @@
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 import androidx.preference.TwoStatePreference;
+import android.text.TextUtils;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.TogglePreferenceController;
-import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settings.R;
 import com.android.settings.search.DatabaseIndexingUtils;
 import com.android.settings.search.InlineSwitchPayload;
@@ -89,6 +89,11 @@
     }
 
     @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(), "notification_badging");
+    }
+
+    @Override
     public boolean isChecked() {
         return Settings.Secure.getInt(mContext.getContentResolver(),
                 NOTIFICATION_BADGING, ON) == ON;
diff --git a/src/com/android/settings/notification/BlockPreferenceController.java b/src/com/android/settings/notification/BlockPreferenceController.java
index bb9eaac..65d3119 100644
--- a/src/com/android/settings/notification/BlockPreferenceController.java
+++ b/src/com/android/settings/notification/BlockPreferenceController.java
@@ -103,8 +103,10 @@
                 saveChannel();
             }
             if (mBackend.onlyHasDefaultChannel(mAppRow.pkg, mAppRow.uid)) {
-                mAppRow.banned = blocked;
-                mBackend.setNotificationsEnabledForPackage(mAppRow.pkg, mAppRow.uid, !blocked);
+                if (mAppRow.banned != blocked) {
+                    mAppRow.banned = blocked;
+                    mBackend.setNotificationsEnabledForPackage(mAppRow.pkg, mAppRow.uid, !blocked);
+                }
             }
         } else if (mChannelGroup != null) {
             mChannelGroup.setBlocked(blocked);
diff --git a/src/com/android/settings/notification/CallVolumePreferenceController.java b/src/com/android/settings/notification/CallVolumePreferenceController.java
index c0e1633..a3eb87f 100644
--- a/src/com/android/settings/notification/CallVolumePreferenceController.java
+++ b/src/com/android/settings/notification/CallVolumePreferenceController.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.media.AudioManager;
+import android.text.TextUtils;
 
 import com.android.settings.R;
 
@@ -38,6 +39,11 @@
     }
 
     @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(), "call_volume");
+    }
+
+    @Override
     public int getAudioStream() {
         if (mAudioManager.isBluetoothScoOn()) {
             return AudioManager.STREAM_BLUETOOTH_SCO;
diff --git a/src/com/android/settings/notification/HeaderPreferenceController.java b/src/com/android/settings/notification/HeaderPreferenceController.java
index 311dcf7..1ff3c9a 100644
--- a/src/com/android/settings/notification/HeaderPreferenceController.java
+++ b/src/com/android/settings/notification/HeaderPreferenceController.java
@@ -18,30 +18,30 @@
 
 import static com.android.settings.widget.EntityHeaderController.PREF_KEY_APP_HEADER;
 
-import androidx.lifecycle.LifecycleObserver;
-import androidx.lifecycle.OnLifecycleEvent;
+import android.app.Activity;
 import android.content.Context;
-import androidx.preference.PreferenceFragment;
-import androidx.preference.Preference;
 import android.text.BidiFormatter;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.view.View;
 
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
+import androidx.preference.PreferenceFragment;
+import androidx.preference.Preference;
+
 import com.android.settings.R;
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.core.lifecycle.events.OnStart;
-
-import java.util.Objects;
 
 public class HeaderPreferenceController extends NotificationPreferenceController
         implements PreferenceControllerMixin, LifecycleObserver {
 
     private final PreferenceFragment mFragment;
     private EntityHeaderController mHeaderController;
+    private boolean mStarted = false;
 
     public HeaderPreferenceController(Context context, PreferenceFragment fragment) {
         super(context, null);
@@ -61,6 +61,13 @@
     @Override
     public void updateState(Preference preference) {
         if (mAppRow != null && mFragment != null) {
+
+            Activity activity = null;
+            if (mStarted) {
+                // don't call done on an activity if it hasn't started yet
+                activity = mFragment.getActivity();
+            }
+
             LayoutPreference pref = (LayoutPreference) preference;
             mHeaderController = EntityHeaderController.newInstance(
                     mFragment.getActivity(), mFragment, pref.findViewById(R.id.entity_header));
@@ -72,7 +79,7 @@
                     .setButtonActions(EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE,
                             EntityHeaderController.ActionType.ACTION_NONE)
                     .setHasAppInfoLink(true)
-                    .done(null, mContext);
+                    .done(activity, mContext);
             pref.findViewById(R.id.entity_header).setVisibility(View.VISIBLE);
         }
     }
@@ -108,6 +115,7 @@
 
     @OnLifecycleEvent(Lifecycle.Event.ON_START)
     public void onStart() {
+        mStarted = true;
         if (mHeaderController != null) {
             mHeaderController.styleActionBar(mFragment.getActivity());
         }
diff --git a/src/com/android/settings/notification/MediaVolumePreferenceController.java b/src/com/android/settings/notification/MediaVolumePreferenceController.java
index f3bffe0..74ce769 100644
--- a/src/com/android/settings/notification/MediaVolumePreferenceController.java
+++ b/src/com/android/settings/notification/MediaVolumePreferenceController.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.media.AudioManager;
+import android.text.TextUtils;
 
 import com.android.settings.R;
 
@@ -38,6 +39,11 @@
     }
 
     @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(), KEY_MEDIA_VOLUME);
+    }
+
+    @Override
     public String getPreferenceKey() {
         return KEY_MEDIA_VOLUME;
     }
@@ -49,6 +55,6 @@
 
     @Override
     public int getMuteIcon() {
-        return com.android.internal.R.drawable.ic_audio_media_mute;
+        return R.drawable.ic_media_stream_off;
     }
 }
diff --git a/src/com/android/settings/notification/NotificationPreferenceController.java b/src/com/android/settings/notification/NotificationPreferenceController.java
index e8af379..49bb08e 100644
--- a/src/com/android/settings/notification/NotificationPreferenceController.java
+++ b/src/com/android/settings/notification/NotificationPreferenceController.java
@@ -83,28 +83,6 @@
         return true;
     }
 
-    /**
-     * Displays or removes preference in this controller.
-     */
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        if (isAvailable()) {
-            final Preference preference = screen.findPreference(getPreferenceKey());
-            if (mPreference != null && preference == null) {
-                screen.addPreference(mPreference);
-            }
-            if (preference != null) {
-                mPreference = preference;
-            }
-            if (mPreference != null && this instanceof Preference.OnPreferenceChangeListener) {
-                mPreference.setOnPreferenceChangeListener(
-                        (Preference.OnPreferenceChangeListener) this);
-            }
-        } else {
-            findAndRemovePreference(screen, getPreferenceKey());
-        }
-    }
-
     // finds the preference recursively and removes it from its parent
     private void findAndRemovePreference(PreferenceGroup prefGroup, String key) {
         final int preferenceCount = prefGroup.getPreferenceCount();
diff --git a/src/com/android/settings/notification/NotificationVolumePreferenceController.java b/src/com/android/settings/notification/NotificationVolumePreferenceController.java
index c3c8793..c82d04b 100644
--- a/src/com/android/settings/notification/NotificationVolumePreferenceController.java
+++ b/src/com/android/settings/notification/NotificationVolumePreferenceController.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.media.AudioManager;
+import android.text.TextUtils;
 
 import com.android.settings.R;
 import com.android.settings.Utils;
@@ -39,6 +40,11 @@
     }
 
     @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(), KEY_NOTIFICATION_VOLUME);
+    }
+
+    @Override
     public String getPreferenceKey() {
         return KEY_NOTIFICATION_VOLUME;
     }
@@ -50,7 +56,7 @@
 
     @Override
     public int getMuteIcon() {
-        return com.android.internal.R.drawable.ic_audio_ring_notif_mute;
+        return R.drawable.ic_notifications_off_24dp;
     }
 
 }
diff --git a/src/com/android/settings/notification/RingVolumePreferenceController.java b/src/com/android/settings/notification/RingVolumePreferenceController.java
index 2ae12c4..cc1bf09 100644
--- a/src/com/android/settings/notification/RingVolumePreferenceController.java
+++ b/src/com/android/settings/notification/RingVolumePreferenceController.java
@@ -29,6 +29,7 @@
 import android.os.Looper;
 import android.os.Message;
 import android.os.Vibrator;
+import android.text.TextUtils;
 
 import com.android.settings.R;
 import com.android.settings.Utils;
@@ -90,6 +91,11 @@
     }
 
     @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(), KEY_RING_VOLUME);
+    }
+
+    @Override
     public int getAudioStream() {
         return AudioManager.STREAM_RING;
     }
@@ -121,12 +127,12 @@
         if (mPreference != null) {
             if (mRingerMode == AudioManager.RINGER_MODE_VIBRATE) {
                 mMuteIcon = R.drawable.ic_volume_ringer_vibrate;
-                mPreference.showIcon(com.android.internal.R.drawable.ic_audio_ring_notif_vibrate);
+                mPreference.showIcon(R.drawable.ic_volume_ringer_vibrate);
             } else if (mRingerMode == AudioManager.RINGER_MODE_SILENT) {
                 mMuteIcon = R.drawable.ic_notifications_off_24dp;
-                mPreference.showIcon(com.android.internal.R.drawable.ic_audio_ring_notif_mute);
+                mPreference.showIcon(R.drawable.ic_notifications_off_24dp);
             } else {
-                mPreference.showIcon(com.android.internal.R.drawable.ic_audio_ring_notif);
+                mPreference.showIcon(R.drawable.ic_notifications);
             }
         }
     }
diff --git a/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java b/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java
index 7f26731..ae111b2 100644
--- a/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java
+++ b/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java
@@ -24,6 +24,8 @@
 import android.net.Uri;
 import android.os.Handler;
 import android.provider.Settings;
+import android.text.TextUtils;
+
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
@@ -64,6 +66,11 @@
     }
 
     @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(), "vibrate_when_ringing");
+    }
+
+    @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
         Preference preference = screen.findPreference(KEY_VIBRATE_WHEN_RINGING);
diff --git a/src/com/android/settings/notification/ZenModeSliceBuilder.java b/src/com/android/settings/notification/ZenModeSliceBuilder.java
index bd43546..1d2c146 100644
--- a/src/com/android/settings/notification/ZenModeSliceBuilder.java
+++ b/src/com/android/settings/notification/ZenModeSliceBuilder.java
@@ -18,6 +18,8 @@
 
 import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
 
+import static androidx.slice.builders.ListBuilder.ICON_IMAGE;
+
 import android.annotation.ColorInt;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -84,7 +86,7 @@
     public static Slice getSlice(Context context) {
         final boolean isZenModeEnabled = isZenModeEnabled(context);
         final CharSequence title = context.getText(R.string.zen_mode_settings_title);
-        @ColorInt final int color = Utils.getColorAccent(context);
+        @ColorInt final int color = Utils.getColorAccentDefaultColor(context);
         final PendingIntent toggleAction = getBroadcastIntent(context);
         final PendingIntent primaryAction = getPrimaryAction(context);
         final SliceAction primarySliceAction = new SliceAction(primaryAction,
@@ -119,6 +121,16 @@
         // handle it.
     }
 
+    public static Intent getIntent(Context context) {
+        final Uri contentUri = new Uri.Builder().appendPath(ZEN_MODE_KEY).build();
+        final String screenTitle = context.getText(R.string.zen_mode_settings_title).toString();
+        return DatabaseIndexingUtils.buildSearchResultPageIntent(context,
+                ZenModeSettings.class.getName(), ZEN_MODE_KEY, screenTitle,
+                MetricsEvent.NOTIFICATION_ZEN_MODE)
+                .setClassName(context.getPackageName(), SubSettings.class.getName())
+                .setData(contentUri);
+    }
+
     private static boolean isZenModeEnabled(Context context) {
         final NotificationManager manager = context.getSystemService(NotificationManager.class);
         final int zenMode = manager.getZenMode();
@@ -135,16 +147,8 @@
     }
 
     private static PendingIntent getPrimaryAction(Context context) {
-        final String screenTitle = context.getText(R.string.zen_mode_settings_title).toString();
-        final Uri contentUri = new Uri.Builder().appendPath(ZEN_MODE_KEY).build();
-        final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(context,
-                ZenModeSettings.class.getName(), ZEN_MODE_KEY, screenTitle,
-                MetricsEvent.NOTIFICATION_ZEN_MODE)
-                .setClassName(context.getPackageName(), SubSettings.class.getName())
-                .setData(contentUri);
-
-        return PendingIntent.getActivity(context, 0 /* requestCode */,
-                intent, 0 /* flags */);
+        final Intent intent = getIntent(context);
+        return PendingIntent.getActivity(context, 0 /* requestCode */, intent, 0 /* flags */);
     }
 
     private static PendingIntent getBroadcastIntent(Context context) {
diff --git a/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java b/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java
index 0996534..28475b6 100644
--- a/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java
@@ -117,6 +117,7 @@
             }
         }
 
+        // values in displayContacts must not be null
         mPreference.setSummary(ListFormatter.getInstance().format(displayContacts));
     }
 
@@ -130,22 +131,32 @@
         return true;
     }
 
-    private List<String> getStarredContacts() {
+    @VisibleForTesting
+    List<String> getStarredContacts(Cursor cursor) {
         List<String> starredContacts = new ArrayList<>();
 
-        Cursor cursor = mContext.getContentResolver().query(ContactsContract.Contacts.CONTENT_URI,
-                new String[]{ContactsContract.Contacts.DISPLAY_NAME_PRIMARY},
-                ContactsContract.Data.STARRED + "=1", null,
-                ContactsContract.Data.TIMES_CONTACTED);
-
         if (cursor.moveToFirst()) {
             do {
-                starredContacts.add(cursor.getString(0));
+                String contact = cursor.getString(0);
+                if (contact != null) {
+                    starredContacts.add(contact);
+                }
             } while (cursor.moveToNext());
         }
         return starredContacts;
     }
 
+    private List<String> getStarredContacts() {
+        return getStarredContacts(queryData());
+    }
+
+    private Cursor queryData() {
+        return mContext.getContentResolver().query(ContactsContract.Contacts.CONTENT_URI,
+                new String[]{ContactsContract.Contacts.DISPLAY_NAME_PRIMARY},
+                ContactsContract.Data.STARRED + "=1", null,
+                ContactsContract.Data.TIMES_CONTACTED);
+    }
+
     private boolean isIntentValid() {
         return mStarredContactsIntent.resolveActivity(mPackageManager) != null
                 || mFallbackIntent.resolveActivity(mPackageManager) != null;
diff --git a/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java
index 757fde7..d7de0d9 100644
--- a/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java
@@ -28,6 +28,8 @@
         extends AbstractZenModePreferenceController
         implements ZenCustomRadioButtonPreference.OnRadioButtonClickListener {
 
+    private ZenCustomRadioButtonPreference mPreference;
+
     protected static final int EFFECTS = Policy.SUPPRESSED_EFFECT_SCREEN_OFF
             | Policy.SUPPRESSED_EFFECT_SCREEN_ON
             | Policy.SUPPRESSED_EFFECT_FULL_SCREEN_INTENT
@@ -44,6 +46,13 @@
     }
 
     @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = (ZenCustomRadioButtonPreference) screen.findPreference(getPreferenceKey());
+        mPreference.setOnRadioButtonClickListener(this);
+    }
+
+    @Override
     public boolean isAvailable() {
         return true;
     }
@@ -54,17 +63,7 @@
 
         boolean everythingBlocked = Policy.areAllVisualEffectsSuppressed(
                 mBackend.mPolicy.suppressedVisualEffects);
-        ZenCustomRadioButtonPreference pref = (ZenCustomRadioButtonPreference) preference;
-        pref.setOnRadioButtonClickListener(this);
-        pref.setChecked(everythingBlocked);
-    }
-
-    protected void deselect(PreferenceScreen screen) {
-        ZenCustomRadioButtonPreference preference =
-                (ZenCustomRadioButtonPreference) screen.findPreference(getPreferenceKey());
-        if (preference != null) {
-            preference.setChecked(false);
-        }
+        mPreference.setChecked(everythingBlocked);
     }
 
     @Override
diff --git a/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java
index 5dd99f6..2285308 100644
--- a/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java
@@ -16,9 +16,8 @@
 
 package com.android.settings.notification;
 
-import android.app.NotificationManager.Policy;
+import android.app.NotificationManager;
 import android.content.Context;
-
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
@@ -30,10 +29,13 @@
 public class ZenModeVisEffectsCustomPreferenceController
         extends AbstractZenModePreferenceController {
 
-    protected static final int INTERRUPTIVE_EFFECTS = Policy.SUPPRESSED_EFFECT_AMBIENT
-            | Policy.SUPPRESSED_EFFECT_PEEK
-            | Policy.SUPPRESSED_EFFECT_LIGHTS
-            | Policy.SUPPRESSED_EFFECT_FULL_SCREEN_INTENT;
+    private ZenCustomRadioButtonPreference mPreference;
+
+    protected static final int INTERRUPTIVE_EFFECTS =
+            NotificationManager.Policy.SUPPRESSED_EFFECT_AMBIENT
+            | NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK
+            | NotificationManager.Policy.SUPPRESSED_EFFECT_LIGHTS
+            | NotificationManager.Policy.SUPPRESSED_EFFECT_FULL_SCREEN_INTENT;
 
     public ZenModeVisEffectsCustomPreferenceController(Context context, Lifecycle lifecycle,
             String key) {
@@ -46,25 +48,31 @@
     }
 
     @Override
-    public void updateState(Preference preference) {
-        super.updateState(preference);
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = (ZenCustomRadioButtonPreference) screen.findPreference(getPreferenceKey());
 
-        ZenCustomRadioButtonPreference pref = (ZenCustomRadioButtonPreference) preference;
-        pref.setChecked(areCustomOptionsSelected());
-
-        pref.setOnGearClickListener(p -> {
+        mPreference.setOnGearClickListener(p -> {
             launchCustomSettings();
 
         });
 
-        pref.setOnRadioButtonClickListener(p -> {
+        mPreference.setOnRadioButtonClickListener(p -> {
             launchCustomSettings();
         });
     }
 
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        mPreference.setChecked(areCustomOptionsSelected());
+    }
+
     protected boolean areCustomOptionsSelected() {
         boolean allEffectsSuppressed =
-                Policy.areAllVisualEffectsSuppressed(mBackend.mPolicy.suppressedVisualEffects);
+                NotificationManager.Policy.areAllVisualEffectsSuppressed(
+                        mBackend.mPolicy.suppressedVisualEffects);
         boolean noEffectsSuppressed = mBackend.mPolicy.suppressedVisualEffects == 0;
 
         return !(allEffectsSuppressed || noEffectsSuppressed);
diff --git a/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java
index abfbd01..580fb5d 100644
--- a/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java
@@ -28,6 +28,8 @@
         extends AbstractZenModePreferenceController
         implements ZenCustomRadioButtonPreference.OnRadioButtonClickListener {
 
+    private ZenCustomRadioButtonPreference mPreference;
+
     protected static final int EFFECTS = Policy.SUPPRESSED_EFFECT_SCREEN_OFF
             | Policy.SUPPRESSED_EFFECT_SCREEN_ON
             | Policy.SUPPRESSED_EFFECT_FULL_SCREEN_INTENT
@@ -44,6 +46,13 @@
     }
 
     @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = (ZenCustomRadioButtonPreference) screen.findPreference(getPreferenceKey());
+        mPreference.setOnRadioButtonClickListener(this);
+    }
+
+    @Override
     public boolean isAvailable() {
         return true;
     }
@@ -53,9 +62,7 @@
         super.updateState(preference);
 
         boolean nothingBlocked = mBackend.mPolicy.suppressedVisualEffects == 0;
-        ZenCustomRadioButtonPreference pref = (ZenCustomRadioButtonPreference) preference;
-        pref.setOnRadioButtonClickListener(this);
-        pref.setChecked(nothingBlocked);
+        mPreference.setChecked(nothingBlocked);
     }
 
     @Override
@@ -64,12 +71,4 @@
                 MetricsProto.MetricsEvent.ACTION_ZEN_SOUND_ONLY, true);
         mBackend.saveVisualEffectsPolicy(EFFECTS, false);
     }
-
-    protected void deselect(PreferenceScreen screen) {
-        ZenCustomRadioButtonPreference preference =
-                (ZenCustomRadioButtonPreference) screen.findPreference(getPreferenceKey());
-        if (preference != null) {
-            preference.setChecked(false);
-        }
-    }
 }
diff --git a/src/com/android/settings/search/DeviceIndexFeatureProvider.java b/src/com/android/settings/search/DeviceIndexFeatureProvider.java
index bf75ee8..e6b3e93 100644
--- a/src/com/android/settings/search/DeviceIndexFeatureProvider.java
+++ b/src/com/android/settings/search/DeviceIndexFeatureProvider.java
@@ -21,9 +21,13 @@
 import android.app.job.JobScheduler;
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.pm.ServiceInfo;
 import android.net.Uri;
+import android.os.Binder;
 import android.os.Build;
 import android.provider.Settings;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.settings.R;
@@ -31,26 +35,31 @@
 import com.android.settings.slices.SettingsSliceProvider;
 
 import java.util.List;
-import java.util.Objects;
+import java.util.Locale;
 
 public interface DeviceIndexFeatureProvider {
 
-
     String TAG = "DeviceIndex";
 
     String INDEX_VERSION = "settings:index_version";
+    String INDEX_LANGUAGE = "settings:language";
 
     // Increment when new items are added to ensure they get pushed to the device index.
     String VERSION = Build.FINGERPRINT;
 
+    // When the device language changes, re-index so Slices trigger in device language.
+    Locale LANGUAGE = Locale.getDefault();
+
     boolean isIndexingEnabled();
 
     void index(Context context, CharSequence title, Uri sliceUri, Uri launchUri,
             List<String> keywords);
 
+    void clearIndex(Context context);
+
     default void updateIndex(Context context, boolean force) {
         if (!isIndexingEnabled()) {
-            Log.w(TAG, "Skipping: device index is not enabled");
+            Log.i(TAG, "Skipping: device index is not enabled");
             return;
         }
 
@@ -59,14 +68,36 @@
             return;
         }
 
-        if (!force && Objects.equals(
-                Settings.Secure.getString(context.getContentResolver(), INDEX_VERSION), VERSION)) {
+        final ComponentName jobComponent = new ComponentName(context.getPackageName(),
+                DeviceIndexUpdateJobService.class.getName());
+
+        try {
+            final int callerUid = Binder.getCallingUid();
+            final ServiceInfo si = context.getPackageManager().getServiceInfo(jobComponent,
+                    PackageManager.MATCH_DIRECT_BOOT_AWARE
+                            | PackageManager.MATCH_DIRECT_BOOT_UNAWARE);
+            if (si == null) {
+                Log.w(TAG, "Skipping: No such service " + jobComponent);
+                return;
+            }
+            if (si.applicationInfo.uid != callerUid) {
+                Log.w(TAG, "Skipping: Uid cannot schedule DeviceIndexUpdate: " + callerUid);
+                return;
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.w(TAG, "Skipping: error finding DeviceIndexUpdateJobService from packageManager");
+            return;
+        }
+
+        if (!force && skipIndex(context)) {
+            Log.i(TAG, "Skipping: already indexed.");
             // No need to update.
             return;
         }
 
-        final ComponentName jobComponent = new ComponentName(context.getPackageName(),
-                DeviceIndexUpdateJobService.class.getName());
+        // Prevent scheduling multiple jobs
+        setIndexState(context);
+
         final int jobId = context.getResources().getInteger(R.integer.device_index_update);
         // Schedule a job so that we know it'll be able to complete, but try to run as
         // soon as possible.
@@ -77,7 +108,6 @@
                         .setOverrideDeadline(1)
                         .build());
 
-        Settings.Secure.putString(context.getContentResolver(), INDEX_VERSION, VERSION);
     }
 
     static Uri createDeepLink(String s) {
@@ -86,4 +116,19 @@
                 .appendQueryParameter(INTENT, s)
                 .build();
     }
+
+    static boolean skipIndex(Context context) {
+        final boolean isSameVersion = TextUtils.equals(
+                Settings.Secure.getString(context.getContentResolver(), INDEX_VERSION), VERSION);
+        final boolean isSameLanguage = TextUtils.equals(
+                Settings.Secure.getString(context.getContentResolver(), INDEX_LANGUAGE),
+                LANGUAGE.toString());
+        return isSameLanguage && isSameVersion;
+    }
+
+    static void setIndexState(Context context) {
+        Settings.Secure.putString(context.getContentResolver(), INDEX_VERSION, VERSION);
+        Settings.Secure.putString(context.getContentResolver(), INDEX_LANGUAGE,
+                LANGUAGE.toString());
+    }
 }
diff --git a/src/com/android/settings/search/DeviceIndexFeatureProviderImpl.java b/src/com/android/settings/search/DeviceIndexFeatureProviderImpl.java
index 7a11bd4..087ecf8 100644
--- a/src/com/android/settings/search/DeviceIndexFeatureProviderImpl.java
+++ b/src/com/android/settings/search/DeviceIndexFeatureProviderImpl.java
@@ -31,4 +31,9 @@
             List<String> keywords) {
         // Not enabled by default.
     }
+
+    @Override
+    public void clearIndex(Context context) {
+        // Not enabled by default.
+    }
 }
diff --git a/src/com/android/settings/search/DeviceIndexUpdateJobService.java b/src/com/android/settings/search/DeviceIndexUpdateJobService.java
index 19b7d5e..3eb9041 100644
--- a/src/com/android/settings/search/DeviceIndexUpdateJobService.java
+++ b/src/com/android/settings/search/DeviceIndexUpdateJobService.java
@@ -25,6 +25,7 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.net.Uri.Builder;
+import android.provider.SettingsSlicesContract;
 import android.util.Log;
 
 import com.android.internal.annotations.VisibleForTesting;
@@ -37,8 +38,8 @@
 
 import androidx.slice.Slice;
 import androidx.slice.SliceItem;
-import androidx.slice.SliceManager;
-import androidx.slice.SliceManager.SliceCallback;
+import androidx.slice.SliceViewManager;
+import androidx.slice.SliceViewManager.SliceCallback;
 import androidx.slice.SliceMetadata;
 import androidx.slice.core.SliceQuery;
 import androidx.slice.widget.ListContent;
@@ -79,16 +80,24 @@
         }
         final DeviceIndexFeatureProvider indexProvider = FeatureFactory.getFactory(this)
                 .getDeviceIndexFeatureProvider();
-        final SliceManager manager = getSliceManager();
+        final SliceViewManager manager = getSliceViewManager();
         final Uri baseUri = new Builder()
                 .scheme(ContentResolver.SCHEME_CONTENT)
                 .authority(SettingsSliceProvider.SLICE_AUTHORITY)
                 .build();
+        final Uri platformBaseUri = new Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(SettingsSlicesContract.AUTHORITY)
+                .build();
         final Collection<Uri> slices = manager.getSliceDescendants(baseUri);
+        slices.addAll(manager.getSliceDescendants(platformBaseUri));
+
         if (DEBUG) {
             Log.d(TAG, "Indexing " + slices.size() + " slices");
         }
 
+        indexProvider.clearIndex(this /* context */);
+
         for (Uri slice : slices) {
             if (!mRunningJob) {
                 return;
@@ -115,8 +124,8 @@
         jobFinished(params, false);
     }
 
-    protected SliceManager getSliceManager() {
-        return SliceManager.getInstance(this);
+    protected SliceViewManager getSliceViewManager() {
+        return SliceViewManager.getInstance(this);
     }
 
     protected SliceMetadata getMetadata(Slice loadedSlice) {
@@ -149,7 +158,7 @@
         return null;
     }
 
-    protected Slice bindSliceSynchronous(SliceManager manager, Uri slice) {
+    protected Slice bindSliceSynchronous(SliceViewManager manager, Uri slice) {
         final Slice[] returnSlice = new Slice[1];
         CountDownLatch latch = new CountDownLatch(1);
         SliceCallback callback = new SliceCallback() {
diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java
index 4b28e28..db09a37 100644
--- a/src/com/android/settings/slices/SettingsSliceProvider.java
+++ b/src/com/android/settings/slices/SettingsSliceProvider.java
@@ -23,17 +23,23 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.Uri;
+import android.os.StrictMode;
+import android.provider.Settings;
 import android.provider.SettingsSlicesContract;
 import android.text.TextUtils;
 import android.util.ArraySet;
+import android.util.KeyValueListParser;
 import android.util.Log;
 import android.util.Pair;
 
-import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.bluetooth.BluetoothSliceBuilder;
 import com.android.settings.core.BasePreferenceController;
+import com.android.settings.location.LocationSliceBuilder;
+import com.android.settings.notification.ZenModeSliceBuilder;
+import com.android.settings.mobilenetwork.Enhanced4gLteSliceHelper;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.wifi.WifiSliceBuilder;
 import com.android.settings.wifi.calling.WifiCallingSliceHelper;
-import com.android.settings.notification.ZenModeSliceBuilder;
 import com.android.settingslib.SliceBroadcastRelay;
 import com.android.settingslib.utils.ThreadUtils;
 
@@ -41,6 +47,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -48,7 +55,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import androidx.annotation.VisibleForTesting;
-import androidx.core.graphics.drawable.IconCompat;
 import androidx.slice.Slice;
 import androidx.slice.SliceProvider;
 
@@ -114,10 +120,13 @@
     @VisibleForTesting
     Map<Uri, SliceData> mSliceDataCache;
 
+    private final KeyValueListParser mParser;
+
     final Set<Uri> mRegisteredUris = new ArraySet<>();
 
     public SettingsSliceProvider() {
         super(READ_SEARCH_INDEXABLES);
+        mParser = new KeyValueListParser(',');
     }
 
     @Override
@@ -142,12 +151,14 @@
     @Override
     public void onSlicePinned(Uri sliceUri) {
         if (WifiSliceBuilder.WIFI_URI.equals(sliceUri)) {
-            registerIntentToUri(WifiSliceBuilder.INTENT_FILTER , sliceUri);
+            registerIntentToUri(WifiSliceBuilder.INTENT_FILTER, sliceUri);
             mRegisteredUris.add(sliceUri);
             return;
         } else if (ZenModeSliceBuilder.ZEN_MODE_URI.equals(sliceUri)) {
             registerIntentToUri(ZenModeSliceBuilder.INTENT_FILTER, sliceUri);
-            mRegisteredUris.add(sliceUri);
+            return;
+        } else if (BluetoothSliceBuilder.BLUETOOTH_URI.equals(sliceUri)) {
+            registerIntentToUri(BluetoothSliceBuilder.INTENT_FILTER, sliceUri);
             return;
         }
 
@@ -167,6 +178,19 @@
 
     @Override
     public Slice onBindSlice(Uri sliceUri) {
+        final StrictMode.ThreadPolicy oldPolicy = StrictMode.getThreadPolicy();
+        try {
+            if (!ThreadUtils.isMainThread()) {
+                StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
+                        .permitAll()
+                        .build());
+            }
+            final Set<String> blockedKeys = getBlockedKeys();
+            final String key = sliceUri.getLastPathSegment();
+            if (blockedKeys.contains(key)) {
+                Log.e(TAG, "Requested blocked slice with Uri: " + sliceUri);
+                return null;
+            }
         // If adding a new Slice, do not directly match Slice URIs.
         // Use {@link SlicesDatabaseAccessor}.
         if (WifiCallingSliceHelper.WIFI_CALLING_URI.equals(sliceUri)) {
@@ -178,19 +202,36 @@
             return WifiSliceBuilder.getSlice(getContext());
         } else if (ZenModeSliceBuilder.ZEN_MODE_URI.equals(sliceUri)) {
             return ZenModeSliceBuilder.getSlice(getContext());
+        } else if (BluetoothSliceBuilder.BLUETOOTH_URI.equals(sliceUri)) {
+            return BluetoothSliceBuilder.getSlice(getContext());
+        } else if (LocationSliceBuilder.LOCATION_URI.equals(sliceUri)) {
+            return LocationSliceBuilder.getSlice(getContext());
+        } else if (Enhanced4gLteSliceHelper.SLICE_URI.equals(sliceUri)) {
+            return FeatureFactory.getFactory(getContext())
+                    .getSlicesFeatureProvider()
+                    .getNewEnhanced4gLteSliceHelper(getContext())
+                    .createEnhanced4gLteSlice(sliceUri);
+        } else if (WifiCallingSliceHelper.WIFI_CALLING_PREFERENCE_URI.equals(sliceUri)) {
+            return FeatureFactory.getFactory(getContext())
+                    .getSlicesFeatureProvider()
+                    .getNewWifiCallingSliceHelper(getContext())
+                    .createWifiCallingPreferenceSlice(sliceUri);
         }
 
-        SliceData cachedSliceData = mSliceWeakDataCache.get(sliceUri);
-        if (cachedSliceData == null) {
-            loadSliceInBackground(sliceUri);
-            return getSliceStub(sliceUri);
-        }
+            SliceData cachedSliceData = mSliceWeakDataCache.get(sliceUri);
+            if (cachedSliceData == null) {
+                loadSliceInBackground(sliceUri);
+                return getSliceStub(sliceUri);
+            }
 
-        // Remove the SliceData from the cache after it has been used to prevent a memory-leak.
-        if (!mSliceDataCache.containsKey(sliceUri)) {
-            mSliceWeakDataCache.remove(sliceUri);
+            // Remove the SliceData from the cache after it has been used to prevent a memory-leak.
+            if (!mSliceDataCache.containsKey(sliceUri)) {
+                mSliceWeakDataCache.remove(sliceUri);
+            }
+            return SliceBuilderUtils.buildSlice(getContext(), cachedSliceData);
+        } finally {
+            StrictMode.setThreadPolicy(oldPolicy);
         }
-        return SliceBuilderUtils.buildSlice(getContext(), cachedSliceData);
     }
 
     /**
@@ -279,10 +320,17 @@
     void loadSlice(Uri uri) {
         long startBuildTime = System.currentTimeMillis();
 
-        final SliceData sliceData = mSlicesDatabaseAccessor.getSliceDataFromUri(uri);
+        final SliceData sliceData;
+        try {
+            sliceData = mSlicesDatabaseAccessor.getSliceDataFromUri(uri);
+        } catch (IllegalStateException e) {
+            Log.d(TAG, "Could not create slicedata for uri: " + uri);
+            return;
+        }
 
         final BasePreferenceController controller = SliceBuilderUtils.getPreferenceController(
                 getContext(), sliceData);
+
         final IntentFilter filter = controller.getIntentFilter();
         if (filter != null) {
             registerIntentToUri(filter, uri);
@@ -325,7 +373,9 @@
 
     private List<Uri> getSpecialCasePlatformUris() {
         return Arrays.asList(
-                WifiSliceBuilder.WIFI_URI
+                WifiSliceBuilder.WIFI_URI,
+                BluetoothSliceBuilder.BLUETOOTH_URI,
+                LocationSliceBuilder.LOCATION_URI
         );
     }
 
@@ -346,4 +396,32 @@
         SliceBroadcastRelay.registerReceiver(getContext(), sliceUri, SliceBroadcastReceiver.class,
                 intentFilter);
     }
+
+    @VisibleForTesting
+    Set<String> getBlockedKeys() {
+        final String value = Settings.Global.getString(getContext().getContentResolver(),
+                Settings.Global.BLOCKED_SLICES);
+        final Set<String> set = new ArraySet<>();
+
+        try {
+            mParser.setString(value);
+        } catch (IllegalArgumentException e) {
+            Log.e(TAG, "Bad Settings Slices Whitelist flags", e);
+            return set;
+        }
+
+        final String[] parsedValues = parseStringArray(value);
+        Collections.addAll(set, parsedValues);
+        return set;
+    }
+
+    private String[] parseStringArray(String value) {
+        if (value != null) {
+            String[] parts = value.split(":");
+            if (parts.length > 0) {
+                return parts;
+            }
+        }
+        return new String[0];
+    }
 }
diff --git a/src/com/android/settings/slices/SliceBroadcastReceiver.java b/src/com/android/settings/slices/SliceBroadcastReceiver.java
index b9f3b00..9f1ef76 100644
--- a/src/com/android/settings/slices/SliceBroadcastReceiver.java
+++ b/src/com/android/settings/slices/SliceBroadcastReceiver.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.slices;
 
+import static com.android.settings.bluetooth.BluetoothSliceBuilder.ACTION_BLUETOOTH_SLICE_CHANGED;
 import static com.android.settings.notification.ZenModeSliceBuilder.ACTION_ZEN_MODE_SLICE_CHANGED;
 import static com.android.settings.slices.SettingsSliceProvider.ACTION_SLIDER_CHANGED;
 import static com.android.settings.slices.SettingsSliceProvider.ACTION_TOGGLE_CHANGED;
@@ -23,9 +24,14 @@
 import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_PLATFORM_DEFINED;
 import static com.android.settings.wifi.calling.WifiCallingSliceHelper.ACTION_WIFI_CALLING_CHANGED;
 import static com.android.settings.wifi.WifiSliceBuilder.ACTION_WIFI_SLICE_CHANGED;
+import static com.android.settings.mobilenetwork.Enhanced4gLteSliceHelper.ACTION_ENHANCED_4G_LTE_CHANGED;
+import static com.android.settings.wifi.calling.WifiCallingSliceHelper.ACTION_WIFI_CALLING_PREFERENCE_WIFI_ONLY;
+import static com.android.settings.wifi.calling.WifiCallingSliceHelper.ACTION_WIFI_CALLING_PREFERENCE_WIFI_PREFERRED;
+import static com.android.settings.wifi.calling.WifiCallingSliceHelper.ACTION_WIFI_CALLING_PREFERENCE_CELLULAR_PREFERRED;
 
 import android.app.slice.Slice;
 import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -35,6 +41,7 @@
 import android.util.Pair;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.bluetooth.BluetoothSliceBuilder;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.SliderPreferenceController;
 import com.android.settings.core.TogglePreferenceController;
@@ -66,6 +73,9 @@
                 final int newPosition = intent.getIntExtra(Slice.EXTRA_RANGE_VALUE, -1);
                 handleSliderAction(context, key, newPosition, isPlatformSlice);
                 break;
+            case ACTION_BLUETOOTH_SLICE_CHANGED:
+                BluetoothSliceBuilder.handleUriChange(context, intent);
+                break;
             case ACTION_WIFI_SLICE_CHANGED:
                 WifiSliceBuilder.handleUriChange(context, intent);
                 break;
@@ -78,6 +88,20 @@
             case ACTION_ZEN_MODE_SLICE_CHANGED:
                 ZenModeSliceBuilder.handleUriChange(context, intent);
                 break;
+            case ACTION_ENHANCED_4G_LTE_CHANGED:
+                FeatureFactory.getFactory(context)
+                        .getSlicesFeatureProvider()
+                        .getNewEnhanced4gLteSliceHelper(context)
+                        .handleEnhanced4gLteChanged(intent);
+                break;
+            case ACTION_WIFI_CALLING_PREFERENCE_WIFI_ONLY:
+            case ACTION_WIFI_CALLING_PREFERENCE_WIFI_PREFERRED:
+            case ACTION_WIFI_CALLING_PREFERENCE_CELLULAR_PREFERRED:
+                FeatureFactory.getFactory(context)
+                        .getSlicesFeatureProvider()
+                        .getNewWifiCallingSliceHelper(context)
+                        .handleWifiCallingPreferenceChanged(intent);
+                break;
             default:
                 final String uriString = intent.getStringExtra(SliceBroadcastRelay.EXTRA_URI);
                 if (!TextUtils.isEmpty(uriString)) {
@@ -101,7 +125,9 @@
 
         if (!controller.isAvailable()) {
             Log.w(TAG, "Can't update " + key + " since the setting is unavailable");
-            updateUri(context, key, isPlatformSlice);
+            if (!controller.hasAsyncUpdate()) {
+                updateUri(context, key, isPlatformSlice);
+            }
             return;
         }
 
@@ -110,7 +136,9 @@
         final TogglePreferenceController toggleController = (TogglePreferenceController) controller;
         toggleController.setChecked(isChecked);
         logSliceValueChange(context, key, isChecked ? 1 : 0);
-        updateUri(context, key, isPlatformSlice);
+        if (!controller.hasAsyncUpdate()) {
+            updateUri(context, key, isPlatformSlice);
+        }
     }
 
     private void handleSliderAction(Context context, String key, int newPosition,
@@ -146,6 +174,7 @@
 
         sliderController.setSliderPosition(newPosition);
         logSliceValueChange(context, key, newPosition);
+        updateUri(context, key, isPlatformSlice);
     }
 
     /**
@@ -168,8 +197,15 @@
     }
 
     private void updateUri(Context context, String key, boolean isPlatformDefined) {
-        final String path = SettingsSlicesContract.PATH_SETTING_ACTION + "/" + key;
-        final Uri uri = SliceBuilderUtils.getUri(path, isPlatformDefined);
+        final String authority = isPlatformDefined
+                ? SettingsSlicesContract.AUTHORITY
+                : SettingsSliceProvider.SLICE_AUTHORITY;
+        final Uri uri = new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(authority)
+                .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
+                .appendPath(key)
+                .build();
         context.getContentResolver().notifyChange(uri, null /* observer */);
     }
 }
diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java
index b7f5134..804721c 100644
--- a/src/com/android/settings/slices/SliceBuilderUtils.java
+++ b/src/com/android/settings/slices/SliceBuilderUtils.java
@@ -86,8 +86,13 @@
         FeatureFactory.getFactory(context).getMetricsFeatureProvider()
                 .action(context, MetricsEvent.ACTION_SETTINGS_SLICE_REQUESTED, sliceNamePair);
 
-        if (controller.getAvailabilityStatus() != AVAILABLE) {
-            return buildUnavailableSlice(context, sliceData, controller);
+        if (!controller.isAvailable()) {
+            // Cannot guarantee setting page is accessible, let the presenter handle error case.
+            return null;
+        }
+
+        if (controller.getAvailabilityStatus() == DISABLED_DEPENDENT_SETTING) {
+            return buildUnavailableSlice(context, sliceData);
         }
 
         switch (sliceData.getSliceType()) {
@@ -177,14 +182,6 @@
     }
 
     /**
-     * @return {@link PendingIntent} to the Settings home page.
-     */
-    public static PendingIntent getSettingsIntent(Context context) {
-        final Intent intent = new Intent(Settings.ACTION_SETTINGS);
-        return PendingIntent.getActivity(context, 0 /* requestCode */, intent, 0 /* flags */);
-    }
-
-    /**
      * @return the summary text for a {@link Slice} built for {@param sliceData}.
      */
     public static CharSequence getSubtitleText(Context context,
@@ -238,7 +235,7 @@
         final PendingIntent contentIntent = getContentPendingIntent(context, sliceData);
         final IconCompat icon = IconCompat.createWithResource(context, sliceData.getIconResource());
         final CharSequence subtitleText = getSubtitleText(context, controller, sliceData);
-        @ColorInt final int color = Utils.getColorAccent(context);
+        @ColorInt final int color = Utils.getColorAccentDefaultColor(context);
         final TogglePreferenceController toggleController =
                 (TogglePreferenceController) controller;
         final SliceAction sliceAction = getToggleAction(context, sliceData,
@@ -262,7 +259,7 @@
         final PendingIntent contentIntent = getContentPendingIntent(context, sliceData);
         final IconCompat icon = IconCompat.createWithResource(context, sliceData.getIconResource());
         final CharSequence subtitleText = getSubtitleText(context, controller, sliceData);
-        @ColorInt final int color = Utils.getColorAccent(context);
+        @ColorInt final int color = Utils.getColorAccentDefaultColor(context);
         final List<String> keywords = buildSliceKeywords(sliceData);
 
         return new ListBuilder(context, sliceData.getUri(), ListBuilder.INFINITY)
@@ -282,7 +279,8 @@
         final PendingIntent actionIntent = getSliderAction(context, sliceData);
         final PendingIntent contentIntent = getContentPendingIntent(context, sliceData);
         final IconCompat icon = IconCompat.createWithResource(context, sliceData.getIconResource());
-        @ColorInt final int color = Utils.getColorAccent(context);
+        @ColorInt final int color = Utils.getColorAccentDefaultColor(context);
+        final CharSequence subtitleText = getSubtitleText(context, controller, sliceData);
         final SliceAction primaryAction = new SliceAction(contentIntent, icon,
                 sliceData.getTitle());
         final List<String> keywords = buildSliceKeywords(sliceData);
@@ -291,10 +289,11 @@
                 .setAccentColor(color)
                 .addInputRange(builder -> builder
                         .setTitle(sliceData.getTitle())
+                        .setSubtitle(subtitleText)
+                        .setPrimaryAction(primaryAction)
                         .setMax(sliderController.getMaxSteps())
                         .setValue(sliderController.getSliderPosition())
-                        .setInputAction(actionIntent)
-                        .setPrimaryAction(primaryAction))
+                        .setInputAction(actionIntent))
                 .setKeywords(keywords)
                 .build();
     }
@@ -355,40 +354,20 @@
         return keywords;
     }
 
-    private static Slice buildUnavailableSlice(Context context, SliceData data,
-            BasePreferenceController controller) {
+    private static Slice buildUnavailableSlice(Context context, SliceData data) {
         final String title = data.getTitle();
         final List<String> keywords = buildSliceKeywords(data);
-        @ColorInt final int color = Utils.getColorAccent(context);
-        final String summary;
-        final SliceAction primaryAction;
+        @ColorInt final int color = Utils.getColorAccentDefaultColor(context);
+        final CharSequence summary = context.getText(R.string.disabled_dependent_setting_summary);
         final IconCompat icon = IconCompat.createWithResource(context, data.getIconResource());
-
-        switch (controller.getAvailabilityStatus()) {
-            case UNSUPPORTED_ON_DEVICE:
-                summary = context.getString(R.string.unsupported_setting_summary);
-                primaryAction = new SliceAction(getSettingsIntent(context), icon, title);
-                break;
-            case DISABLED_FOR_USER:
-                summary = context.getString(R.string.disabled_for_user_setting_summary);
-                primaryAction = new SliceAction(getContentPendingIntent(context, data), icon,
-                        title);
-                break;
-            case DISABLED_DEPENDENT_SETTING:
-                summary = context.getString(R.string.disabled_dependent_setting_summary);
-                primaryAction = new SliceAction(getContentPendingIntent(context, data), icon,
-                        title);
-                break;
-            case CONDITIONALLY_UNAVAILABLE:
-            default:
-                summary = context.getString(R.string.unknown_unavailability_setting_summary);
-                primaryAction = new SliceAction(getSettingsIntent(context), icon, title);
-        }
+        final SliceAction primaryAction = new SliceAction(getContentPendingIntent(context, data),
+                icon, title);
 
         return new ListBuilder(context, data.getUri(), ListBuilder.INFINITY)
                 .setAccentColor(color)
                 .addRow(builder -> builder
                         .setTitle(title)
+                        .setTitleItem(icon)
                         .setSubtitle(summary)
                         .setPrimaryAction(primaryAction))
                 .setKeywords(keywords)
diff --git a/src/com/android/settings/slices/SliceDataConverter.java b/src/com/android/settings/slices/SliceDataConverter.java
index 7bd66ba..bfe090e 100644
--- a/src/com/android/settings/slices/SliceDataConverter.java
+++ b/src/com/android/settings/slices/SliceDataConverter.java
@@ -19,7 +19,6 @@
 import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_CONTROLLER;
 import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_ICON;
 import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_KEY;
-import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_KEYWORDS;
 import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_PLATFORM_SLICE_FLAG;
 import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_SUMMARY;
 import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_TITLE;
@@ -44,6 +43,7 @@
 import com.android.settings.R;
 import com.android.settings.accessibility.AccessibilitySettings;
 import com.android.settings.accessibility.AccessibilitySlicePreferenceController;
+import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.PreferenceXmlParserUtils;
 import com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag;
 import com.android.settings.dashboard.DashboardFragment;
@@ -194,6 +194,7 @@
                 if (TextUtils.isEmpty(controllerClassName)) {
                     continue;
                 }
+
                 final String key = bundle.getString(METADATA_KEY);
                 final String title = bundle.getString(METADATA_TITLE);
                 final String summary = bundle.getString(METADATA_SUMMARY);
@@ -214,7 +215,13 @@
                         .setPlatformDefined(isPlatformSlice)
                         .build();
 
-                xmlSliceData.add(xmlSlice);
+                final BasePreferenceController controller =
+                        SliceBuilderUtils.getPreferenceController(mContext, xmlSlice);
+
+                // Only add pre-approved Slices available on the device.
+                if (controller.isAvailable() && controller.isSliceable()) {
+                    xmlSliceData.add(xmlSlice);
+                }
             }
         } catch (SliceData.InvalidSliceDataException e) {
             Log.w(TAG, "Invalid data when building SliceData for " + fragmentName, e);
diff --git a/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java b/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java
index 7f1a0f3..4f8ed96 100644
--- a/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java
+++ b/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java
@@ -18,8 +18,16 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.provider.Settings;
 import android.util.Log;
 
+import com.android.settings.bluetooth.BluetoothSliceBuilder;
+import com.android.settings.location.LocationSliceBuilder;
+import com.android.settings.notification.ZenModeSliceBuilder;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.wifi.WifiSliceBuilder;
+import com.android.settings.wifi.calling.WifiCallingSliceHelper;
+
 import java.net.URISyntaxException;
 
 public class SliceDeepLinkSpringBoard extends Activity {
@@ -44,11 +52,26 @@
             if (ACTION_VIEW_SLICE.equals(intent.getAction())) {
                 // This shouldn't matter since the slice is shown instead of the device
                 // index caring about the launch uri.
-                Uri slice = Uri.parse(intent.getStringExtra(EXTRA_SLICE));
-                SlicesDatabaseAccessor slicesDatabaseAccessor = new SlicesDatabaseAccessor(this);
-                // Sadly have to block here because we don't know where to go.
-                final SliceData sliceData = slicesDatabaseAccessor.getSliceDataFromUri(slice);
-                Intent launchIntent = SliceBuilderUtils.getContentIntent(this, sliceData);
+                final Uri slice = Uri.parse(intent.getStringExtra(EXTRA_SLICE));
+                final Intent launchIntent;
+
+                // TODO (b/80263568) Avoid duplicating this list of Slice Uris.
+                if (WifiSliceBuilder.WIFI_URI.equals(slice)) {
+                    launchIntent = WifiSliceBuilder.getIntent(this /* context */);
+                } else if (ZenModeSliceBuilder.ZEN_MODE_URI.equals(slice)) {
+                    launchIntent = ZenModeSliceBuilder.getIntent(this /* context */);
+                } else if (BluetoothSliceBuilder.BLUETOOTH_URI.equals(slice)) {
+                    launchIntent = BluetoothSliceBuilder.getIntent(this /* context */);
+                } else if (LocationSliceBuilder.LOCATION_URI.equals(slice)) {
+                    launchIntent = LocationSliceBuilder.getIntent(this /* context */);
+                } else {
+                    final SlicesDatabaseAccessor slicesDatabaseAccessor =
+                            new SlicesDatabaseAccessor(this /* context */);
+                    // Sadly have to block here because we don't know where to go.
+                    final SliceData sliceData = slicesDatabaseAccessor.getSliceDataFromUri(slice);
+                    launchIntent = SliceBuilderUtils.getContentIntent(this, sliceData);
+                }
+
                 startActivity(launchIntent);
             } else {
                 startActivity(intent);
@@ -57,6 +80,10 @@
         } catch (URISyntaxException e) {
             Log.e(TAG, "Error decoding uri", e);
             finish();
+        } catch (IllegalStateException e) {
+            Log.w(TAG, "Couldn't launch Slice intent", e);
+            startActivity(new Intent(Settings.ACTION_SETTINGS));
+            finish();
         }
     }
 
diff --git a/src/com/android/settings/slices/SlicesFeatureProvider.java b/src/com/android/settings/slices/SlicesFeatureProvider.java
index 8dd6547..8395a58 100644
--- a/src/com/android/settings/slices/SlicesFeatureProvider.java
+++ b/src/com/android/settings/slices/SlicesFeatureProvider.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 
+import com.android.settings.mobilenetwork.Enhanced4gLteSliceHelper;
 import com.android.settings.wifi.calling.WifiCallingSliceHelper;
 
 /**
@@ -31,4 +32,10 @@
      * Gets new WifiCallingSliceHelper object
      */
     WifiCallingSliceHelper getNewWifiCallingSliceHelper(Context context);
+
+    /**
+     * Gets new Enhanced4gLteSliceHelper object
+     */
+    Enhanced4gLteSliceHelper getNewEnhanced4gLteSliceHelper(Context context);
 }
+
diff --git a/src/com/android/settings/slices/SlicesFeatureProviderImpl.java b/src/com/android/settings/slices/SlicesFeatureProviderImpl.java
index 16684bf..988bcfe 100644
--- a/src/com/android/settings/slices/SlicesFeatureProviderImpl.java
+++ b/src/com/android/settings/slices/SlicesFeatureProviderImpl.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 
+import com.android.settings.mobilenetwork.Enhanced4gLteSliceHelper;
 import com.android.settings.wifi.calling.WifiCallingSliceHelper;
 import com.android.settingslib.utils.ThreadUtils;
 
@@ -45,4 +46,9 @@
     public WifiCallingSliceHelper getNewWifiCallingSliceHelper(Context context) {
         return new WifiCallingSliceHelper(context);
     }
+
+    @Override
+    public Enhanced4gLteSliceHelper getNewEnhanced4gLteSliceHelper(Context context) {
+        return new Enhanced4gLteSliceHelper(context);
+    }
 }
diff --git a/src/com/android/settings/sound/AudioSwitchPreferenceController.java b/src/com/android/settings/sound/AudioSwitchPreferenceController.java
index e0c8c88..f35fd60 100644
--- a/src/com/android/settings/sound/AudioSwitchPreferenceController.java
+++ b/src/com/android/settings/sound/AudioSwitchPreferenceController.java
@@ -29,6 +29,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.pm.PackageManager;
 import android.media.AudioDeviceCallback;
 import android.media.AudioDeviceInfo;
 import android.media.AudioManager;
@@ -41,6 +42,7 @@
 import androidx.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.util.FeatureFlagUtils;
+import android.util.Log;
 
 import com.android.settings.R;
 import com.android.settings.bluetooth.Utils;
@@ -59,6 +61,8 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.FutureTask;
 
 /**
  * Abstract class for audio switcher controller to notify subclass
@@ -70,21 +74,22 @@
         implements Preference.OnPreferenceChangeListener, BluetoothCallback,
         LifecycleObserver, OnStart, OnStop {
 
+    private static final String TAG = "AudioSwitchPreferenceController";
     private static final int INVALID_INDEX = -1;
 
     protected final List<BluetoothDevice> mConnectedDevices;
     protected final AudioManager mAudioManager;
     protected final MediaRouter mMediaRouter;
-    protected final LocalBluetoothProfileManager mProfileManager;
     protected int mSelectedIndex;
     protected Preference mPreference;
+    protected LocalBluetoothProfileManager mProfileManager;
     protected AudioSwitchCallback mAudioSwitchPreferenceCallback;
 
     private final AudioManagerAudioDeviceCallback mAudioManagerAudioDeviceCallback;
-    private final LocalBluetoothManager mLocalBluetoothManager;
     private final MediaRouterCallback mMediaRouterCallback;
     private final WiredHeadsetBroadcastReceiver mReceiver;
     private final Handler mHandler;
+    private LocalBluetoothManager mLocalBluetoothManager;
 
     public interface AudioSwitchCallback {
         void onPreferenceDataChanged(ListPreference preference);
@@ -94,14 +99,27 @@
         super(context, preferenceKey);
         mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
         mMediaRouter = (MediaRouter) context.getSystemService(Context.MEDIA_ROUTER_SERVICE);
-        mLocalBluetoothManager = Utils.getLocalBtManager(mContext);
-        mLocalBluetoothManager.setForegroundActivity(context);
-        mProfileManager = mLocalBluetoothManager.getProfileManager();
         mHandler = new Handler(Looper.getMainLooper());
         mAudioManagerAudioDeviceCallback = new AudioManagerAudioDeviceCallback();
         mReceiver = new WiredHeadsetBroadcastReceiver();
         mMediaRouterCallback = new MediaRouterCallback();
         mConnectedDevices = new ArrayList<>();
+        final FutureTask<LocalBluetoothManager> localBtManagerFutureTask = new FutureTask<>(
+                // Avoid StrictMode ThreadPolicy violation
+                () -> Utils.getLocalBtManager(mContext));
+        try {
+            localBtManagerFutureTask.run();
+            mLocalBluetoothManager = localBtManagerFutureTask.get();
+        } catch (InterruptedException | ExecutionException e) {
+            Log.w(TAG, "Error getting LocalBluetoothManager.", e);
+            return;
+        }
+        if (mLocalBluetoothManager == null) {
+            Log.e(TAG, "Bluetooth is not supported on this device");
+            return;
+        }
+        mLocalBluetoothManager.setForegroundActivity(mContext);
+        mProfileManager = mLocalBluetoothManager.getProfileManager();
     }
 
     /**
@@ -110,7 +128,8 @@
      */
     @Override
     public final int getAvailabilityStatus() {
-        return FeatureFlagUtils.isEnabled(mContext, FeatureFlags.AUDIO_SWITCHER_SETTINGS)
+        return FeatureFlagUtils.isEnabled(mContext, FeatureFlags.AUDIO_SWITCHER_SETTINGS) &&
+                mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
                 ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
 
@@ -136,7 +155,7 @@
             final BluetoothDevice btDevice = mConnectedDevices.get(connectedDeviceIndex);
             mSelectedIndex = connectedDeviceIndex;
             setActiveBluetoothDevice(btDevice);
-            listPreference.setSummary(btDevice.getName());
+            listPreference.setSummary(btDevice.getAliasName());
         }
         return true;
     }
@@ -328,7 +347,7 @@
         mediaValues[mSelectedIndex] = mContext.getText(R.string.media_output_default_summary);
         for (int i = 0, size = mConnectedDevices.size(); i < size; i++) {
             final BluetoothDevice btDevice = mConnectedDevices.get(i);
-            mediaOutputs[i] = btDevice.getName();
+            mediaOutputs[i] = btDevice.getAliasName();
             mediaValues[i] = btDevice.getAddress();
             if (btDevice.equals(activeDevice)) {
                 // select the active connected device.
diff --git a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
index 0115de7..fdbf610 100644
--- a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
+++ b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
@@ -66,7 +66,11 @@
         if (numDevices == 0) {
             // No connected devices, disable switch entry.
             mPreference.setVisible(false);
-            preference.setSummary(mContext.getText(R.string.media_output_default_summary));
+            final CharSequence summary = mContext.getText(R.string.media_output_default_summary);
+            final CharSequence[] defaultMediaOutput = new CharSequence[]{summary};
+            mSelectedIndex = getDefaultDeviceIndex();
+            preference.setSummary(summary);
+            setPreference(defaultMediaOutput, defaultMediaOutput, preference);
             return;
         }
 
diff --git a/src/com/android/settings/sound/MediaOutputPreferenceController.java b/src/com/android/settings/sound/MediaOutputPreferenceController.java
index 9c3bc4c..bf9e37f 100644
--- a/src/com/android/settings/sound/MediaOutputPreferenceController.java
+++ b/src/com/android/settings/sound/MediaOutputPreferenceController.java
@@ -78,7 +78,11 @@
         if (numDevices == 0) {
             // Disable switch entry if there is no connected devices.
             mPreference.setVisible(false);
-            preference.setSummary(mContext.getText(R.string.media_output_default_summary));
+            final CharSequence summary = mContext.getText(R.string.media_output_default_summary);
+            final CharSequence[] defaultMediaOutput = new CharSequence[]{summary};
+            mSelectedIndex = getDefaultDeviceIndex();
+            preference.setSummary(summary);
+            setPreference(defaultMediaOutput, defaultMediaOutput, preference);
             return;
         }
 
diff --git a/src/com/android/settings/widget/DonutView.java b/src/com/android/settings/widget/DonutView.java
index 261c85d..0acb81c 100644
--- a/src/com/android/settings/widget/DonutView.java
+++ b/src/com/android/settings/widget/DonutView.java
@@ -122,7 +122,7 @@
                 : Paint.BIDI_RTL;
 
         mTextPaint = new TextPaint();
-        mTextPaint.setColor(Utils.getColorAccent(getContext()));
+        mTextPaint.setColor(Utils.getColorAccentDefaultColor(getContext()));
         mTextPaint.setAntiAlias(true);
         mTextPaint.setTextSize(
                 resources.getDimension(R.dimen.storage_donut_view_label_text_size));
@@ -130,7 +130,7 @@
         mTextPaint.setBidiFlags(bidiFlags);
 
         mBigNumberPaint = new TextPaint();
-        mBigNumberPaint.setColor(Utils.getColorAccent(getContext()));
+        mBigNumberPaint.setColor(Utils.getColorAccentDefaultColor(getContext()));
         mBigNumberPaint.setAntiAlias(true);
         mBigNumberPaint.setTextSize(
                 resources.getDimension(R.dimen.storage_donut_view_percent_text_size));
diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java
index 05d2be1..3e724fa 100644
--- a/src/com/android/settings/widget/EntityHeaderController.java
+++ b/src/com/android/settings/widget/EntityHeaderController.java
@@ -31,10 +31,13 @@
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.UserHandle;
+
 import androidx.annotation.IntDef;
 import androidx.annotation.VisibleForTesting;
 import androidx.recyclerview.widget.RecyclerView;
+
 import android.text.TextUtils;
+import android.util.IconDrawableFactory;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -146,9 +149,7 @@
      * accessibility purposes.
      */
     public EntityHeaderController setIcon(ApplicationsState.AppEntry appEntry) {
-        if (appEntry.icon != null) {
-            mIcon = appEntry.icon.getConstantState().newDrawable(mAppContext.getResources());
-        }
+        mIcon = IconDrawableFactory.newInstance(mAppContext).getBadgedIcon(appEntry.info);
         return this;
     }
 
diff --git a/src/com/android/settings/widget/TwoStateButtonPreference.java b/src/com/android/settings/widget/TwoStateButtonPreference.java
index 35877a0..ae3e495 100644
--- a/src/com/android/settings/widget/TwoStateButtonPreference.java
+++ b/src/com/android/settings/widget/TwoStateButtonPreference.java
@@ -18,22 +18,34 @@
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import androidx.core.content.res.TypedArrayUtils;
 import android.util.AttributeSet;
+import android.view.View;
 import android.widget.Button;
 
 import com.android.settings.R;
 import com.android.settings.applications.LayoutPreference;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.core.content.res.TypedArrayUtils;
+
 /**
  * Preference that presents a button with two states(On vs Off)
  */
-public class TwoStateButtonPreference extends LayoutPreference {
+public class TwoStateButtonPreference extends LayoutPreference implements
+        View.OnClickListener {
+
+    private boolean mIsChecked;
+    private final Button mButtonOn;
+    private final Button mButtonOff;
+
     public TwoStateButtonPreference(Context context, AttributeSet attrs) {
         super(context, attrs, TypedArrayUtils.getAttr(
                 context, R.attr.twoStateButtonPreferenceStyle, android.R.attr.preferenceStyle));
 
-        if (attrs != null) {
+        if (attrs == null) {
+            mButtonOn = null;
+            mButtonOff = null;
+        } else {
             final TypedArray styledAttrs = context.obtainStyledAttributes(attrs,
                     R.styleable.TwoStateButtonPreference);
             final int textOnId = styledAttrs.getResourceId(
@@ -44,19 +56,52 @@
                     R.string.summary_placeholder);
             styledAttrs.recycle();
 
-            final Button buttonOn = getStateOnButton();
-            buttonOn.setText(textOnId);
-            final Button buttonOff = getStateOffButton();
-            buttonOff.setText(textOffId);
+            mButtonOn = findViewById(R.id.state_on_button);
+            mButtonOn.setText(textOnId);
+            mButtonOn.setOnClickListener(this);
+            mButtonOff = findViewById(R.id.state_off_button);
+            mButtonOff.setText(textOffId);
+            mButtonOff.setOnClickListener(this);
+            setChecked(isChecked());
         }
     }
 
-    public Button getStateOnButton() {
-        return findViewById(R.id.state_on_button);
+    @Override
+    public void onClick(View v) {
+        final boolean stateOn = v.getId() == R.id.state_on_button;
+        setChecked(stateOn);
+        callChangeListener(stateOn);
     }
 
+    public void setChecked(boolean checked) {
+        // Update state
+        mIsChecked = checked;
+        // And update UI
+        if (checked) {
+            mButtonOn.setVisibility(View.GONE);
+            mButtonOff.setVisibility(View.VISIBLE);
+        } else {
+            mButtonOn.setVisibility(View.VISIBLE);
+            mButtonOff.setVisibility(View.GONE);
+        }
+    }
 
+    public boolean isChecked() {
+        return mIsChecked;
+    }
+
+    public void setButtonEnabled(boolean enabled) {
+        mButtonOn.setEnabled(enabled);
+        mButtonOff.setEnabled(enabled);
+    }
+
+    @VisibleForTesting
+    public Button getStateOnButton() {
+        return mButtonOn;
+    }
+
+    @VisibleForTesting
     public Button getStateOffButton() {
-        return findViewById(R.id.state_off_button);
+        return mButtonOff;
     }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/widget/TwoStateButtonPreferenceController.java b/src/com/android/settings/widget/TwoStateButtonPreferenceController.java
deleted file mode 100644
index 72bf45e..0000000
--- a/src/com/android/settings/widget/TwoStateButtonPreferenceController.java
+++ /dev/null
@@ -1,78 +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.widget;
-
-import android.content.Context;
-import androidx.preference.PreferenceScreen;
-import android.view.View;
-import android.widget.Button;
-
-import com.android.settings.R;
-import com.android.settings.core.BasePreferenceController;
-
-/**
- * Controller to update the button with two states(On vs Off).
- */
-public abstract class TwoStateButtonPreferenceController extends BasePreferenceController
-        implements View.OnClickListener {
-    private Button mButtonOn;
-    private Button mButtonOff;
-
-    public TwoStateButtonPreferenceController(Context context, String key) {
-        super(context, key);
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        final TwoStateButtonPreference preference =
-                (TwoStateButtonPreference) screen.findPreference(getPreferenceKey());
-        mButtonOn = preference.getStateOnButton();
-        mButtonOn.setOnClickListener(this);
-        mButtonOff = preference.getStateOffButton();
-        mButtonOff.setOnClickListener(this);
-    }
-
-    protected void setButtonVisibility(boolean stateOn) {
-        if (stateOn) {
-            mButtonOff.setVisibility(View.GONE);
-            mButtonOn.setVisibility(View.VISIBLE);
-        } else {
-            mButtonOff.setVisibility(View.VISIBLE);
-            mButtonOn.setVisibility(View.GONE);
-        }
-    }
-
-    protected void setButtonEnabled(boolean enabled) {
-        mButtonOn.setEnabled(enabled);
-        mButtonOff.setEnabled(enabled);
-    }
-
-    @Override
-    public void onClick(View v) {
-        final boolean stateOn = v.getId() == R.id.state_on_button;
-        onButtonClicked(stateOn);
-    }
-
-    /**
-     * Callback when button is clicked
-     *
-     * @param stateOn {@code true} if stateOn button is clicked, otherwise it means stateOff
-     *                button is clicked
-     */
-    public abstract void onButtonClicked(boolean stateOn);
-}
\ No newline at end of file
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 95f7e9c..22de20c 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -220,8 +220,6 @@
         mMeteredSettingsSpinner = mView.findViewById(R.id.metered_settings);
         mHiddenSettingsSpinner = mView.findViewById(R.id.hidden_settings);
         mHiddenSettingsSpinner.setOnItemSelectedListener(this);
-        mHiddenSettingsSpinner.setVisibility(View.GONE);
-        mHiddenSettingsSpinner.setEnabled(false);
         mHiddenWarningView = mView.findViewById(R.id.hidden_settings_warning);
         mHiddenWarningView.setVisibility(
                 mHiddenSettingsSpinner.getSelectedItemPosition() == NOT_HIDDEN_NETWORK
@@ -241,8 +239,7 @@
             showProxyFields();
             mView.findViewById(R.id.wifi_advanced_toggle).setVisibility(View.VISIBLE);
             // Hidden option can be changed only when the user adds a network manually.
-            mHiddenSettingsSpinner.setVisibility(View.VISIBLE);
-            mHiddenSettingsSpinner.setEnabled(true);
+            mView.findViewById(R.id.hidden_settings_field).setVisibility(View.VISIBLE);
             ((CheckBox) mView.findViewById(R.id.wifi_advanced_togglebox))
                     .setOnCheckedChangeListener(this);
 
diff --git a/src/com/android/settings/wifi/WifiSliceBuilder.java b/src/com/android/settings/wifi/WifiSliceBuilder.java
index 82038a5..6cc0714 100644
--- a/src/com/android/settings/wifi/WifiSliceBuilder.java
+++ b/src/com/android/settings/wifi/WifiSliceBuilder.java
@@ -19,6 +19,8 @@
 import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
 import static android.provider.SettingsSlicesContract.KEY_WIFI;
 
+import static androidx.slice.builders.ListBuilder.ICON_IMAGE;
+
 import android.annotation.ColorInt;
 import android.app.PendingIntent;
 import android.content.ContentResolver;
@@ -87,7 +89,7 @@
                 R.drawable.ic_settings_wireless);
         final String title = context.getString(R.string.wifi_settings);
         final CharSequence summary = getSummary(context);
-        @ColorInt final int color = Utils.getColorAccent(context);
+        @ColorInt final int color = Utils.getColorAccentDefaultColor(context);
         final PendingIntent toggleAction = getBroadcastIntent(context);
         final PendingIntent primaryAction = getPrimaryAction(context);
         final SliceAction primarySliceAction = new SliceAction(primaryAction, icon, title);
@@ -118,6 +120,18 @@
         // handle it.
     }
 
+    public static Intent getIntent(Context context) {
+        final String screenTitle = context.getText(R.string.wifi_settings).toString();
+        final Uri contentUri = new Uri.Builder().appendPath(KEY_WIFI).build();
+        final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(context,
+                WifiSettings.class.getName(), KEY_WIFI, screenTitle,
+                MetricsEvent.DIALOG_WIFI_AP_EDIT)
+                .setClassName(context.getPackageName(), SubSettings.class.getName())
+                .setData(contentUri);
+
+        return intent;
+    }
+
     private static boolean isWifiEnabled(Context context) {
         final WifiManager wifiManager = context.getSystemService(WifiManager.class);
 
@@ -156,14 +170,7 @@
     }
 
     private static PendingIntent getPrimaryAction(Context context) {
-        final String screenTitle = context.getText(R.string.wifi_settings).toString();
-        final Uri contentUri = new Uri.Builder().appendPath(KEY_WIFI).build();
-        final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(context,
-                WifiSettings.class.getName(), KEY_WIFI, screenTitle,
-                MetricsEvent.DIALOG_WIFI_AP_EDIT);
-        intent.setClassName(context.getPackageName(), SubSettings.class.getName());
-        intent.setData(contentUri);
-
+        final Intent intent = getIntent(context);
         return PendingIntent.getActivity(context, 0 /* requestCode */,
                 intent, 0 /* flags */);
     }
diff --git a/src/com/android/settings/wifi/WifiUtils.java b/src/com/android/settings/wifi/WifiUtils.java
index db8ede7..1e8308b 100644
--- a/src/com/android/settings/wifi/WifiUtils.java
+++ b/src/com/android/settings/wifi/WifiUtils.java
@@ -50,7 +50,7 @@
 
     public static boolean isHotspotPasswordValid(String password) {
         if (TextUtils.isEmpty(password)) {
-            return true;
+            return false;
         }
 
         final int length = password.length();
diff --git a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java
index 9847d4a..ab8db2b 100644
--- a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java
+++ b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java
@@ -25,20 +25,24 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.PersistableBundle;
-import androidx.core.graphics.drawable.IconCompat;
+import android.provider.Settings;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.core.graphics.drawable.IconCompat;
 import androidx.slice.Slice;
 import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.ListBuilder.RowBuilder;
 import androidx.slice.builders.SliceAction;
 
+import com.android.ims.ImsConfig;
 import com.android.ims.ImsManager;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
+import com.android.settings.Utils;
 import com.android.settings.slices.SettingsSliceProvider;
 import com.android.settings.slices.SliceBroadcastReceiver;
 import com.android.settings.slices.SliceBuilderUtils;
@@ -65,12 +69,34 @@
     public static final String PATH_WIFI_CALLING = "wifi_calling";
 
     /**
+     * Settings slice path to wifi calling preference setting.
+     */
+    public static final String PATH_WIFI_CALLING_PREFERENCE =
+            "wifi_calling_preference";
+
+    /**
      * Action passed for changes to wifi calling slice (toggle).
      */
     public static final String ACTION_WIFI_CALLING_CHANGED =
             "com.android.settings.wifi.calling.action.WIFI_CALLING_CHANGED";
 
     /**
+     * Action passed when user selects wifi only preference.
+     */
+    public static final String ACTION_WIFI_CALLING_PREFERENCE_WIFI_ONLY =
+            "com.android.settings.slice.action.WIFI_CALLING_PREFERENCE_WIFI_ONLY";
+    /**
+     * Action passed when user selects wifi preferred preference.
+     */
+    public static final String ACTION_WIFI_CALLING_PREFERENCE_WIFI_PREFERRED =
+            "com.android.settings.slice.action.WIFI_CALLING_PREFERENCE_WIFI_PREFERRED";
+    /**
+     * Action passed when user selects cellular preferred preference.
+     */
+    public static final String ACTION_WIFI_CALLING_PREFERENCE_CELLULAR_PREFERRED =
+            "com.android.settings.slice.action.WIFI_CALLING_PREFERENCE_CELLULAR_PREFERRED";
+
+    /**
      * Action for Wifi calling Settings activity which
      * allows setting configuration for Wifi calling
      * related settings
@@ -88,11 +114,19 @@
             .build();
 
     /**
+     * Full {@link Uri} for the Wifi Calling Preference Slice.
+     */
+    public static final Uri WIFI_CALLING_PREFERENCE_URI = new Uri.Builder()
+            .scheme(ContentResolver.SCHEME_CONTENT)
+            .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+            .appendPath(PATH_WIFI_CALLING_PREFERENCE)
+            .build();
+
+    /**
      * Timeout for querying wifi calling setting from ims manager.
      */
     private static final int TIMEOUT_MILLIS = 2000;
 
-    protected SubscriptionManager mSubscriptionManager;
     private final Context mContext;
 
     @VisibleForTesting
@@ -114,14 +148,10 @@
      */
     public Slice createWifiCallingSlice(Uri sliceUri) {
         final int subId = getDefaultVoiceSubId();
-        final String carrierName = getSimCarrierName();
 
         if (subId <= SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
             Log.d(TAG, "Invalid subscription Id");
-            return getNonActionableWifiCallingSlice(
-                    mContext.getString(R.string.wifi_calling_settings_title),
-                    mContext.getString(R.string.wifi_calling_not_supported, carrierName),
-                    sliceUri, SliceBuilderUtils.getSettingsIntent(mContext));
+            return null;
         }
 
         final ImsManager imsManager = getImsManager(subId);
@@ -129,10 +159,7 @@
         if (!imsManager.isWfcEnabledByPlatform()
                 || !imsManager.isWfcProvisionedOnDevice()) {
             Log.d(TAG, "Wifi calling is either not provisioned or not enabled by Platform");
-            return getNonActionableWifiCallingSlice(
-                    mContext.getString(R.string.wifi_calling_settings_title),
-                    mContext.getString(R.string.wifi_calling_not_supported, carrierName),
-                    sliceUri, SliceBuilderUtils.getSettingsIntent(mContext));
+            return null;
         }
 
         try {
@@ -147,18 +174,15 @@
                 // Activation needed for the next action of the user
                 // Give instructions to go to settings app
                 return getNonActionableWifiCallingSlice(
-                        mContext.getString(R.string.wifi_calling_settings_title),
-                        mContext.getString(
+                        mContext.getText(R.string.wifi_calling_settings_title),
+                        mContext.getText(
                                 R.string.wifi_calling_settings_activation_instructions),
                         sliceUri, getActivityIntent(ACTION_WIFI_CALLING_SETTINGS_ACTIVITY));
             }
-            return getWifiCallingSlice(sliceUri, mContext, isWifiCallingEnabled);
+            return getWifiCallingSlice(sliceUri, isWifiCallingEnabled);
         } catch (InterruptedException | TimeoutException | ExecutionException e) {
             Log.e(TAG, "Unable to read the current WiFi calling status", e);
-            return getNonActionableWifiCallingSlice(
-                    mContext.getString(R.string.wifi_calling_settings_title),
-                    mContext.getString(R.string.wifi_calling_turn_on),
-                    sliceUri, getActivityIntent(ACTION_WIFI_CALLING_SETTINGS_ACTIVITY));
+            return null;
         }
     }
 
@@ -173,25 +197,21 @@
         final ExecutorService executor = Executors.newSingleThreadExecutor();
         executor.execute(isWifiOnTask);
 
-        Boolean isWifiEnabledByUser = false;
-        isWifiEnabledByUser = isWifiOnTask.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
-
-        return isWifiEnabledByUser && imsManager.isNonTtyOrTtyOnVolteEnabled();
+        return isWifiOnTask.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)
+                && imsManager.isNonTtyOrTtyOnVolteEnabled();
     }
 
     /**
      * Builds a toggle slice where the intent takes you to the wifi calling page and the toggle
      * enables/disables wifi calling.
      */
-    private Slice getWifiCallingSlice(Uri sliceUri, Context mContext,
-            boolean isWifiCallingEnabled) {
-
+    private Slice getWifiCallingSlice(Uri sliceUri, boolean isWifiCallingEnabled) {
         final IconCompat icon = IconCompat.createWithResource(mContext, R.drawable.wifi_signal);
-        final String title = mContext.getString(R.string.wifi_calling_settings_title);
+
         return new ListBuilder(mContext, sliceUri, ListBuilder.INFINITY)
-                .setColor(R.color.material_blue_500)
+                .setAccentColor(Utils.getColorAccentDefaultColor(mContext))
                 .addRow(b -> b
-                        .setTitle(title)
+                        .setTitle(mContext.getText(R.string.wifi_calling_settings_title))
                         .addEndItem(
                                 new SliceAction(
                                         getBroadcastIntent(ACTION_WIFI_CALLING_CHANGED),
@@ -199,15 +219,160 @@
                         .setPrimaryAction(new SliceAction(
                                 getActivityIntent(ACTION_WIFI_CALLING_SETTINGS_ACTIVITY),
                                 icon,
-                                title)))
+                                mContext.getText(R.string.wifi_calling_settings_title))))
                 .build();
     }
 
+    /**
+     * Returns Slice object for wifi calling preference.
+     *
+     * If wifi calling is not turned on, this method will return a slice to turn on wifi calling.
+     *
+     * If wifi calling preference is not user editable, this method will return a slice to display
+     * appropriate message.
+     *
+     * If wifi calling preference can be changed, this method will return a slice with 3 or 4 rows:
+     * Header Row: current preference settings
+     * Row 1: wifi only option with ACTION_WIFI_CALLING_PREFERENCE_WIFI_ONLY, if wifi only option
+     * is editable
+     * Row 2: wifi preferred option with ACTION_WIFI_CALLING_PREFERENCE_WIFI_PREFERRED
+     * Row 3: cellular preferred option with ACTION_WIFI_CALLING_PREFERENCE_CELLULAR_PREFERRED
+     */
+    public Slice createWifiCallingPreferenceSlice(Uri sliceUri) {
+        final int subId = getDefaultVoiceSubId();
+
+        if (subId <= SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            Log.d(TAG, "Invalid Subscription Id");
+            return null;
+        }
+
+        final boolean isWifiCallingPrefEditable = isCarrierConfigManagerKeyEnabled(
+                CarrierConfigManager.KEY_EDITABLE_WFC_MODE_BOOL, subId,false);
+        final boolean isWifiOnlySupported = isCarrierConfigManagerKeyEnabled(
+                CarrierConfigManager.KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL, subId, true);
+        final ImsManager imsManager = getImsManager(subId);
+
+        if (!imsManager.isWfcEnabledByPlatform()
+                || !imsManager.isWfcProvisionedOnDevice()) {
+            Log.d(TAG, "Wifi calling is either not provisioned or not enabled by platform");
+            return null;
+        }
+
+        if (!isWifiCallingPrefEditable) {
+            Log.d(TAG, "Wifi calling preference is not editable");
+            return null;
+        }
+
+        boolean isWifiCallingEnabled = false;
+        int wfcMode = -1;
+        try {
+            isWifiCallingEnabled = isWifiCallingEnabled(imsManager);
+            wfcMode = getWfcMode(imsManager);
+        } catch (InterruptedException | ExecutionException | TimeoutException e) {
+            Log.e(TAG, "Unable to get wifi calling preferred mode", e);
+            return null;
+        }
+        if (!isWifiCallingEnabled) {
+            // wifi calling is not enabled. Ask user to enable wifi calling
+            return getNonActionableWifiCallingSlice(
+                    mContext.getText(R.string.wifi_calling_mode_title),
+                    mContext.getText(R.string.wifi_calling_turn_on),
+                    sliceUri, getActivityIntent(ACTION_WIFI_CALLING_SETTINGS_ACTIVITY));
+        }
+        // Return the slice to change wifi calling preference
+        return getWifiCallingPreferenceSlice(
+                isWifiOnlySupported, wfcMode, sliceUri);
+    }
+
+    /**
+     * Returns actionable wifi calling preference slice.
+     *
+     * @param isWifiOnlySupported adds row for wifi only if this is true
+     * @param currentWfcPref current Preference {@link ImsConfig}
+     * @param sliceUri sliceUri
+     * @return Slice for actionable wifi calling preference settings
+     */
+    private Slice getWifiCallingPreferenceSlice(boolean isWifiOnlySupported,
+            int currentWfcPref,
+            Uri sliceUri) {
+        final IconCompat icon = IconCompat.createWithResource(mContext, R.drawable.wifi_signal);
+        // Top row shows information on current preference state
+        ListBuilder listBuilder = new ListBuilder(mContext, sliceUri, ListBuilder.INFINITY)
+                .setAccentColor(Utils.getColorAccentDefaultColor(mContext));
+        listBuilder.setHeader(new ListBuilder.HeaderBuilder(listBuilder)
+                        .setTitle(mContext.getText(R.string.wifi_calling_mode_title))
+                        .setSubtitle(getWifiCallingPreferenceSummary(currentWfcPref))
+                        .setPrimaryAction(new SliceAction(
+                                getActivityIntent(ACTION_WIFI_CALLING_SETTINGS_ACTIVITY),
+                                icon,
+                                mContext.getText(R.string.wifi_calling_mode_title))));
+
+        if (isWifiOnlySupported) {
+            listBuilder.addRow(wifiPreferenceRowBuilder(listBuilder,
+                    com.android.internal.R.string.wfc_mode_wifi_only_summary,
+                    ACTION_WIFI_CALLING_PREFERENCE_WIFI_ONLY,
+                    currentWfcPref == ImsConfig.WfcModeFeatureValueConstants.WIFI_ONLY));
+        }
+
+        listBuilder.addRow(wifiPreferenceRowBuilder(listBuilder,
+                com.android.internal.R.string.wfc_mode_wifi_preferred_summary,
+                ACTION_WIFI_CALLING_PREFERENCE_WIFI_PREFERRED,
+                currentWfcPref == ImsConfig.WfcModeFeatureValueConstants.WIFI_PREFERRED));
+
+        listBuilder.addRow(wifiPreferenceRowBuilder(listBuilder,
+                com.android.internal.R.string.wfc_mode_cellular_preferred_summary,
+                ACTION_WIFI_CALLING_PREFERENCE_CELLULAR_PREFERRED,
+                currentWfcPref == ImsConfig.WfcModeFeatureValueConstants.CELLULAR_PREFERRED));
+
+        return listBuilder.build();
+    }
+
+    /**
+     * Returns RowBuilder for a new row containing specific wifi calling preference.
+     *
+     * @param listBuilder ListBuilder that will be the parent for this RowBuilder
+     * @param preferenceTitleResId resource Id for the preference row title
+     * @param action action to be added for the row
+     * @return RowBuilder for the row
+     */
+    private RowBuilder wifiPreferenceRowBuilder(ListBuilder listBuilder,
+            int preferenceTitleResId, String action, boolean checked) {
+        final IconCompat icon =
+                IconCompat.createWithResource(mContext, R.drawable.radio_button_check);
+        return new RowBuilder(listBuilder)
+                .setTitle(mContext.getText(preferenceTitleResId))
+                .setTitleItem(new SliceAction(getBroadcastIntent(action),
+                        icon, mContext.getText(preferenceTitleResId), checked));
+    }
+
+
+    /**
+     * Returns the String describing wifi calling preference mentioned in wfcMode
+     *
+     * @param wfcMode ImsConfig constant for the preference {@link ImsConfig}
+     * @return summary/name of the wifi calling preference
+     */
+    private CharSequence getWifiCallingPreferenceSummary(int wfcMode) {
+        switch (wfcMode) {
+            case ImsConfig.WfcModeFeatureValueConstants.WIFI_ONLY:
+                return mContext.getText(
+                        com.android.internal.R.string.wfc_mode_wifi_only_summary);
+            case ImsConfig.WfcModeFeatureValueConstants.WIFI_PREFERRED:
+                return mContext.getText(
+                        com.android.internal.R.string.wfc_mode_wifi_preferred_summary);
+            case ImsConfig.WfcModeFeatureValueConstants.CELLULAR_PREFERRED:
+                return mContext.getText(
+                        com.android.internal.R.string.wfc_mode_cellular_preferred_summary);
+            default:
+                return null;
+        }
+    }
+
     protected ImsManager getImsManager(int subId) {
         return ImsManager.getInstance(mContext, SubscriptionManager.getPhoneId(subId));
     }
 
-    private Integer getWfcMode(ImsManager imsManager)
+    private int getWfcMode(ImsManager imsManager)
             throws InterruptedException, ExecutionException, TimeoutException {
         FutureTask<Integer> wfcModeTask = new FutureTask<>(new Callable<Integer>() {
             @Override
@@ -232,7 +397,7 @@
         if (subId > SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
             final ImsManager imsManager = getImsManager(subId);
             if (imsManager.isWfcEnabledByPlatform()
-                    || imsManager.isWfcProvisionedOnDevice()) {
+                    && imsManager.isWfcProvisionedOnDevice()) {
                 final boolean currentValue = imsManager.isWfcEnabledByUser()
                         && imsManager.isNonTtyOrTtyOnVolteEnabled();
                 final boolean newValue = intent.getBooleanExtra(EXTRA_TOGGLE_STATE,
@@ -255,6 +420,63 @@
     }
 
     /**
+     * Handles wifi calling preference Setting change from wifi calling preference Slice and posts
+     * notification for the change. Should be called when intent action is one of the below
+     * ACTION_WIFI_CALLING_PREFERENCE_WIFI_ONLY
+     * ACTION_WIFI_CALLING_PREFERENCE_WIFI_PREFERRED
+     * ACTION_WIFI_CALLING_PREFERENCE_CELLULAR_PREFERRED
+     *
+     * @param intent intent
+     */
+    public void handleWifiCallingPreferenceChanged(Intent intent) {
+        final int subId = getDefaultVoiceSubId();
+        final int errorValue = -1;
+
+        if (subId > SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            final boolean isWifiCallingPrefEditable = isCarrierConfigManagerKeyEnabled(
+                    CarrierConfigManager.KEY_EDITABLE_WFC_MODE_BOOL, subId,false);
+            final boolean isWifiOnlySupported = isCarrierConfigManagerKeyEnabled(
+                    CarrierConfigManager.KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL, subId, true);
+
+            ImsManager imsManager = getImsManager(subId);
+            if (isWifiCallingPrefEditable
+                    && imsManager.isWfcEnabledByPlatform()
+                    && imsManager.isWfcProvisionedOnDevice()
+                    && imsManager.isWfcEnabledByUser()
+                    && imsManager.isNonTtyOrTtyOnVolteEnabled()) {
+                // Change the preference only when wifi calling is enabled
+                // And when wifi calling preference is editable for the current carrier
+                final int currentValue = imsManager.getWfcMode(false);
+                int newValue = errorValue;
+                switch (intent.getAction()) {
+                    case ACTION_WIFI_CALLING_PREFERENCE_WIFI_ONLY:
+                        if (isWifiOnlySupported) {
+                            // change to wifi_only when wifi_only is enabled.
+                            newValue = ImsConfig.WfcModeFeatureValueConstants.WIFI_ONLY;
+                        }
+                        break;
+                    case ACTION_WIFI_CALLING_PREFERENCE_WIFI_PREFERRED:
+                        newValue = ImsConfig.WfcModeFeatureValueConstants.WIFI_PREFERRED;
+                        break;
+                    case ACTION_WIFI_CALLING_PREFERENCE_CELLULAR_PREFERRED:
+                        newValue = ImsConfig.WfcModeFeatureValueConstants.CELLULAR_PREFERRED;
+                        break;
+                }
+                if (newValue != errorValue && newValue != currentValue) {
+                    // Update the setting only when there is a valid update
+                    imsManager.setWfcMode(newValue, false);
+                }
+            }
+        }
+
+        // notify change in slice in any case to get re-queried. This would result in displaying
+        // appropriate message.
+        final Uri uri = SliceBuilderUtils.getUri(PATH_WIFI_CALLING_PREFERENCE,
+                false /*isPlatformSlice*/);
+        mContext.getContentResolver().notifyChange(uri, null);
+    }
+
+    /**
      * Returns Slice with the title and subtitle provided as arguments with wifi signal Icon.
      *
      * @param title Title of the slice
@@ -262,12 +484,11 @@
      * @param sliceUri slice uri
      * @return Slice with title and subtitle
      */
-    // TODO(b/79548264) asses different scenarios and return null instead of non-actionable slice
-    private Slice getNonActionableWifiCallingSlice(String title, String subtitle, Uri sliceUri,
-            PendingIntent primaryActionIntent) {
+    private Slice getNonActionableWifiCallingSlice(CharSequence title, CharSequence subtitle,
+            Uri sliceUri, PendingIntent primaryActionIntent) {
         final IconCompat icon = IconCompat.createWithResource(mContext, R.drawable.wifi_signal);
         return new ListBuilder(mContext, sliceUri, ListBuilder.INFINITY)
-                .setColor(R.color.material_blue_500)
+                .setAccentColor(Utils.getColorAccentDefaultColor(mContext))
                 .addRow(b -> b
                         .setTitle(title)
                         .setSubtitle(subtitle)
@@ -280,8 +501,8 @@
     /**
      * Returns {@code true} when the key is enabled for the carrier, and {@code false} otherwise.
      */
-    private boolean isCarrierConfigManagerKeyEnabled(Context mContext, String key,
-            int subId, boolean defaultValue) {
+    protected boolean isCarrierConfigManagerKeyEnabled(String key, int subId,
+            boolean defaultValue) {
         final CarrierConfigManager configManager = getCarrierConfigManager(mContext);
         boolean ret = false;
         if (configManager != null) {
@@ -301,9 +522,6 @@
      * Returns the current default voice subId obtained from SubscriptionManager
      */
     protected int getDefaultVoiceSubId() {
-        if (mSubscriptionManager == null) {
-            mSubscriptionManager = mContext.getSystemService(SubscriptionManager.class);
-        }
         return SubscriptionManager.getDefaultVoiceSubscriptionId();
     }
 
@@ -338,9 +556,18 @@
         return intent;
     }
 
+    /**
+     * @return {@link PendingIntent} to the Settings home page.
+     */
+    public static PendingIntent getSettingsIntent(Context context) {
+        final Intent intent = new Intent(Settings.ACTION_SETTINGS);
+        return PendingIntent.getActivity(context, 0 /* requestCode */, intent, 0 /* flags */);
+    }
+
     private PendingIntent getBroadcastIntent(String action) {
         final Intent intent = new Intent(action);
         intent.setClass(mContext, SliceBroadcastReceiver.class);
+        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
         return PendingIntent.getBroadcast(mContext, 0 /* requestCode */, intent,
                 PendingIntent.FLAG_CANCEL_CURRENT);
     }
@@ -353,17 +580,4 @@
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, 0 /* flags */);
     }
-
-    /**
-     * Returns carrier id name of the current Subscription
-     */
-    private String getSimCarrierName() {
-        final TelephonyManager telephonyManager = mContext.getSystemService(TelephonyManager.class);
-        final CharSequence carrierName = telephonyManager.getSimCarrierIdName();
-        if (carrierName == null) {
-            return mContext.getString(R.string.carrier);
-        }
-        return carrierName.toString();
-    }
-
 }
diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
index fda5ce4..d3ea747 100644
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
@@ -406,7 +406,7 @@
         mRssiSignalLevel = signalLevel;
         Drawable wifiIcon = mIconInjector.getIcon(mRssiSignalLevel);
 
-        wifiIcon.setTint(Utils.getColorAccent(mContext));
+        wifiIcon.setTintList(Utils.getColorAccent(mContext));
         mEntityHeaderController.setIcon(wifiIcon).done(mFragment.getActivity(), true /* rebind */);
 
         Drawable wifiIconDark = wifiIcon.getConstantState().newDrawable().mutate();
diff --git a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
index 5bc4d73..465170a 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
@@ -31,7 +31,6 @@
 public class WifiTetherPasswordPreferenceController extends WifiTetherBasePreferenceController
         implements ValidatedEditTextPreference.Validator {
 
-    private static final String TAG = "WifiTetherPswdPref";
     private static final String PREF_KEY = "wifi_tether_network_password";
 
     private String mPassword;
@@ -49,10 +48,11 @@
     @Override
     public void updateDisplay() {
         final WifiConfiguration config = mWifiManager.getWifiApConfiguration();
-        if (config != null) {
-            mPassword = config.preSharedKey;
-        } else {
+        if (config == null || (config.getAuthType() == WifiConfiguration.KeyMgmt.WPA2_PSK
+                && TextUtils.isEmpty(config.preSharedKey))) {
             mPassword = generateRandomPassword();
+        } else {
+            mPassword = config.preSharedKey;
         }
         ((ValidatedEditTextPreference) mPreference).setValidator(this);
         ((ValidatedEditTextPreference) mPreference).setIsPassword(true);
@@ -68,17 +68,27 @@
         return true;
     }
 
-    public String getPassword() {
+    /**
+     * This method returns the current password if it is valid for the indicated security type. If
+     * the password currently set is invalid it will forcefully set a random password that is valid.
+     *
+     * @param securityType The security type for the password.
+     * @return The current password if it is valid for the indicated security type. A new randomly
+     * generated password if it is not.
+     */
+    public String getPasswordValidated(int securityType) {
+        // don't actually overwrite unless we get a new config in case it was accidentally toggled.
+        if (securityType == WifiConfiguration.KeyMgmt.NONE) {
+            return "";
+        } else if (!isTextValid(mPassword)) {
+            mPassword = generateRandomPassword();
+            updatePasswordDisplay((EditTextPreference) mPreference);
+        }
         return mPassword;
     }
 
-    public int getSecuritySettingForPassword() {
-        // We should return NONE when no password is set
-        if (TextUtils.isEmpty(mPassword)) {
-            return WifiConfiguration.KeyMgmt.NONE;
-        }
-        // Only other currently supported type is WPA2 so we'll try that
-        return WifiConfiguration.KeyMgmt.WPA2_PSK;
+    public void updateVisibility(int securityType) {
+        mPreference.setVisible(securityType != WifiConfiguration.KeyMgmt.NONE);
     }
 
     @Override
@@ -98,9 +108,11 @@
         if (!TextUtils.isEmpty(mPassword)) {
             pref.setIsSummaryPassword(true);
             pref.setSummary(mPassword);
+            pref.setVisible(true);
         } else {
             pref.setIsSummaryPassword(false);
             pref.setSummary(R.string.wifi_hotspot_no_password_subtext);
+            pref.setVisible(false);
         }
     }
 }
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java
new file mode 100644
index 0000000..0f08cbb
--- /dev/null
+++ b/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java
@@ -0,0 +1,63 @@
+package com.android.settings.wifi.tether;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.net.wifi.WifiConfiguration;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+
+public class WifiTetherSecurityPreferenceController extends WifiTetherBasePreferenceController {
+
+    private static final String PREF_KEY = "wifi_tether_security";
+
+    private final String[] mSecurityEntries;
+    private int mSecurityValue;
+
+    public WifiTetherSecurityPreferenceController(Context context,
+            OnTetherConfigUpdateListener listener) {
+        super(context, listener);
+        mSecurityEntries = mContext.getResources().getStringArray(R.array.wifi_tether_security);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return PREF_KEY;
+    }
+
+    @Override
+    public void updateDisplay() {
+        final WifiConfiguration config = mWifiManager.getWifiApConfiguration();
+        if (config != null && config.getAuthType() == WifiConfiguration.KeyMgmt.NONE) {
+            mSecurityValue = WifiConfiguration.KeyMgmt.NONE;
+
+        } else {
+            mSecurityValue = WifiConfiguration.KeyMgmt.WPA2_PSK;
+        }
+
+        final ListPreference preference = (ListPreference) mPreference;
+        preference.setSummary(getSummaryForSecurityType(mSecurityValue));
+        preference.setValue(String.valueOf(mSecurityValue));
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        mSecurityValue = Integer.parseInt((String) newValue);
+        preference.setSummary(getSummaryForSecurityType(mSecurityValue));
+        mListener.onTetherConfigUpdated();
+        return true;
+    }
+
+    public int getSecurityType() {
+        return mSecurityValue;
+    }
+
+    private String getSummaryForSecurityType(int securityType) {
+        if (securityType == WifiConfiguration.KeyMgmt.NONE) {
+            return mSecurityEntries[1];
+        }
+        // WPA2 PSK
+        return mSecurityEntries[0];
+    }
+}
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
index 5e202d6..8e2518d 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
@@ -46,7 +46,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.UUID;
 
 @SearchIndexable
 public class WifiTetherSettings extends RestrictedDashboardFragment
@@ -68,6 +67,7 @@
     private WifiTetherSSIDPreferenceController mSSIDPreferenceController;
     private WifiTetherPasswordPreferenceController mPasswordPreferenceController;
     private WifiTetherApBandPreferenceController mApBandPreferenceController;
+    private WifiTetherSecurityPreferenceController mSecurityPreferenceController;
 
     private WifiManager mWifiManager;
     private boolean mRestartWifiApAfterConfigChange;
@@ -142,10 +142,12 @@
     protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
         mSSIDPreferenceController = new WifiTetherSSIDPreferenceController(context, this);
+        mSecurityPreferenceController = new WifiTetherSecurityPreferenceController(context, this);
         mPasswordPreferenceController = new WifiTetherPasswordPreferenceController(context, this);
         mApBandPreferenceController = new WifiTetherApBandPreferenceController(context, this);
 
         controllers.add(mSSIDPreferenceController);
+        controllers.add(mSecurityPreferenceController);
         controllers.add(mPasswordPreferenceController);
         controllers.add(mApBandPreferenceController);
         controllers.add(
@@ -156,6 +158,8 @@
     @Override
     public void onTetherConfigUpdated() {
         final WifiConfiguration config = buildNewConfig();
+        mPasswordPreferenceController.updateVisibility(config.getAuthType());
+
         /**
          * if soft AP is stopped, bring up
          * else restart with new config
@@ -172,11 +176,11 @@
 
     private WifiConfiguration buildNewConfig() {
         final WifiConfiguration config = new WifiConfiguration();
+        final int securityType = mSecurityPreferenceController.getSecurityType();
 
         config.SSID = mSSIDPreferenceController.getSSID();
-        config.preSharedKey = mPasswordPreferenceController.getPassword();
-        config.allowedKeyManagement.set(
-                mPasswordPreferenceController.getSecuritySettingForPassword());
+        config.allowedKeyManagement.set(securityType);
+        config.preSharedKey = mPasswordPreferenceController.getPasswordValidated(securityType);
         config.allowedAuthAlgorithms.set(WifiConfiguration.AuthAlgorithm.OPEN);
         config.apBand = mApBandPreferenceController.getBandIndex();
         return config;
@@ -190,6 +194,8 @@
     private void updateDisplayWithNewConfig() {
         use(WifiTetherSSIDPreferenceController.class)
                 .updateDisplay();
+        use(WifiTetherSecurityPreferenceController.class)
+                .updateDisplay();
         use(WifiTetherPasswordPreferenceController.class)
                 .updateDisplay();
         use(WifiTetherApBandPreferenceController.class)
diff --git a/src/com/android/settings/wrapper/OverlayManagerWrapper.java b/src/com/android/settings/wrapper/OverlayManagerWrapper.java
deleted file mode 100644
index 6e3c234..0000000
--- a/src/com/android/settings/wrapper/OverlayManagerWrapper.java
+++ /dev/null
@@ -1,102 +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.wrapper;
-
-import android.content.Context;
-import android.content.om.IOverlayManager;
-import android.content.om.OverlayInfo;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class OverlayManagerWrapper {
-
-    private final IOverlayManager mOverlayManager;
-
-    public OverlayManagerWrapper(IOverlayManager overlayManager) {
-        mOverlayManager = overlayManager;
-    }
-
-    public OverlayManagerWrapper() {
-        this(IOverlayManager.Stub.asInterface(ServiceManager.getService(Context.OVERLAY_SERVICE)));
-    }
-
-    public List<OverlayInfo> getOverlayInfosForTarget(String overlay, int userId) {
-        if (mOverlayManager == null) {
-            return new ArrayList<>();
-        }
-        try {
-            List<android.content.om.OverlayInfo> infos
-                    = mOverlayManager.getOverlayInfosForTarget(overlay, userId);
-            ArrayList<OverlayInfo> result = new ArrayList<>(infos.size());
-            for (int i = 0; i < infos.size(); i++) {
-                result.add(new OverlayInfo(infos.get(i)));
-            }
-            return result;
-        } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
-        }
-    }
-
-    public boolean setEnabled(String overlay, boolean enabled, int userId) {
-        if (mOverlayManager == null) {
-            return false;
-        }
-        try {
-            return mOverlayManager.setEnabled(overlay, enabled, userId);
-        } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
-        }
-    }
-
-    public boolean setEnabledExclusiveInCategory(String overlay, int userId) {
-        if (mOverlayManager == null) {
-            return false;
-        }
-        try {
-            return mOverlayManager.setEnabledExclusiveInCategory(overlay, userId);
-        } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
-        }
-    }
-
-    public static class OverlayInfo {
-
-        public static final String CATEGORY_THEME = android.content.om.OverlayInfo.CATEGORY_THEME;
-        public final String packageName;
-        public final String category;
-        private final boolean mEnabled;
-
-        public OverlayInfo(String packageName, String category, boolean enabled) {
-            this.packageName = packageName;
-            this.category = category;
-            mEnabled = enabled;
-        }
-
-        public OverlayInfo(android.content.om.OverlayInfo info) {
-            mEnabled = info.isEnabled();
-            category = info.category;
-            packageName = info.packageName;
-        }
-
-        public boolean isEnabled() {
-            return mEnabled;
-        }
-    }
-}
diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk
index ba3d086..ff0ddb1 100644
--- a/tests/robotests/Android.mk
+++ b/tests/robotests/Android.mk
@@ -6,7 +6,8 @@
 
 LOCAL_MODULE := SettingsRoboTests
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := $(call all-java-files-under, src) \
+    $(call all-java-files-under, ../../../../../frameworks/base/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils)
 
 LOCAL_JAVA_RESOURCE_DIRS := config
 
diff --git a/tests/robotests/assets/grandfather_not_implementing_indexable b/tests/robotests/assets/grandfather_not_implementing_indexable
index 442df76..393fe61 100644
--- a/tests/robotests/assets/grandfather_not_implementing_indexable
+++ b/tests/robotests/assets/grandfather_not_implementing_indexable
@@ -13,7 +13,6 @@
 com.android.settings.datausage.DataSaverSummary
 com.android.settings.datausage.AppDataUsage
 com.android.settings.accessibility.FontSizePreferenceFragmentForSetupWizard
-com.android.settings.applications.ManageDomainUrls
 com.android.settings.applications.appinfo.WriteSettingsDetails
 com.android.settings.applications.ProcessStatsSummary
 com.android.settings.users.RestrictedProfileSettings
diff --git a/tests/robotests/res/values-mcc999/config.xml b/tests/robotests/res/values-mcc999/config.xml
index cecc9c5..72f5134 100644
--- a/tests/robotests/res/values-mcc999/config.xml
+++ b/tests/robotests/res/values-mcc999/config.xml
@@ -23,7 +23,7 @@
     <bool name="config_additional_system_update_setting_enable">true</bool>
     <bool name="config_show_wifi_settings">false</bool>
     <bool name="config_show_toggle_airplane">false</bool>
-    <bool name="config_show_app_info_settings_memory">false</bool>
+    <bool name="config_show_app_info_settings_memory">true</bool>
     <bool name="config_show_app_info_settings_battery">false</bool>
     <bool name="config_show_high_power_apps">false</bool>
     <bool name="config_show_alarm_volume">false</bool>
diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java
index 4cab028..98b1770 100644
--- a/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java
@@ -114,4 +114,19 @@
                 Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, -1))
                 .isEqualTo(OFF);
     }
+
+    @Test
+    public void isSliceableCorrectKey_returnsTrue() {
+        final MagnificationGesturesPreferenceController controller =
+                new MagnificationGesturesPreferenceController(mContext,
+                        "screen_magnification_gestures_preference_screen");
+        assertThat(controller.isSliceable()).isTrue();
+    }
+
+    @Test
+    public void isSliceableIncorrectKey_returnsFalse() {
+        final MagnificationGesturesPreferenceController controller =
+                new MagnificationGesturesPreferenceController(mContext, "bad_key");
+        assertThat(controller.isSliceable()).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java
index d0d7771..128e33b 100644
--- a/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java
@@ -158,4 +158,19 @@
             sIsApplicable = applicable;
         }
     }
+
+    @Test
+    public void isSliceableCorrectKey_returnsTrue() {
+        final MagnificationNavbarPreferenceController controller =
+                new MagnificationNavbarPreferenceController(mContext,
+                        "screen_magnification_navbar_preference_screen");
+        assertThat(controller.isSliceable()).isTrue();
+    }
+
+    @Test
+    public void isSliceableIncorrectKey_returnsFalse() {
+        final MagnificationNavbarPreferenceController controller =
+                new MagnificationNavbarPreferenceController(mContext, "bad_key");
+        assertThat(controller.isSliceable()).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java
index 2a166f3..dda2ae5 100644
--- a/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java
@@ -18,10 +18,12 @@
 
 import static android.provider.Settings.System.NOTIFICATION_VIBRATION_INTENSITY;
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 import androidx.lifecycle.LifecycleOwner;
 import android.content.Context;
+import android.content.res.Resources;
 import android.os.Vibrator;
 import android.provider.Settings;
 import androidx.preference.Preference;
@@ -48,6 +50,7 @@
     private LifecycleOwner mLifecycleOwner;
     private Lifecycle mLifecycle;
     private Context mContext;
+    private Resources mResources;
     private NotificationVibrationIntensityPreferenceController mController;
     private Preference mPreference;
 
@@ -56,7 +59,11 @@
         MockitoAnnotations.initMocks(this);
         mLifecycleOwner = () -> mLifecycle;
         mLifecycle = new Lifecycle(mLifecycleOwner);
-        mContext = RuntimeEnvironment.application;
+        mContext = spy(RuntimeEnvironment.application);
+        mResources = spy(mContext.getResources());
+        when(mContext.getResources()).thenReturn(mResources);
+        when(mResources.getBoolean(R.bool.config_vibration_supports_multiple_intensities))
+            .thenReturn(true);
         mController = new NotificationVibrationIntensityPreferenceController(mContext) {
             @Override
             protected int getDefaultIntensity() {
@@ -68,7 +75,6 @@
         mPreference.setSummary("Test");
         when(mScreen.findPreference(mController.getPreferenceKey()))
                 .thenReturn(mPreference);
-        mController.displayPreference(mScreen);
     }
 
     @Test
@@ -80,7 +86,10 @@
     }
 
     @Test
-    public void updateState_shouldRefreshSummary() {
+    public void updateState_withMultipleIntensitySuport_shouldRefreshSummary() {
+        setSupportsMultipleIntensities(true);
+        showPreference();
+
         Settings.System.putInt(mContext.getContentResolver(),
                 NOTIFICATION_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_LOW);
         mController.updateState(mPreference);
@@ -105,4 +114,43 @@
         assertThat(mPreference.getSummary())
                 .isEqualTo(mContext.getString(R.string.accessibility_vibration_intensity_off));
     }
+
+    @Test
+    public void updateState_withoutMultipleIntensitySupport_shouldRefreshSummary() {
+        setSupportsMultipleIntensities(false);
+        showPreference();
+
+        Settings.System.putInt(mContext.getContentResolver(),
+                NOTIFICATION_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_LOW);
+        mController.updateState(mPreference);
+        assertThat(mPreference.getSummary())
+                .isEqualTo(mContext.getString(R.string.switch_on_text));
+
+        Settings.System.putInt(mContext.getContentResolver(),
+                NOTIFICATION_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_HIGH);
+        mController.updateState(mPreference);
+        assertThat(mPreference.getSummary())
+                .isEqualTo(mContext.getString(R.string.switch_on_text));
+
+        Settings.System.putInt(mContext.getContentResolver(),
+                NOTIFICATION_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_MEDIUM);
+        mController.updateState(mPreference);
+        assertThat(mPreference.getSummary())
+                .isEqualTo(mContext.getString(R.string.switch_on_text));
+
+        Settings.System.putInt(mContext.getContentResolver(),
+                NOTIFICATION_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_OFF);
+        mController.updateState(mPreference);
+        assertThat(mPreference.getSummary())
+                .isEqualTo(mContext.getString(R.string.switch_off_text));
+    }
+
+    private void setSupportsMultipleIntensities(boolean hasSupport) {
+        when(mResources.getBoolean(R.bool.config_vibration_supports_multiple_intensities))
+            .thenReturn(hasSupport);
+    }
+
+    private void showPreference() {
+        mController.displayPreference(mScreen);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java
index 8550cf9..ecd2ff9 100644
--- a/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java
@@ -20,16 +20,19 @@
 import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY_INTENSITY_LOW;
 import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY_INTENSITY_MEDIUM;
 import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY_INTENSITY_OFF;
+import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY_INTENSITY_ON;
 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.when;
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.res.Resources;
 import android.os.UserManager;
 import android.os.Vibrator;
 import android.provider.Settings;
 
+import com.android.settings.R;
 import com.android.settings.accessibility.VibrationPreferenceFragment.VibrationIntensityCandidateInfo;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -58,12 +61,11 @@
         INTENSITY_TO_KEY.put(Vibrator.VIBRATION_INTENSITY_HIGH, KEY_INTENSITY_HIGH);
     }
 
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Activity mActivity;
     @Mock
     private UserManager mUserManager;
 
     private Context mContext;
+    private Resources mResources;
     private TestVibrationPreferenceFragment mFragment;
 
     @Before
@@ -71,16 +73,18 @@
         MockitoAnnotations.initMocks(this);
         FakeFeatureFactory.setupForTest();
 
-        mContext = RuntimeEnvironment.application;
+        mContext = spy(RuntimeEnvironment.application);
+        mResources = spy(mContext.getResources());
+        when(mContext.getResources()).thenReturn(mResources);
 
         mFragment = spy(new TestVibrationPreferenceFragment());
-        doReturn(mUserManager).when(mActivity).getSystemService(Context.USER_SERVICE);
-        doReturn(mContext).when(mFragment).getContext();
-        mFragment.onAttach(mActivity);
+        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
     }
 
     @Test
     public void changeIntensitySetting_shouldResultInCorrespondingKey() {
+        setSupportsMultipleIntensities(true);
+        mFragment.onAttach(mContext);
         for (Map.Entry<Integer, String> entry : INTENSITY_TO_KEY.entrySet()) {
             Settings.System.putInt(mContext.getContentResolver(),
                     Settings.System.HAPTIC_FEEDBACK_INTENSITY, entry.getKey());
@@ -89,12 +93,37 @@
     }
 
     @Test
+    public void changeIntensitySetting_WithoutMultipleIntensitySupport_shouldResultInOn() {
+        setSupportsMultipleIntensities(false);
+        mFragment.onAttach(mContext);
+        for (int intensity : INTENSITY_TO_KEY.keySet()) {
+            Settings.System.putInt(mContext.getContentResolver(),
+                    Settings.System.HAPTIC_FEEDBACK_INTENSITY, intensity);
+            final String expectedKey = intensity == Vibrator.VIBRATION_INTENSITY_OFF
+                    ? KEY_INTENSITY_OFF
+                    : KEY_INTENSITY_ON;
+            assertThat(mFragment.getDefaultKey()).isEqualTo(expectedKey);
+        }
+    }
+
+    @Test
     public void initialDefaultKey_shouldBeMedium() {
+        setSupportsMultipleIntensities(true);
+        mFragment.onAttach(mContext);
         assertThat(mFragment.getDefaultKey()).isEqualTo(KEY_INTENSITY_MEDIUM);
     }
 
     @Test
+    public void initialDefaultKey_WithoutMultipleIntensitySupport_shouldBeOn() {
+        setSupportsMultipleIntensities(false);
+        mFragment.onAttach(mContext);
+        assertThat(mFragment.getDefaultKey()).isEqualTo(KEY_INTENSITY_ON);
+    }
+
+    @Test
     public void candidates_shouldBeSortedByIntensity() {
+        setSupportsMultipleIntensities(true);
+        mFragment.onAttach(mContext);
         final List<? extends CandidateInfo> candidates = mFragment.getCandidates();
         assertThat(candidates.size()).isEqualTo(INTENSITY_TO_KEY.size());
         VibrationIntensityCandidateInfo prevCandidate =
@@ -106,6 +135,11 @@
         }
     }
 
+    private void setSupportsMultipleIntensities(boolean hasSupport) {
+        when(mResources.getBoolean(R.bool.config_vibration_supports_multiple_intensities))
+            .thenReturn(hasSupport);
+    }
+
     private class TestVibrationPreferenceFragment extends VibrationPreferenceFragment {
         @Override
         protected int getPreferenceScreenResId() {
@@ -129,5 +163,10 @@
         protected int getDefaultVibrationIntensity() {
             return Vibrator.VIBRATION_INTENSITY_MEDIUM;
         }
+
+        @Override
+        public Context getContext() {
+            return mContext;
+        }
     }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
index 680dc07..89cf6a0 100644
--- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
@@ -20,6 +20,7 @@
 import static org.mockito.Mockito.when;
 
 import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
@@ -34,17 +35,23 @@
 
 import com.android.settings.testutils.ApplicationTestUtils;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.testutils.shadow.ShadowDefaultDialerManager;
+import com.android.settingslib.testutils.shadow.ShadowSmsApplication;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.util.ReflectionHelpers;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Tests for {@link ApplicationFeatureProviderImpl}.
@@ -246,8 +253,18 @@
     }
 
     @Test
-    public void getKeepEnabledPackages_shouldContainNothing() {
-        assertThat(mProvider.getKeepEnabledPackages()).isEmpty();
+    @Config(shadows = {ShadowSmsApplication.class, ShadowDefaultDialerManager.class})
+    public void getKeepEnabledPackages_shouldContainDefaultPhoneAndSms() {
+        final String testDialer = "com.android.test.defaultdialer";
+        final String testSms = "com.android.test.defaultsms";
+        ShadowSmsApplication.setDefaultSmsApplication(new ComponentName(testSms, "receiver"));
+        ShadowDefaultDialerManager.setDefaultDialerApplication(testDialer);
+        ReflectionHelpers.setField(mProvider, "mContext", RuntimeEnvironment.application);
+
+        final Set<String> keepEnabledPackages = mProvider.getKeepEnabledPackages();
+
+        final List<String> expectedPackages = Arrays.asList(testDialer, testSms);
+        assertThat(keepEnabledPackages).containsExactlyElementsIn(expectedPackages);
     }
 
     private void setUpUsersAndInstalledApps() {
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java
index 1c0d897..cd53f8b 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java
@@ -76,6 +76,7 @@
     }
 
     @Test
+    @Config(qualifiers = "mcc999")
     public void getAvailabilityStatus_developmentSettingsEnabled_shouldReturnAvailable() {
         Settings.Global.putInt(mContext.getContentResolver(),
                 Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
@@ -85,7 +86,6 @@
     }
 
     @Test
-    @Config(qualifiers = "mcc999")
     public void getAvailabilityStatus_devSettingsEnabled_butNotVisible_shouldReturnUnsupported() {
         Settings.Global.putInt(mContext.getContentResolver(),
                 Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
@@ -95,7 +95,6 @@
     }
 
     @Test
-    @Config(qualifiers = "mcc999")
     public void getAvailabilityStatus_devSettingsDisabled_butNotVisible_shouldReturnUnsupported() {
         Settings.Global.putInt(mContext.getContentResolver(),
                 Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0);
@@ -105,6 +104,7 @@
     }
 
     @Test
+    @Config(qualifiers = "mcc999")
     public void getAvailabilityStatus_developmentSettingsDisabled_shouldReturnDisabled() {
         Settings.Global.putInt(mContext.getContentResolver(),
                 Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0);
diff --git a/tests/robotests/src/com/android/settings/applications/ManageDomainUrlsTest.java b/tests/robotests/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceControllerTest.java
similarity index 64%
rename from tests/robotests/src/com/android/settings/applications/ManageDomainUrlsTest.java
rename to tests/robotests/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceControllerTest.java
index 217a352..2baacda 100644
--- a/tests/robotests/src/com/android/settings/applications/ManageDomainUrlsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceControllerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 The Android Open Source Project
+ * 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.applications;
+package com.android.settings.applications.managedomainurls;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.mock;
@@ -23,10 +23,9 @@
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
-import android.graphics.drawable.Drawable;
+import android.util.IconDrawableFactory;
 import android.view.View;
 import android.widget.ProgressBar;
-import androidx.preference.PreferenceViewHolder;
 
 import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -35,40 +34,39 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
-public class ManageDomainUrlsTest {
+import java.util.UUID;
 
-    @Mock
+import androidx.preference.PreferenceViewHolder;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class DomainAppPreferenceControllerTest {
+
     private ApplicationsState.AppEntry mAppEntry;
     private Context mContext;
+    private IconDrawableFactory mIconDrawableFactory;
 
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
+        mIconDrawableFactory = IconDrawableFactory.newInstance(mContext);
+        mAppEntry = new ApplicationsState.AppEntry(
+                mContext, createApplicationInfo(mContext.getPackageName()), 0);
     }
 
     @Test
-    public void domainAppPreferenceShouldUseAppPreferenceLayout() {
-        mAppEntry.info = new ApplicationInfo();
-        mAppEntry.info.packageName = "com.android.settings.test";
-        final ManageDomainUrls.DomainAppPreference pref =
-                new ManageDomainUrls.DomainAppPreference(mContext, null, mAppEntry);
+    public void getLayoutResource_shouldUseAppPreferenceLayout() {
+        final DomainAppPreference pref = new DomainAppPreference(
+                mContext, mIconDrawableFactory, mAppEntry);
 
         assertThat(pref.getLayoutResource()).isEqualTo(R.layout.preference_app);
     }
 
     @Test
     public void onBindViewHolder_shouldSetAppendixViewToGone() {
-        mAppEntry.info = new ApplicationInfo();
-        mAppEntry.info.packageName = "com.android.settings.test";
-        mAppEntry.icon = mock(Drawable.class);
-        final ManageDomainUrls.DomainAppPreference pref =
-            new ManageDomainUrls.DomainAppPreference(mContext, null, mAppEntry);
+        final DomainAppPreference pref = new DomainAppPreference(
+                mContext, mIconDrawableFactory, mAppEntry);
         final View holderView = mock(View.class);
         final View appendixView = mock(View.class);
         when(holderView.findViewById(R.id.summary_container)).thenReturn(mock(View.class));
@@ -79,4 +77,13 @@
 
         verify(appendixView).setVisibility(View.GONE);
     }
+
+    private ApplicationInfo createApplicationInfo(String packageName) {
+        ApplicationInfo appInfo = new ApplicationInfo();
+        appInfo.sourceDir = "foo";
+        appInfo.flags |= ApplicationInfo.FLAG_INSTALLED;
+        appInfo.storageUuid = UUID.randomUUID();
+        appInfo.packageName = packageName;
+        return appInfo;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceControllerTest.java
new file mode 100644
index 0000000..fc789bf
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceControllerTest.java
@@ -0,0 +1,97 @@
+/*
+ * 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.applications.managedomainurls;
+
+import static android.provider.Settings.Global.ENABLE_EPHEMERAL_FEATURE;
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.provider.Settings;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class InstantAppAccountPreferenceControllerTest {
+
+    private static final String PREF_KEY = "instant_app_account_pref";
+
+    @Mock
+    private ComponentName mComponentName;
+    @Mock
+    private PackageManager mPackageManager;
+
+    private Context mContext;
+    private ContentResolver mContentResolver;
+    private int mEnableEphemeralFeature;
+    private InstantAppAccountPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        mContentResolver = mContext.getContentResolver();
+        mEnableEphemeralFeature = Settings.Secure.getInt(mContentResolver,
+                ENABLE_EPHEMERAL_FEATURE, 1);
+    }
+
+    @After
+    public void tearDown() {
+        Settings.Secure.putInt(mContentResolver, ENABLE_EPHEMERAL_FEATURE,
+                mEnableEphemeralFeature);
+    }
+
+    @Test
+    public void testGetAvailabilityStatus_nullAppSettingsComponent() {
+        when(mPackageManager.getInstantAppResolverSettingsComponent()).thenReturn(null);
+        mController = new InstantAppAccountPreferenceController(mContext, PREF_KEY);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void testGetAvailabilityStatus_enableWebActiions() {
+        when(mPackageManager.getInstantAppResolverSettingsComponent()).thenReturn(mComponentName);
+        mController = new InstantAppAccountPreferenceController(mContext, PREF_KEY);
+        Settings.Secure.putInt(mContentResolver, ENABLE_EPHEMERAL_FEATURE, 1);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void testGetAvailabilityStatus_disableWebActions() {
+        when(mPackageManager.getInstantAppResolverSettingsComponent()).thenReturn(mComponentName);
+        mController = new InstantAppAccountPreferenceController(mContext, PREF_KEY);
+        Settings.Secure.putInt(mContentResolver, ENABLE_EPHEMERAL_FEATURE, 0);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceControllerTest.java
new file mode 100644
index 0000000..8d1b584
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceControllerTest.java
@@ -0,0 +1,96 @@
+/*
+ * 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.applications.managedomainurls;
+
+import static android.provider.Settings.Global.ENABLE_EPHEMERAL_FEATURE;
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.spy;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+import androidx.preference.SwitchPreference;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class InstantAppWebActionPreferenceControllerTest {
+    private static final String PREF_KEY = "instant_app_web_action_toggle";
+    private static final String KEY_INSTANT_APPS_ENABLED = Settings.Secure.INSTANT_APPS_ENABLED;
+
+    private Context mContext;
+    private ContentResolver mContentResolver;
+    private int mEnableEphemeralFeature;
+    private InstantAppWebActionPreferenceController mController;
+    private SwitchPreference mSwitchPreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        mContentResolver = mContext.getContentResolver();
+        mController = new InstantAppWebActionPreferenceController(mContext, PREF_KEY);
+        mSwitchPreference = new SwitchPreference(mContext);
+        mEnableEphemeralFeature = Settings.Secure.getInt(mContentResolver,
+                ENABLE_EPHEMERAL_FEATURE, 1);
+    }
+
+    @After
+    public void tearDown() {
+        Settings.Secure.putInt(mContentResolver, ENABLE_EPHEMERAL_FEATURE,
+                mEnableEphemeralFeature);
+    }
+
+    @Test
+    public void testGetAvailabilityStatus_enableWebActions() {
+        Settings.Secure.putInt(mContentResolver, ENABLE_EPHEMERAL_FEATURE, 1);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void testGetAvailabilityStatus_disableWebActions() {
+        Settings.Secure.putInt(mContentResolver, ENABLE_EPHEMERAL_FEATURE, 0);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void onPreferenceChange_enable() {
+        mController.onPreferenceChange(mSwitchPreference, true);
+
+        assertThat(Settings.Secure.getInt(mContentResolver, KEY_INSTANT_APPS_ENABLED, -1))
+                .isEqualTo(1);
+    }
+
+    @Test
+    public void onPreferenceChange_disable() {
+        mController.onPreferenceChange(mSwitchPreference, false);
+
+        assertThat(Settings.Secure.getInt(mContentResolver, KEY_INSTANT_APPS_ENABLED, -1))
+                .isEqualTo(0);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java
index ecbd826..a15d26c 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java
@@ -70,7 +70,7 @@
 
     @Test
     public void testUpdateDeviceName_showSummaryWithDeviceName() {
-        mController.updateDeviceName(mPreference);
+        mController.updatePreferenceState(mPreference);
 
         final CharSequence summary = mPreference.getSummary();
 
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java
index 63c83b4..3ce585a 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java
@@ -71,11 +71,13 @@
                 PREF_KEY));
         mController.setFragment(mFragment);
         doReturn(DEVICE_NAME).when(mController).getDeviceName();
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
     }
 
     @Test
     public void testUpdateDeviceName_showSummaryWithDeviceName() {
-        mController.updateDeviceName(mPreference);
+        mController.updatePreferenceState(mPreference);
 
         final CharSequence summary = mPreference.getSummary();
 
@@ -94,10 +96,24 @@
 
     @Test
     public void displayPreference_shouldFindPreferenceWithMatchingPrefKey() {
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-
-        mController.displayPreference(mScreen);
-
         assertThat(mController.mPreference.getKey()).isEqualTo(mController.getPreferenceKey());
     }
+
+    @Test
+    public void updatePreferenceState_whenBTisOnPreferenceShouldBeVisible() {
+        when(mLocalAdapter.isEnabled()).thenReturn(true);
+
+        mController.updatePreferenceState(mPreference);
+
+        assertThat(mPreference.isVisible()).isTrue();
+    }
+
+    @Test
+    public void updatePreferenceState_whenBTisOffPreferenceShouldBeHide() {
+        when(mLocalAdapter.isEnabled()).thenReturn(false);
+
+        mController.updatePreferenceState(mPreference);
+
+        assertThat(mPreference.isVisible()).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java
index 3060734..7dcf76c 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java
@@ -192,4 +192,13 @@
         // Verify that clean up only happen once at initialization
         verify(mAvailableDevicesCategory, times(1)).removeAll();
     }
+
+    @Test
+    public void onBluetoothStateChanged_whenTurnedOnBTShowToast() {
+        doNothing().when(mFragment).updateContent(anyInt());
+
+        mFragment.onBluetoothStateChanged(BluetoothAdapter.STATE_ON);
+
+        verify(mFragment).showBluetoothTurnedOnToast();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java
new file mode 100644
index 0000000..20bab87
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java
@@ -0,0 +1,105 @@
+/*
+ * 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.bluetooth;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SliceTester;
+import com.android.settings.testutils.shadow.ShadowLocalBluetoothAdapter;
+import com.android.settings.testutils.shadow.ShadowLocalBluetoothProfileManager;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+
+import android.content.Intent;
+import android.content.res.Resources;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.SliceMetadata;
+import androidx.slice.SliceProvider;
+import androidx.slice.core.SliceAction;
+import androidx.slice.widget.SliceLiveData;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = {ShadowLocalBluetoothAdapter.class, ShadowLocalBluetoothProfileManager.class})
+public class BluetoothSliceBuilderTest {
+
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+
+        // Prevent crash in SliceMetadata.
+        Resources resources = spy(mContext.getResources());
+        doReturn(60).when(resources).getDimensionPixelSize(anyInt());
+        doReturn(resources).when(mContext).getResources();
+
+        // Set-up specs for SliceMetadata.
+        SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
+    }
+
+    @Test
+    public void getBluetoothSlice_correctSliceContent() {
+        final Slice BluetoothSlice = BluetoothSliceBuilder.getSlice(mContext);
+        final SliceMetadata metadata = SliceMetadata.from(mContext, BluetoothSlice);
+
+        final List<SliceAction> toggles = metadata.getToggles();
+        assertThat(toggles).hasSize(1);
+
+        final SliceAction primaryAction = metadata.getPrimaryAction();
+        final IconCompat expectedToggleIcon = IconCompat.createWithResource(mContext,
+                R.drawable.ic_settings_bluetooth);
+        assertThat(primaryAction.getIcon().toString()).isEqualTo(expectedToggleIcon.toString());
+
+        final List<SliceItem> sliceItems = BluetoothSlice.getItems();
+        SliceTester.assertTitle(sliceItems, mContext.getString(R.string.bluetooth_settings_title));
+    }
+
+    @Test
+    public void handleUriChange_updatesBluetooth() {
+        final LocalBluetoothAdapter adapter = LocalBluetoothManager.getInstance(mContext,
+                null /* callback */).getBluetoothAdapter();
+        final Intent intent = new Intent();
+        intent.putExtra(android.app.slice.Slice.EXTRA_TOGGLE_STATE, true);
+        adapter.setBluetoothEnabled(false /* enabled */);
+
+        BluetoothSliceBuilder.handleUriChange(mContext, intent);
+
+        assertThat(adapter.isEnabled()).isTrue();
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java
new file mode 100644
index 0000000..ce55802
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright 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.connecteddevice;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+import com.android.settings.R;
+import com.android.settings.nfc.NfcPreferenceController;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowNfcAdapter;
+import org.robolectric.util.ReflectionHelpers;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.robolectric.Shadows.shadowOf;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = ShadowNfcAdapter.class)
+public class AdvancedConnectedDeviceControllerTest {
+
+    private static final String KEY = "test_key";
+    private static final String DRIVING_MODE_SETTINGS_ENABLED =
+            "gearhead:driving_mode_settings_enabled";
+
+    private Context mContext;
+    private NfcPreferenceController mNfcController;
+    private ShadowNfcAdapter mShadowNfcAdapter;
+    private ContentResolver mContentResolver;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(RuntimeEnvironment.application);
+        mContentResolver = mContext.getContentResolver();
+        mNfcController = new NfcPreferenceController(mContext,
+                NfcPreferenceController.KEY_TOGGLE_NFC);
+        mShadowNfcAdapter = shadowOf(ShadowNfcAdapter.getNfcAdapter(mContext));
+    }
+
+    @Test
+    public void getAvailabilityStatus_returnStatusIsAvailable() {
+        AdvancedConnectedDeviceController controller =
+                new AdvancedConnectedDeviceController(mContext, KEY);
+
+        assertThat(controller.getAvailabilityStatus()).isEqualTo(
+                AVAILABLE);
+    }
+
+    @Test
+    public void isDrivingModeAvailable_returnTrue() {
+        Settings.System.putInt(mContentResolver, DRIVING_MODE_SETTINGS_ENABLED, 1);
+
+        assertThat(AdvancedConnectedDeviceController.isDrivingModeAvailable(mContext)).isTrue();
+    }
+
+    @Test
+    public void isDrivingModeAvailable_returnFalse() {
+        Settings.System.putInt(mContentResolver, DRIVING_MODE_SETTINGS_ENABLED, 0);
+
+        assertThat(AdvancedConnectedDeviceController.isDrivingModeAvailable(mContext)).isFalse();
+    }
+
+    @Test
+    public void getConnectedDevicesSummaryResourceId_NFCAndDrivingModeAvailable() {
+        // NFC available, driving mode available
+        mShadowNfcAdapter.setEnabled(true);
+        assertThat(AdvancedConnectedDeviceController
+                .getConnectedDevicesSummaryResourceId(mNfcController, true))
+                .isEqualTo(R.string.connected_devices_dashboard_summary);
+    }
+
+    @Test
+    public void getConnectedDevicesSummaryResourceId_NFCAvailableAndDrivingModeNotAvailable() {
+        // NFC is available, driving mode not available
+        mShadowNfcAdapter.setEnabled(true);
+        assertThat(AdvancedConnectedDeviceController
+                .getConnectedDevicesSummaryResourceId(mNfcController, false))
+                .isEqualTo(R.string.connected_devices_dashboard_no_driving_mode_summary);
+    }
+
+    @Test
+    public void getConnectedDevicesSummaryResourceId_NFCNotAvailableDrivingModeAvailable() {
+        // NFC not available, driving mode available
+        ReflectionHelpers.setField(mNfcController, "mNfcAdapter", null);
+        assertThat(AdvancedConnectedDeviceController
+                .getConnectedDevicesSummaryResourceId(mNfcController, true))
+                .isEqualTo(R.string.connected_devices_dashboard_no_nfc_summary);
+    }
+
+    @Test
+    public void getConnectedDevicesSummaryResourceId_NFCAndDrivingModeNotAvailable() {
+        // NFC not available, driving mode not available
+        ReflectionHelpers.setField(mNfcController, "mNfcAdapter", null);
+        assertThat(AdvancedConnectedDeviceController
+                .getConnectedDevicesSummaryResourceId(mNfcController, false))
+                .isEqualTo(R.string.connected_devices_dashboard_no_driving_mode_no_nfc_summary);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java
index 2e2dd9d..1b78f12 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java
@@ -67,4 +67,13 @@
     public void testGetCategoryKey_returnCategoryDevice() {
         assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_DEVICE);
     }
+
+    @Test
+    public void testSearchIndexProvider_correctNonIndexables() {
+        final List<String> niks =
+                AdvancedConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
+                        .getNonIndexableKeys(RuntimeEnvironment.application);
+
+        assertThat(niks).contains(AdvancedConnectedDeviceDashboardFragment.KEY_BLUETOOTH);
+    }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java
new file mode 100644
index 0000000..44b7b8f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java
@@ -0,0 +1,60 @@
+/*
+ * 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.connecteddevice;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settings.search.SearchIndexableRaw;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class BluetoothDashboardFragmentTest {
+
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+    }
+
+    @Test
+    public void rawData_includesFragmentResult() {
+        final List<SearchIndexableRaw> rawList =
+                BluetoothDashboardFragment.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext,
+                        true /* enabled */);
+
+        final SearchIndexableRaw fragmentResult = rawList.stream().filter(
+                raw -> TextUtils.equals(raw.title,
+                        mContext.getString(R.string.bluetooth_settings))).findFirst().get();
+
+
+        assertThat(fragmentResult).isNotNull();
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
index 9064179..eecbca5 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
@@ -30,8 +30,8 @@
 import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
-import com.android.settings.nfc.NfcPreferenceController;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
 import com.android.settings.testutils.shadow.ShadowBluetoothPan;
 import com.android.settings.testutils.shadow.ShadowConnectivityManager;
 import com.android.settings.testutils.shadow.ShadowUserManager;
@@ -48,7 +48,7 @@
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(shadows = {ShadowBluetoothPan.class, ShadowUserManager.class,
-        ShadowConnectivityManager.class})
+        ShadowConnectivityManager.class, ShadowBluetoothAdapter.class})
 public class ConnectedDeviceDashboardFragmentTest {
     @Mock
     private PackageManager mPackageManager;
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java
new file mode 100644
index 0000000..978db98
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright 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.connecteddevice;
+
+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 static org.mockito.Mockito.when;
+
+import android.bluetooth.BluetoothAdapter;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.text.BidiFormatter;
+import android.text.TextUtils;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.bluetooth.AlwaysDiscoverable;
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
+import com.android.settings.testutils.shadow.ShadowBluetoothPan;
+import com.android.settings.testutils.shadow.ShadowLocalBluetoothAdapter;
+import com.android.settingslib.widget.FooterPreference;
+import com.android.settingslib.widget.FooterPreferenceMixin;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = {ShadowBluetoothPan.class, ShadowBluetoothAdapter.class,
+        ShadowLocalBluetoothAdapter.class})
+public class DiscoverableFooterPreferenceControllerTest {
+    private static final String DEVICE_NAME = "device name";
+    private static final String KEY = "discoverable_footer_preference";
+
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private FooterPreferenceMixin mFooterPreferenceMixin;
+    @Mock
+    private AlwaysDiscoverable mAlwaysDiscoverable;
+
+    private Context mContext;
+    private FooterPreference mPreference;
+    private DiscoverableFooterPreferenceController mDiscoverableFooterPreferenceController;
+    private BroadcastReceiver mBluetoothChangedReceiver;
+    private ShadowApplication mShadowApplication;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mShadowApplication = Shadows.shadowOf(RuntimeEnvironment.application);
+        mContext = spy(RuntimeEnvironment.application);
+
+        doReturn(mPackageManager).when(mContext).getPackageManager();
+        mDiscoverableFooterPreferenceController =
+                new DiscoverableFooterPreferenceController(mContext);
+        mPreference = spy(new FooterPreference(mContext));
+        mDiscoverableFooterPreferenceController.init(mFooterPreferenceMixin, mPreference,
+                mAlwaysDiscoverable);
+        mBluetoothChangedReceiver = mDiscoverableFooterPreferenceController
+                .mBluetoothChangedReceiver;
+    }
+
+    @Test
+    public void getAvailabilityStatus_noBluetoothFeature_returnUnSupported() {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)).thenReturn(false);
+
+        assertThat(mDiscoverableFooterPreferenceController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_BluetoothFeature_returnAvailable() {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)).thenReturn(true);
+
+        assertThat(mDiscoverableFooterPreferenceController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void displayPreference() {
+        when(mFooterPreferenceMixin.createFooterPreference()).thenReturn(mPreference);
+        mDiscoverableFooterPreferenceController.displayPreference(mScreen);
+
+        verify(mPreference).setKey(KEY);
+        verify(mScreen).addPreference(mPreference);
+    }
+
+    @Test
+    public void onResume() {
+        mDiscoverableFooterPreferenceController.onResume();
+        assertThat(getRegisteredBroadcastReceivers()).contains(mBluetoothChangedReceiver);
+        verify(mAlwaysDiscoverable).start();
+    }
+
+    @Test
+    public void onPause() {
+        mDiscoverableFooterPreferenceController.onResume();
+        mDiscoverableFooterPreferenceController.onPause();
+
+        assertThat(getRegisteredBroadcastReceivers()).doesNotContain(mBluetoothChangedReceiver);
+        verify(mAlwaysDiscoverable).stop();
+    }
+
+    @Test
+    public void onBluetoothStateChanged_bluetoothOn_updateTitle() {
+        ShadowLocalBluetoothAdapter.setName(DEVICE_NAME);
+        sendBluetoothStateChangedIntent(BluetoothAdapter.STATE_ON);
+
+        assertThat(mPreference.getTitle()).isEqualTo(generateTitle(DEVICE_NAME));
+    }
+
+    @Test
+    public void onBluetoothStateChanged_bluetoothOff_updateTitle(){
+        ShadowLocalBluetoothAdapter.setName(DEVICE_NAME);
+        sendBluetoothStateChangedIntent(BluetoothAdapter.STATE_OFF);
+
+        assertThat(mPreference.getTitle()).isEqualTo(generateTitle(null));
+    }
+
+    private CharSequence generateTitle(String deviceName) {
+        if (deviceName == null) {
+            return mContext.getString(R.string.bluetooth_off_footer);
+
+        } else {
+            return TextUtils.expandTemplate(
+                    mContext.getText(R.string.bluetooth_device_name_summary),
+                    BidiFormatter.getInstance().unicodeWrap(deviceName));
+        }
+    }
+
+    private void sendBluetoothStateChangedIntent(int state) {
+        Intent intent = new Intent(BluetoothAdapter.ACTION_STATE_CHANGED);
+        intent.putExtra(BluetoothAdapter.EXTRA_STATE, state);
+        mBluetoothChangedReceiver.onReceive(mContext, intent);
+    }
+
+    /**
+     * Return a list of all the registered broadcast receivers
+     */
+    private List<BroadcastReceiver> getRegisteredBroadcastReceivers() {
+        List<BroadcastReceiver> registeredBroadcastReceivers = new ArrayList();
+        List<ShadowApplication.Wrapper> registeredReceivers =
+                mShadowApplication.getRegisteredReceivers();
+        for (ShadowApplication.Wrapper wrapper : registeredReceivers) {
+            registeredBroadcastReceivers.add(wrapper.getBroadcastReceiver());
+        }
+        return registeredBroadcastReceivers;
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java
index d5e8e15..237e69a 100644
--- a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java
@@ -144,6 +144,11 @@
     }
 
     @Test
+    public void hasAsyncUpdate_shouldReturnFalse() {
+        assertThat(mPreferenceController.hasAsyncUpdate()).isFalse();
+    }
+
+    @Test
     public void settingAvailable_disabledOnDisplayPreference_preferenceEnabled() {
         final PreferenceScreen screen = mock(PreferenceScreen.class);
         final Preference preference = new Preference(mContext);
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
index dc492a9..586bbd1 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
@@ -29,6 +29,7 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
+import android.content.res.ColorStateList;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Icon;
 import android.service.settings.suggestions.Suggestion;
@@ -47,6 +48,7 @@
 import com.android.settings.testutils.shadow.ShadowCardView;
 import com.android.settingslib.suggestions.SuggestionControllerMixin;
 import com.android.settingslib.utils.IconCache;
+import com.android.settingslib.Utils;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -282,13 +284,13 @@
         when(cache.getIcon(icon)).thenReturn(drawable);
         ReflectionHelpers.setField(mSuggestionAdapter, "mCache", cache);
         TypedArray typedArray = mock(TypedArray.class);
-        final int colorAccent = 1234;
+        final ColorStateList colorAccentState = Utils.getColorAccent(mContext);
         when(mActivity.obtainStyledAttributes(any())).thenReturn(typedArray);
-        when(typedArray.getColor(anyInt(), anyInt())).thenReturn(colorAccent);
+        when(typedArray.getColorStateList(anyInt())).thenReturn(colorAccentState);
 
         mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
 
-        verify(drawable).setTint(colorAccent);
+        verify(drawable).setTintList(colorAccentState);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java
new file mode 100644
index 0000000..bf6ed94
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java
@@ -0,0 +1,74 @@
+/*
+ * 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.development;
+
+import static com.android.settings.development.BluetoothA2dpHwOffloadPreferenceController.A2DP_OFFLOAD_DISABLED_PROPERTY;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import androidx.preference.SwitchPreference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class BluetoothA2dpHwOffloadPreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private DevelopmentSettingsDashboardFragment mFragment;
+
+    private Context mContext;
+    private SwitchPreference mPreference;
+    private BluetoothA2dpHwOffloadPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mPreference = new SwitchPreference(mContext);
+        mController = spy(new BluetoothA2dpHwOffloadPreferenceController(mContext, mFragment));
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+            .thenReturn(mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void onA2dpHwDialogConfirmed_shouldChangeProperty() {
+        SystemProperties.set(A2DP_OFFLOAD_DISABLED_PROPERTY, Boolean.toString(false));
+
+        mController.onA2dpHwDialogConfirmed();
+        final boolean mode = SystemProperties.getBoolean(A2DP_OFFLOAD_DISABLED_PROPERTY, false);
+        assertThat(mode).isTrue();
+
+        mController.onA2dpHwDialogConfirmed();
+        final boolean mode2 = SystemProperties.getBoolean(A2DP_OFFLOAD_DISABLED_PROPERTY, false);
+        assertThat(mode2).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerTest.java
deleted file mode 100644
index f0e5825..0000000
--- a/tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerTest.java
+++ /dev/null
@@ -1,191 +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.android.settings.development.ConnectivityMonitorPreferenceController.ENG_BUILD;
-import static com.android.settings.development.ConnectivityMonitorPreferenceController.USERDEBUG_BUILD;
-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.os.SystemProperties;
-import androidx.preference.SwitchPreference;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-public class ConnectivityMonitorPreferenceControllerTest {
-
-    private static final String USER_BUILD = "user";
-
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private SwitchPreference mPreference;
-
-    private Context mContext;
-    private ConnectivityMonitorPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mController = new ConnectivityMonitorPreferenceController(mContext);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-        mController.displayPreference(mScreen);
-    }
-
-    @Test
-    public void isAvailable_trueShowFlagWithUserdebugBuild_shouldReturnTrue() {
-        SystemProperties.set(ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_trueShowFlagWithEngBuild_shouldReturnTrue() {
-        SystemProperties.set(ConnectivityMonitorPreferenceController.BUILD_TYPE, ENG_BUILD);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_trueShowFlagWithUserBuild_shouldReturnFalse() {
-        SystemProperties.set(ConnectivityMonitorPreferenceController.BUILD_TYPE, USER_BUILD);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    @Config(qualifiers = "mcc999")
-    public void isAvailable_falseShowFlagWithUserdebugBuild_shouldReturnFalse() {
-        SystemProperties.set(ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    @Config(qualifiers = "mcc999")
-    public void isAvailable_falseShowFlagWithEngBuild_shouldReturnFalse() {
-        SystemProperties.set(ConnectivityMonitorPreferenceController.BUILD_TYPE, ENG_BUILD);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    @Config(qualifiers = "mcc999")
-    public void isAvailable_falseShowFlagWithUserBuild_shouldReturnFalse() {
-        SystemProperties.set(ConnectivityMonitorPreferenceController.BUILD_TYPE, USER_BUILD);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void updateState_connectivityMonitorEnabled_shouldCheckedPreference() {
-        SystemProperties.set(ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
-                ConnectivityMonitorPreferenceController.ENABLED_STATUS);
-        SystemProperties.set(ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setChecked(true);
-    }
-
-    @Test
-    public void updateState_connectivityMonitorUserEnabled_shouldCheckedPreference() {
-        SystemProperties.set(ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
-                ConnectivityMonitorPreferenceController.USER_ENABLED_STATUS);
-        SystemProperties.set(ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setChecked(true);
-    }
-
-    @Test
-    public void updateState_connectivityMonitorDisabled_shouldUncheckedPreference() {
-        SystemProperties.set(ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
-                ConnectivityMonitorPreferenceController.DISABLED_STATUS);
-        SystemProperties.set(ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setChecked(false);
-    }
-
-    @Test
-    public void updateState_connectivityMonitorUserDisabled_shouldUncheckedPreference() {
-        SystemProperties.set(ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
-                ConnectivityMonitorPreferenceController.USER_DISABLED_STATUS);
-        SystemProperties.set(ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setChecked(false);
-    }
-
-    @Test
-    public void onPreferenceChange_preferenceChecked_shouldEnableConnectivityMonitor() {
-        SystemProperties.set(
-                ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
-                ConnectivityMonitorPreferenceController.USER_ENABLED_STATUS);
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        assertThat(ConnectivityMonitorPreferenceController.USER_ENABLED_STATUS).isEqualTo(
-                SystemProperties.get(
-                        ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
-                        ConnectivityMonitorPreferenceController.DISABLED_STATUS));
-    }
-
-    @Test
-    public void onPreferenceChange_preferenceUnchecked_shouldDisableConnectivityMonitor() {
-        SystemProperties.set(
-                ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
-                ConnectivityMonitorPreferenceController.USER_DISABLED_STATUS);
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        assertThat(ConnectivityMonitorPreferenceController.USER_DISABLED_STATUS).isEqualTo(
-                SystemProperties.get(
-                        ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
-                        ConnectivityMonitorPreferenceController.DISABLED_STATUS));
-    }
-
-    @Test
-    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
-        mController.onDeveloperOptionsSwitchDisabled();
-
-        String mode = SystemProperties.get(
-                ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
-                null /* default */);
-
-        assertThat(mode).isEqualTo(ConnectivityMonitorPreferenceController.USER_DISABLED_STATUS);
-        verify(mPreference).setEnabled(false);
-        verify(mPreference).setChecked(false);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java
index 34a0581..fd063cb 100644
--- a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java
@@ -26,14 +26,15 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.content.om.IOverlayManager;
+import android.content.om.OverlayInfo;
 import android.content.pm.PackageManager;
+import android.os.RemoteException;
 import androidx.preference.ListPreference;
 import androidx.preference.PreferenceScreen;
 import android.view.DisplayCutout;
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.wrapper.OverlayManagerWrapper;
-import com.android.settings.wrapper.OverlayManagerWrapper.OverlayInfo;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -41,6 +42,7 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 
 @RunWith(SettingsRobolectricTestRunner.class)
@@ -54,7 +56,7 @@
     @Mock
     private Context mContext;
     @Mock
-    private OverlayManagerWrapper mOverlayManager;
+    private IOverlayManager mOverlayManager;
     @Mock
     private PackageManager mPackageManager;
     @Mock
@@ -64,6 +66,7 @@
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
+        when(mContext.getSystemService(Context.OVERLAY_SERVICE)).thenReturn(mOverlayManager);
         mockCurrentOverlays();
         when(mPackageManager.getApplicationInfo(any(), anyInt()))
             .thenThrow(PackageManager.NameNotFoundException.class);
@@ -72,8 +75,12 @@
     }
 
     Object mockCurrentOverlays(OverlayInfo... overlays) {
-        return when(mOverlayManager.getOverlayInfosForTarget(eq("android"), anyInt()))
-            .thenReturn(Arrays.asList(overlays));
+        try {
+            return when(mOverlayManager.getOverlayInfosForTarget(eq("android"), anyInt()))
+                .thenReturn(Arrays.asList(overlays));
+        } catch (RemoteException re) {
+            return new ArrayList<OverlayInfo>();
+        }
     }
 
     @Test
@@ -146,6 +153,15 @@
     }
 
     private static OverlayInfo createFakeOverlay(String pkg, boolean enabled) {
-        return new OverlayInfo(pkg, DisplayCutout.EMULATION_OVERLAY_CATEGORY, enabled);
+        final int state = (enabled) ? OverlayInfo.STATE_ENABLED : OverlayInfo.STATE_DISABLED;
+
+        return new OverlayInfo(pkg /* packageName */,
+                pkg + ".target" /* targetPackageName */,
+                DisplayCutout.EMULATION_OVERLAY_CATEGORY /* category */,
+                pkg + ".baseCodePath" /* baseCodePath */,
+                state /* state */,
+                0 /* userId */,
+                0 /* priority */,
+                true /* isStatic */);
     }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java
deleted file mode 100644
index 169554d..0000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java
+++ /dev/null
@@ -1,152 +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.deviceinfo;
-
-import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY;
-import static com.android.settings.deviceinfo.DeviceInfoSettings.NON_SIM_PREFERENCES_COUNT;
-import static com.android.settings.deviceinfo.DeviceInfoSettings.SIM_PREFERENCES_COUNT;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.Build;
-import android.os.Bundle;
-import androidx.preference.PreferenceScreen;
-import android.telephony.TelephonyManager;
-
-import com.android.settings.R;
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.XmlTestUtils;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.ShadowConnectivityManager;
-import com.android.settings.testutils.shadow.ShadowUserManager;
-import com.android.settings.testutils.shadow.ShadowUtils;
-import com.android.settingslib.DeviceInfoUtils;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(shadows = {ShadowUtils.class, ShadowConnectivityManager.class, ShadowUserManager.class})
-public class DeviceInfoSettingsTest {
-
-    @Mock
-    private Activity mActivity;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private SummaryLoader mSummaryLoader;
-    @Mock
-    private TelephonyManager mTelephonyManager;
-
-    private Context mContext;
-    private DeviceInfoSettings mSettings;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest();
-        mContext = RuntimeEnvironment.application;
-        mSettings = spy(new DeviceInfoSettings());
-
-        doReturn(mActivity).when(mSettings).getActivity();
-        doReturn(mContext).when(mSettings).getContext();
-        doReturn(mContext.getTheme()).when(mActivity).getTheme();
-        doReturn(mContext.getResources()).when(mSettings).getResources();
-        doNothing().when(mSettings).onCreatePreferences(any(), any());
-
-        doReturn(mScreen).when(mSettings).getPreferenceScreen();
-        ShadowApplication.getInstance()
-            .setSystemService(Context.TELEPHONY_SERVICE, mTelephonyManager);
-    }
-
-    @Test
-    public void getPrefXml_shouldReturnDeviceInfoXml() {
-        assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(R.xml.device_info_settings);
-    }
-
-    @Test
-    public void getSummary_shouldReturnDeviceModel() {
-        final SummaryLoader.SummaryProvider mProvider =
-            DeviceInfoSettings.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(null, mSummaryLoader);
-
-        mProvider.setListening(true);
-
-        verify(mSummaryLoader).setSummary(mProvider, Build.MODEL + DeviceInfoUtils.getMsvSuffix());
-    }
-
-    @Test
-    public void testNonIndexableKeys_existInXmlLayout() {
-        final Context context = RuntimeEnvironment.application;
-        final List<String> niks =
-            DeviceInfoSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(context);
-        final int xmlId = (new DeviceInfoSettings()).getPreferenceScreenResId();
-
-        final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
-
-        assertThat(keys).containsAllIn(niks);
-    }
-
-    @Test
-    @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
-    public void onCreate_fromSearch_shouldNotOverrideInitialExpandedCount() {
-        final Bundle args = new Bundle();
-        args.putString(EXTRA_FRAGMENT_ARG_KEY, "search_key");
-        mSettings.setArguments(args);
-
-        mSettings.onCreate(null /* icicle */);
-
-        verify(mScreen).setInitialExpandedChildrenCount(Integer.MAX_VALUE);
-    }
-
-    @Test
-    @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
-    public void onCreate_singleSim_shouldAddSingleSimCount() {
-        doReturn(1).when(mTelephonyManager).getPhoneCount();
-
-        mSettings.onCreate(null /* icicle */);
-
-        verify(mScreen).setInitialExpandedChildrenCount(
-                SIM_PREFERENCES_COUNT + NON_SIM_PREFERENCES_COUNT);
-    }
-
-    @Test
-    @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
-    public void onCreate_dualeSim_shouldAddDualSimCount() {
-        doReturn(2).when(mTelephonyManager).getPhoneCount();
-
-        mSettings.onCreate(null /* icicle */);
-
-        verify(mScreen).setInitialExpandedChildrenCount(
-                2 * SIM_PREFERENCES_COUNT + NON_SIM_PREFERENCES_COUNT);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
index 624b07f..42d24f8 100644
--- a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
@@ -150,4 +150,19 @@
 
         assertThat(newValue).isEqualTo(currentValue);
     }
+
+    @Test
+    public void isSliceableCorrectKey_returnsTrue() {
+        final AmbientDisplayAlwaysOnPreferenceController controller =
+                new AmbientDisplayAlwaysOnPreferenceController(mContext,
+                        "ambient_display_always_on");
+        assertThat(controller.isSliceable()).isTrue();
+    }
+
+    @Test
+    public void isSliceableIncorrectKey_returnsFalse() {
+        final AmbientDisplayAlwaysOnPreferenceController controller =
+                new AmbientDisplayAlwaysOnPreferenceController(mContext, "bad_key");
+        assertThat(controller.isSliceable()).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java
index c026a3b..77390d3 100644
--- a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java
@@ -182,4 +182,19 @@
 
         assertThat(newValue).isEqualTo(currentValue);
     }
+
+    @Test
+    public void isSliceableCorrectKey_returnsTrue() {
+        final AmbientDisplayNotificationsPreferenceController controller =
+                new AmbientDisplayNotificationsPreferenceController(mContext,
+                        "ambient_display_notification");
+        assertThat(controller.isSliceable()).isTrue();
+    }
+
+    @Test
+    public void isSliceableIncorrectKey_returnsFalse() {
+        final AmbientDisplayNotificationsPreferenceController controller =
+                new AmbientDisplayNotificationsPreferenceController(mContext, "bad_key");
+        assertThat(controller.isSliceable()).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
index 5bd7711..188cb92 100644
--- a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
@@ -93,4 +93,19 @@
 
         assertThat(newValue).isEqualTo(SCREEN_BRIGHTNESS_MODE_AUTOMATIC);
     }
+
+    @Test
+    public void isSliceableCorrectKey_returnsTrue() {
+        final AutoBrightnessPreferenceController controller =
+                new AutoBrightnessPreferenceController(mContext,
+                        "auto_brightness");
+        assertThat(controller.isSliceable()).isTrue();
+    }
+
+    @Test
+    public void isSliceableIncorrectKey_returnsFalse() {
+        final AutoBrightnessPreferenceController controller =
+                new AutoBrightnessPreferenceController(mContext, "bad_key");
+        assertThat(controller.isSliceable()).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
index c4ef0c9..5a31e3b 100644
--- a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
@@ -104,7 +104,7 @@
     @Test
     public void testGetAvailabilityStatus() {
         assertThat(mController.getAvailabilityStatus()).isEqualTo(BasePreferenceController
-                .CONDITIONALLY_UNAVAILABLE);
+                .UNSUPPORTED_ON_DEVICE);
 
         enableAutoRotationPreference();
 
@@ -114,7 +114,7 @@
         disableAutoRotationPreference();
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(BasePreferenceController
-                .CONDITIONALLY_UNAVAILABLE);
+                .UNSUPPORTED_ON_DEVICE);
     }
 
     @Test
@@ -144,6 +144,20 @@
         assertThat(RotationPolicy.isRotationLocked(mContext)).isFalse();
     }
 
+    @Test
+    public void isSliceableCorrectKey_returnsTrue() {
+        final AutoRotatePreferenceController controller =
+                new AutoRotatePreferenceController(mContext, "auto_rotate");
+        assertThat(controller.isSliceable()).isTrue();
+    }
+
+    @Test
+    public void isSliceableIncorrectKey_returnsFalse() {
+        final AutoRotatePreferenceController controller =
+                new AutoRotatePreferenceController(mContext, "bad_key");
+        assertThat(controller.isSliceable()).isFalse();
+    }
+
     private void enableAutoRotationPreference() {
         when(mPackageManager.hasSystemFeature(anyString())).thenReturn(true);
         when(mContext.getResources().getBoolean(anyInt())).thenReturn(true);
diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java
index 6b88821..c7b6535 100644
--- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java
@@ -55,6 +55,16 @@
     }
 
     @Test
+    public void updateState_colorModeAutomatic_shouldSetSummaryToAutomatic() {
+        when(mColorDisplayController.getColorMode())
+            .thenReturn(ColorDisplayController.COLOR_MODE_AUTOMATIC);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(mContext.getString(R.string.color_mode_option_automatic));
+    }
+
+    @Test
     public void updateState_colorModeSaturated_shouldSetSummaryToSaturated() {
         when(mColorDisplayController.getColorMode())
             .thenReturn(ColorDisplayController.COLOR_MODE_SATURATED);
diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
index 81a223d..4000775 100644
--- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
@@ -34,6 +34,7 @@
 import com.android.settings.R;
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settingslib.widget.CandidateInfo;
 
 import org.junit.Before;
@@ -43,11 +44,13 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
 import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = SettingsShadowResources.class)
 public class ColorModePreferenceFragmentTest {
 
     private ColorModePreferenceFragment mFragment;
@@ -73,8 +76,64 @@
     }
 
     @Test
-    public void getCandidates() {
+    public void getCandidates_all() {
         when(mFragment.getContext()).thenReturn(RuntimeEnvironment.application);
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.array.config_availableColorModes, new int[]{
+                    ColorDisplayController.COLOR_MODE_NATURAL,
+                    ColorDisplayController.COLOR_MODE_BOOSTED,
+                    ColorDisplayController.COLOR_MODE_SATURATED,
+                    ColorDisplayController.COLOR_MODE_AUTOMATIC
+                });
+        List<? extends CandidateInfo> candidates = mFragment.getCandidates();
+
+        assertThat(candidates.size()).isEqualTo(4);
+        assertThat(candidates.get(0).getKey())
+                .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_NATURAL);
+        assertThat(candidates.get(1).getKey())
+                .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_BOOSTED);
+        assertThat(candidates.get(2).getKey())
+                .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_SATURATED);
+        assertThat(candidates.get(3).getKey())
+                .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_AUTOMATIC);
+    }
+
+    @Test
+    public void getCandidates_none() {
+        when(mFragment.getContext()).thenReturn(RuntimeEnvironment.application);
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.array.config_availableColorModes, null);
+        List<? extends CandidateInfo> candidates = mFragment.getCandidates();
+
+        assertThat(candidates.size()).isEqualTo(0);
+    }
+
+    @Test
+    public void getCandidates_withAutomatic() {
+        when(mFragment.getContext()).thenReturn(RuntimeEnvironment.application);
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.array.config_availableColorModes, new int[]{
+                    ColorDisplayController.COLOR_MODE_NATURAL,
+                    ColorDisplayController.COLOR_MODE_AUTOMATIC
+                });
+        List<? extends CandidateInfo> candidates = mFragment.getCandidates();
+
+        assertThat(candidates.size()).isEqualTo(2);
+        assertThat(candidates.get(0).getKey())
+                .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_NATURAL);
+        assertThat(candidates.get(1).getKey())
+                .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_AUTOMATIC);
+    }
+
+    @Test
+    public void getCandidates_withoutAutomatic() {
+        when(mFragment.getContext()).thenReturn(RuntimeEnvironment.application);
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.array.config_availableColorModes, new int[]{
+                    ColorDisplayController.COLOR_MODE_NATURAL,
+                    ColorDisplayController.COLOR_MODE_BOOSTED,
+                    ColorDisplayController.COLOR_MODE_SATURATED,
+                });
         List<? extends CandidateInfo> candidates = mFragment.getCandidates();
 
         assertThat(candidates.size()).isEqualTo(3);
@@ -114,6 +173,15 @@
     }
 
     @Test
+    public void getKey_automatic() {
+        when(mController.getColorMode())
+            .thenReturn(ColorDisplayController.COLOR_MODE_AUTOMATIC);
+
+        assertThat(mFragment.getDefaultKey())
+            .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_AUTOMATIC);
+    }
+
+    @Test
     public void setKey_natural() {
         mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_NATURAL);
         verify(mController).setColorMode(ColorDisplayController.COLOR_MODE_NATURAL);
@@ -132,6 +200,12 @@
     }
 
     @Test
+    public void setKey_automatic() {
+        mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_AUTOMATIC);
+        verify(mController).setColorMode(ColorDisplayController.COLOR_MODE_AUTOMATIC);
+    }
+
+    @Test
     public void onCreatePreferences_useNewTitle_shouldAddColorModePreferences() {
         doNothing().when(mFragment).addPreferencesFromResource(anyInt());
         doNothing().when(mFragment).updateCandidates();
diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java
index 5fa1a47..a4b0e54 100644
--- a/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java
@@ -73,6 +73,20 @@
     }
 
     @Test
+    public void isSliceableCorrectKey_returnsTrue() {
+        final NightDisplayActivationPreferenceController controller =
+                new NightDisplayActivationPreferenceController(mContext,"night_display_activated");
+        assertThat(controller.isSliceable()).isTrue();
+    }
+
+    @Test
+    public void isSliceableIncorrectKey_returnsFalse() {
+        final NightDisplayActivationPreferenceController controller =
+                new NightDisplayActivationPreferenceController(mContext, "bad_key");
+        assertThat(controller.isSliceable()).isFalse();
+    }
+
+    @Test
     public void onClick_activates() {
         Secure.putInt(mContext.getContentResolver(), Secure.NIGHT_DISPLAY_ACTIVATED, 0);
 
diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java
index 1a69b6b..40101a4 100644
--- a/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java
@@ -76,4 +76,18 @@
                 Secure.NIGHT_DISPLAY_COLOR_TEMPERATURE, -1))
                 .isEqualTo(3030);
     }
+
+    @Test
+    public void isSliceableCorrectKey_returnsTrue() {
+        final NightDisplayIntensityPreferenceController controller =
+                new NightDisplayIntensityPreferenceController(mContext,"night_display_temperature");
+        assertThat(controller.isSliceable()).isTrue();
+    }
+
+    @Test
+    public void isSliceableIncorrectKey_returnsFalse() {
+        final NightDisplayIntensityPreferenceController controller =
+                new NightDisplayIntensityPreferenceController(mContext, "bad_key");
+        assertThat(controller.isSliceable()).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/display/SystemUiThemePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/SystemUiThemePreferenceControllerTest.java
new file mode 100644
index 0000000..a2e669f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/SystemUiThemePreferenceControllerTest.java
@@ -0,0 +1,89 @@
+/*
+ * 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.display;
+
+import static android.provider.Settings.Secure.THEME_MODE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class SystemUiThemePreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private ListPreference mListPreference;
+    private Context mContext;
+    private SystemUiThemePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        when(mPreferenceScreen.findPreference(anyString())).thenReturn(mListPreference);
+        CharSequence[] entries = mContext.getResources().getStringArray(
+                R.array.systemui_theme_entries);
+        when(mListPreference.getEntries()).thenReturn(entries);
+        mController = spy(new SystemUiThemePreferenceController(mContext, "systemui_theme"));
+    }
+
+    @Test
+    public void displayPreference_readsSetting() {
+        Settings.Secure.putInt(mContext.getContentResolver(), THEME_MODE, 2);
+        mController.displayPreference(mPreferenceScreen);
+        verify(mListPreference).setValue(eq("2"));
+    }
+
+    @Test
+    public void onPreferenceChange_writesSetting() {
+        Settings.Secure.putInt(mContext.getContentResolver(), THEME_MODE, 2);
+        mController.displayPreference(mPreferenceScreen);
+        mController.onPreferenceChange(mListPreference, "0");
+        int value = Settings.Secure.getInt(mContext.getContentResolver(), THEME_MODE, 2);
+        assertThat(value).isEqualTo(0);
+    }
+
+    @Test
+    public void onPreferenceChange_updatesSummary() {
+        mController.displayPreference(mPreferenceScreen);
+        mController.onPreferenceChange(mListPreference, "0");
+        verify(mController).getSummary();
+    }
+
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
index 47cdd35..19ffdc6 100644
--- a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
@@ -16,25 +16,26 @@
 
 package com.android.settings.display;
 
+import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyString;
 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.content.om.IOverlayManager;
+import android.content.om.OverlayInfo;
 import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
-import androidx.preference.ListPreference;
 
 import com.android.settings.R;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.wrapper.OverlayManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -44,6 +45,10 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 
+import java.util.Arrays;
+
+import androidx.preference.ListPreference;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 public class ThemePreferenceControllerTest {
 
@@ -55,6 +60,8 @@
     private ApplicationInfo mApplicationInfo;
     @Mock
     private ListPreference mPreference;
+    @Mock
+    private IOverlayManager mOverlayManager;
 
     private ThemePreferenceController mController;
 
@@ -67,8 +74,28 @@
         when(mContext.getString(R.string.default_theme))
                 .thenReturn(RuntimeEnvironment.application.getString(R.string.default_theme));
 
-        mController =
-            spy(new ThemePreferenceController(mContext, mock(OverlayManagerWrapper.class)));
+        when(mContext.getSystemService(Context.OVERLAY_SERVICE)).thenReturn(mOverlayManager);
+        mController = spy(new ThemePreferenceController(mContext, mOverlayManager));
+    }
+
+    @Test
+    public void testAvailable_false() throws Exception {
+        when(mPackageManager.getPackageInfo(anyString(), anyInt())).thenReturn(
+                new PackageInfo());
+        when(mOverlayManager.getOverlayInfosForTarget(any(), anyInt()))
+                .thenReturn(Arrays.asList(new OverlayInfo("", "", "", "", 0, 0, 0, false)));
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void testAvailable_true() throws Exception {
+        when(mPackageManager.getPackageInfo(anyString(), anyInt())).thenReturn(
+                new PackageInfo());
+        when(mOverlayManager.getOverlayInfosForTarget(any(), anyInt()))
+                .thenReturn(Arrays.asList(
+                        new OverlayInfo("", "", OverlayInfo.CATEGORY_THEME, "", 0, 0, 0, true),
+                        new OverlayInfo("", "", OverlayInfo.CATEGORY_THEME, "", 0, 0, 0, true)));
+        assertThat(mController.isAvailable()).isTrue();
     }
 
     @Test
@@ -79,7 +106,7 @@
         final String themeLabel2 = "Theme2";
         final String[] themes = {pkg1, pkg2};
         doReturn("pkg1.theme1").when(mController).getCurrentTheme();
-        doReturn(themes).when(mController).getAvailableThemes();
+        doReturn(themes).when(mController).getAvailableThemes(false /* currentThemeOnly */);
         when(mPackageManager.getApplicationInfo(anyString(), anyInt()).loadLabel(mPackageManager))
                 .thenReturn(themeLabel1)
                 .thenReturn(themeLabel2);
@@ -98,7 +125,7 @@
         final String themeLabel2 = "Theme2";
         final String[] themes = {pkg1, pkg2};
         doReturn(null).when(mController).getCurrentTheme();
-        doReturn(themes).when(mController).getAvailableThemes();
+        doReturn(themes).when(mController).getAvailableThemes(false /* currentThemeOnly */);
         when(mPackageManager.getApplicationInfo(anyString(), anyInt()).loadLabel(mPackageManager))
                 .thenReturn(themeLabel1)
                 .thenReturn(themeLabel2);
@@ -109,4 +136,32 @@
                 .setSummary(RuntimeEnvironment.application.getString(R.string.default_theme));
         verify(mPreference).setValue(null);
     }
+
+    @Test
+    public void getCurrentTheme_withEnabledState() throws Exception {
+        OverlayInfo info1 = new OverlayInfo("com.android.Theme1", "android",
+                OverlayInfo.CATEGORY_THEME, "", OverlayInfo.STATE_ENABLED, 0, 0, true);
+        OverlayInfo info2 = new OverlayInfo("com.android.Theme2", "android",
+                OverlayInfo.CATEGORY_THEME, "", 0, 0, 0, true);
+        when(mOverlayManager.getOverlayInfosForTarget(any(), anyInt())).thenReturn(
+                Arrays.asList(info1, info2));
+        when(mPackageManager.getPackageInfo(anyString(), anyInt())).thenReturn(
+                new PackageInfo());
+
+        assertThat(mController.getCurrentTheme()).isEqualTo(info1.packageName);
+    }
+
+    @Test
+    public void testGetCurrentTheme_withoutEnabledState() throws Exception {
+        OverlayInfo info1 = new OverlayInfo("com.android.Theme1", "android",
+                OverlayInfo.CATEGORY_THEME, "", OverlayInfo.STATE_DISABLED, 0, 0, true);
+        OverlayInfo info2 = new OverlayInfo("com.android.Theme2", "android",
+                OverlayInfo.CATEGORY_THEME, "", 0, 0, 0, true);
+        when(mOverlayManager.getOverlayInfosForTarget(any(), anyInt())).thenReturn(
+                Arrays.asList(info1, info2));
+        when(mPackageManager.getPackageInfo(anyString(), anyInt())).thenReturn(
+                new PackageInfo());
+
+        assertThat(mController.getCurrentTheme()).isNull();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
index 8f94ffb..0647887 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
@@ -26,6 +26,7 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
 
 import android.app.Activity;
 import androidx.lifecycle.LifecycleOwner;
@@ -33,6 +34,7 @@
 import android.content.Intent;
 import android.os.BatteryManager;
 import androidx.preference.PreferenceFragment;
+import android.os.PowerManager;
 import androidx.preference.PreferenceScreen;
 import androidx.recyclerview.widget.RecyclerView;
 import android.widget.TextView;
@@ -52,8 +54,9 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowPowerManager;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(shadows = {
@@ -80,6 +83,7 @@
     private EntityHeaderController mEntityHeaderController;
     private BatteryHeaderPreferenceController mController;
     private Context mContext;
+    private PowerManager mPowerManager;
     private BatteryMeterView mBatteryMeterView;
     private TextView mBatteryPercentText;
     private TextView mSummary;
@@ -114,6 +118,8 @@
 
         mBatteryInfo.batteryLevel = BATTERY_LEVEL;
 
+        mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
+
         mController = new BatteryHeaderPreferenceController(
                 mContext, mActivity, mPreferenceFragment, mLifecycle);
         mController.mBatteryMeterView = mBatteryMeterView;
@@ -187,4 +193,17 @@
         assertThat(mBatteryMeterView.getCharging()).isTrue();
         assertThat(mBatteryPercentText.getText()).isEqualTo("60%");
     }
+
+    @Test
+    public void testQuickUpdateHeaderPreference_showPowerSave() {
+        boolean testValues[] = {false, true};
+
+        ShadowPowerManager shadowPowerManager = shadowOf(mPowerManager);
+        for (boolean value : testValues) {
+            shadowPowerManager.setIsPowerSaveMode(value);
+            mController.quickUpdateHeaderPreference();
+
+            assertThat(mBatteryMeterView.getPowerSave()).isEqualTo(value);
+        }
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java
index bc91e17..3497e43 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java
@@ -86,4 +86,11 @@
 
         verify(mDrawable).setBatteryColorFilter(mAccentColorFilter);
     }
+
+    @Test
+    public void testSetBatteryInfo_powerSave_setCorrectly() {
+        mBatteryMeterView.setPowerSave(true);
+
+        assertThat(mBatteryMeterView.getPowerSave()).isEqualTo(true);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java
index c93d4d1..66ea56c 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java
@@ -115,6 +115,10 @@
      */
     public static class TestPowerWhitelistBackend extends PowerWhitelistBackend {
 
+        public TestPowerWhitelistBackend(Context context) {
+            super(context);
+        }
+
         @Override
         public void refreshList() {
             // Do nothing so we could mock it without error
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java
index a4b2181..c52377f 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java
@@ -21,7 +21,9 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
+import static org.robolectric.Shadows.shadowOf;
 
+import android.app.AlertDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
@@ -38,6 +40,11 @@
 import com.android.settings.SettingsActivity;
 import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.fuelgauge.batterytip.AppInfo;
+import com.android.settings.fuelgauge.batterytip.BatteryTipDialogFragment;
+import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
+import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip;
+import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -46,13 +53,15 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowAlertDialog;
+import org.robolectric.shadows.ShadowDialog;
+import org.robolectric.util.FragmentTestUtil;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@RunWith(RobolectricTestRunner.class)
+@RunWith(SettingsRobolectricTestRunner.class)
 public class RestrictedAppDetailsTest {
 
     private static final String PACKAGE_NAME = "com.android.app";
@@ -60,20 +69,21 @@
     private static final int UID = UserHandle.getUid(USER_ID, 234);
     private static final String APP_NAME = "app";
 
+
     @Mock
     private PackageManager mPackageManager;
     @Mock
     private ApplicationInfo mApplicationInfo;
     @Mock
     private IconDrawableFactory mIconDrawableFactory;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private PreferenceManager mPreferenceManager;
     @Mock
     private InstrumentedPreferenceFragment mFragment;
+    private PreferenceManager mPreferenceManager;
     private RestrictedAppDetails mRestrictedAppDetails;
     private Context mContext;
     private AppInfo mAppInfo;
     private Intent mIntent;
+    private CheckBoxPreference mCheckBoxPreference;
 
     @Before
     public void setUp() {
@@ -86,8 +96,9 @@
                 .setUid(UID)
                 .build();
 
+        mPreferenceManager = new PreferenceManager(mContext);
+
         doReturn(mPreferenceManager).when(mRestrictedAppDetails).getPreferenceManager();
-        doReturn(mContext).when(mPreferenceManager).getContext();
         doReturn(mContext).when(mFragment).getContext();
         mRestrictedAppDetails.mPackageManager = mPackageManager;
         mRestrictedAppDetails.mIconDrawableFactory = mIconDrawableFactory;
@@ -97,10 +108,13 @@
         mRestrictedAppDetails.mBatteryUtils = spy(new BatteryUtils(mContext));
         doReturn(mPreferenceManager).when(
                 mRestrictedAppDetails.mRestrictedAppListGroup).getPreferenceManager();
+
+        mCheckBoxPreference = new CheckBoxPreference(mContext);
+        mCheckBoxPreference.setKey(mRestrictedAppDetails.getKeyFromAppInfo(mAppInfo));
     }
 
     @Test
-    public void testRefreshUi_displayPreference() throws Exception {
+    public void refreshUi_displayPreference() throws Exception {
         doReturn(mApplicationInfo).when(mPackageManager)
                 .getApplicationInfoAsUser(PACKAGE_NAME, 0, USER_ID);
         doReturn(APP_NAME).when(mPackageManager).getApplicationLabel(mApplicationInfo);
@@ -117,7 +131,7 @@
     }
 
     @Test
-    public void testStartRestrictedAppDetails_startWithCorrectData() {
+    public void startRestrictedAppDetails_startWithCorrectData() {
         final ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
         doAnswer(invocation -> {
             // Get the intent in which it has the app info bundle
@@ -135,4 +149,50 @@
                 RestrictedAppDetails.EXTRA_APP_INFO_LIST);
         assertThat(appInfos).containsExactly(mAppInfo);
     }
+
+    @Test
+    public void createDialogFragment_toRestrict_createRestrictDialog() {
+        final BatteryTipDialogFragment dialogFragment = mRestrictedAppDetails.createDialogFragment(
+                mAppInfo, true);
+
+        FragmentTestUtil.startFragment(dialogFragment);
+
+        final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
+        ShadowAlertDialog shadowDialog = shadowOf(dialog);
+        assertThat(shadowDialog.getTitle()).isEqualTo("Restrict app?");
+    }
+
+    @Test
+    public void createDialogFragment_toUnrestrict_createUnrestrictDialog() {
+        final BatteryTipDialogFragment dialogFragment = mRestrictedAppDetails.createDialogFragment(
+                mAppInfo, false);
+
+        FragmentTestUtil.startFragment(dialogFragment);
+
+        final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
+        ShadowAlertDialog shadowDialog = shadowOf(dialog);
+        assertThat(shadowDialog.getTitle()).isEqualTo("Remove restriction?");
+    }
+
+    @Test
+    public void onBatteryTipHandled_restrict_setChecked() {
+        final RestrictAppTip restrictAppTip = new RestrictAppTip(BatteryTip.StateType.NEW,
+                mAppInfo);
+        mRestrictedAppDetails.mRestrictedAppListGroup.addPreference(mCheckBoxPreference);
+
+        mRestrictedAppDetails.onBatteryTipHandled(restrictAppTip);
+
+        assertThat(mCheckBoxPreference.isChecked()).isTrue();
+    }
+
+    @Test
+    public void onBatteryTipHandled_unrestrict_setUnchecked() {
+        final UnrestrictAppTip unrestrictAppTip = new UnrestrictAppTip(BatteryTip.StateType.NEW,
+                mAppInfo);
+        mRestrictedAppDetails.mRestrictedAppListGroup.addPreference(mCheckBoxPreference);
+
+        mRestrictedAppDetails.onBatteryTipHandled(unrestrictAppTip);
+
+        assertThat(mCheckBoxPreference.isChecked()).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java
index fc8740e..163b7c5 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java
@@ -115,4 +115,11 @@
         return Settings.Global.getInt(mContentResolver,
                 Settings.Global.ADAPTIVE_BATTERY_MANAGEMENT_ENABLED, ON);
     }
+
+    @Test
+    public void isSliceableCorrectKey_returnsTrue() {
+        final SmartBatteryPreferenceController controller =
+                new SmartBatteryPreferenceController(mContext);
+        assertThat(controller.isSliceable()).isTrue();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java
index fbe6cf8..a4e8a7e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java
@@ -21,17 +21,12 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 
-import androidx.lifecycle.LifecycleOwner;
 import android.content.Context;
 import android.os.PowerManager;
-import androidx.preference.PreferenceScreen;
-import android.view.View;
 import android.widget.Button;
 
-import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.widget.TwoStateButtonPreference;
-import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -41,6 +36,9 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowPowerManager;
+import org.robolectric.util.ReflectionHelpers;
+
+import androidx.preference.PreferenceScreen;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(shadows = ShadowPowerManager.class)
@@ -48,67 +46,58 @@
 
     private BatterySaverButtonPreferenceController mController;
     private Context mContext;
-    private Lifecycle mLifecycle;
-    private LifecycleOwner mLifecycleOwner;
     private Button mButtonOn;
     private Button mButtonOff;
     private PowerManager mPowerManager;
-    @Mock
     private TwoStateButtonPreference mPreference;
+
     @Mock
     private PreferenceScreen mPreferenceScreen;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-
-        mLifecycleOwner = () -> mLifecycle;
-        mLifecycle = new Lifecycle(mLifecycleOwner);
         mContext = spy(RuntimeEnvironment.application);
+        mButtonOn = new Button(mContext);
+        mButtonOff = new Button(mContext);
         mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
+        mPreference = spy(new TwoStateButtonPreference(mContext, null /* AttributeSet */));
+        ReflectionHelpers.setField(mPreference, "mButtonOn", mButtonOn);
+        ReflectionHelpers.setField(mPreference, "mButtonOff", mButtonOff);
         doReturn(mPreference).when(mPreferenceScreen).findPreference(anyString());
 
-        mButtonOn = new Button(mContext);
-        mButtonOn.setId(R.id.state_on_button);
-        doReturn(mButtonOn).when(mPreference).getStateOnButton();
-        mButtonOff = new Button(mContext);
-        mButtonOff.setId(R.id.state_off_button);
-        doReturn(mButtonOff).when(mPreference).getStateOffButton();
-
-        mController = new BatterySaverButtonPreferenceController(mContext, mLifecycle);
+        mController = new BatterySaverButtonPreferenceController(mContext, "test_key");
         mController.displayPreference(mPreferenceScreen);
     }
 
     @Test
-    public void testUpdateState_lowPowerOn_displayButtonOff() {
+    public void updateState_lowPowerOn_preferenceIsChecked() {
         mPowerManager.setPowerSaveMode(true);
 
         mController.updateState(mPreference);
 
-        assertThat(mButtonOn.getVisibility()).isEqualTo(View.GONE);
-        assertThat(mButtonOff.getVisibility()).isEqualTo(View.VISIBLE);
+        assertThat(mPreference.isChecked()).isTrue();
     }
 
     @Test
-    public void testUpdateState_lowPowerOff_displayButtonOn() {
+    public void testUpdateState_lowPowerOff_preferenceIsUnchecked() {
         mPowerManager.setPowerSaveMode(false);
 
         mController.updateState(mPreference);
 
-        assertThat(mButtonOn.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(mButtonOff.getVisibility()).isEqualTo(View.GONE);
+        assertThat(mPreference.isChecked()).isFalse();
     }
 
     @Test
-    public void testOnClick_clickButtonOn_setPowerSaveMode() {
-        mController.onClick(mButtonOn);
+    public void setChecked_on_setPowerSaveMode() {
+        mController.setChecked(true);
 
         assertThat(mPowerManager.isPowerSaveMode()).isTrue();
     }
 
     @Test
-    public void testOnClick_clickButtonOff_clearPowerSaveMode() {
-        mController.onClick(mButtonOff);
+    public void setChecked_off_unsetPowerSaveMode() {
+        mController.setChecked(false);
 
         assertThat(mPowerManager.isPowerSaveMode()).isFalse();
     }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java
index 0e06765..836f458 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java
@@ -46,6 +46,8 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 public class RestrictAppActionTest {
 
+    private static final int UID_1 = 12345;
+    private static final int UID_2 = 23456;
     private static final String PACKAGE_NAME_1 = "com.android.app1";
     private static final String PACKAGE_NAME_2 = "com.android.app2";
     private static final int ANOMALY_WAKEUP = 0;
@@ -63,9 +65,11 @@
 
         final List<AppInfo> mAppInfos = new ArrayList<>();
         mAppInfos.add(new AppInfo.Builder()
+                .setUid(UID_1)
                 .setPackageName(PACKAGE_NAME_1)
                 .build());
         mAppInfos.add(new AppInfo.Builder()
+                .setUid(UID_2)
                 .setPackageName(PACKAGE_NAME_2)
                 .addAnomalyType(ANOMALY_BT)
                 .addAnomalyType(ANOMALY_WAKEUP)
@@ -87,9 +91,9 @@
         mRestrictAppAction.handlePositiveAction(METRICS_KEY);
 
         verify(mBatteryUtils)
-                .setForceAppStandby(anyInt(), eq(PACKAGE_NAME_1), eq(AppOpsManager.MODE_IGNORED));
+                .setForceAppStandby(UID_1, PACKAGE_NAME_1, AppOpsManager.MODE_IGNORED);
         verify(mBatteryUtils)
-                .setForceAppStandby(anyInt(), eq(PACKAGE_NAME_2), eq(AppOpsManager.MODE_IGNORED));
+                .setForceAppStandby(UID_2, PACKAGE_NAME_2, AppOpsManager.MODE_IGNORED);
         verify(mFeatureFactory.metricsFeatureProvider).action(RuntimeEnvironment.application,
                 MetricsProto.MetricsEvent.ACTION_TIP_RESTRICT_APP, PACKAGE_NAME_1, Pair.create(
                         MetricsProto.MetricsEvent.FIELD_CONTEXT, METRICS_KEY));
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java
index f176324..7fdf46a 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java
@@ -42,6 +42,7 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 public class UnrestrictAppActionTest {
 
+    private static final int UID_1 = 12345;
     private static final String PACKAGE_NAME_1 = "com.android.app1";
     private static final int METRICS_KEY = 1;
 
@@ -54,7 +55,10 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
-        final AppInfo appInfo = new AppInfo.Builder().setPackageName(PACKAGE_NAME_1).build();
+        final AppInfo appInfo = new AppInfo.Builder()
+                .setUid(UID_1)
+                .setPackageName(PACKAGE_NAME_1)
+                .build();
         mFeatureFactory = FakeFeatureFactory.setupForTest();
 
         mUnrestrictAppAction = new UnrestrictAppAction(RuntimeEnvironment.application,
@@ -72,7 +76,7 @@
         mUnrestrictAppAction.handlePositiveAction(METRICS_KEY);
 
         verify(mBatteryUtils)
-                .setForceAppStandby(anyInt(), eq(PACKAGE_NAME_1), eq(AppOpsManager.MODE_ALLOWED));
+                .setForceAppStandby(UID_1, PACKAGE_NAME_1, AppOpsManager.MODE_ALLOWED);
         verify(mFeatureFactory.metricsFeatureProvider).action(RuntimeEnvironment.application,
                 MetricsProto.MetricsEvent.ACTION_TIP_UNRESTRICT_APP, PACKAGE_NAME_1, Pair.create(
                         MetricsProto.MetricsEvent.FIELD_CONTEXT, METRICS_KEY));
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java
index a5a6602..e2c80df 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java
@@ -60,6 +60,7 @@
     private RestrictAppTip mHandledBatteryTip;
     private RestrictAppTip mInvisibleBatteryTip;
     private List<AppInfo> mUsageAppList;
+    private AppInfo mAppInfo;
     @Mock
     private ApplicationInfo mApplicationInfo;
     @Mock
@@ -77,15 +78,16 @@
                 PackageManager.MATCH_DISABLED_COMPONENTS | PackageManager.MATCH_ANY_USER);
         doReturn(DISPLAY_NAME).when(mApplicationInfo).loadLabel(mPackageManager);
 
-        mUsageAppList = new ArrayList<>();
-        mUsageAppList.add(new AppInfo.Builder()
+        mAppInfo = new AppInfo.Builder()
                 .setPackageName(PACKAGE_NAME)
                 .addAnomalyType(ANOMALY_WAKEUP)
                 .addAnomalyType(ANOMALY_WAKELOCK)
-                .build());
+                .build();
+        mUsageAppList = new ArrayList<>();
+        mUsageAppList.add(mAppInfo);
         mNewBatteryTip = new RestrictAppTip(BatteryTip.StateType.NEW, mUsageAppList);
         mHandledBatteryTip = new RestrictAppTip(BatteryTip.StateType.HANDLED, mUsageAppList);
-        mInvisibleBatteryTip = new RestrictAppTip(BatteryTip.StateType.INVISIBLE, mUsageAppList);
+        mInvisibleBatteryTip = new RestrictAppTip(BatteryTip.StateType.INVISIBLE, new ArrayList<>());
     }
 
     @Test
@@ -165,6 +167,13 @@
     }
 
     @Test
+    public void update_newHandledAnomalyComes_containHandledAnomaly() {
+        mInvisibleBatteryTip.updateState(mHandledBatteryTip);
+        assertThat(mInvisibleBatteryTip.getState()).isEqualTo(BatteryTip.StateType.HANDLED);
+        assertThat(mInvisibleBatteryTip.getRestrictAppList()).containsExactly(mAppInfo);
+    }
+
+    @Test
     public void toString_containsAppData() {
         assertThat(mNewBatteryTip.toString()).isEqualTo(
                 "type=1 state=0 { packageName=com.android.app,anomalyTypes={0, 1},screenTime=0 }");
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
index d681bc3..8c0be96 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
@@ -17,10 +17,13 @@
 package com.android.settings.gestures;
 
 import static android.provider.Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED;
+
 import static com.android.settings.gestures.DoubleTapPowerPreferenceController.OFF;
 import static com.android.settings.gestures.DoubleTapPowerPreferenceController.ON;
 import static com.android.settings.gestures.DoubleTapPowerPreferenceController.isSuggestionComplete;
+
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.when;
 
 import android.content.ContentResolver;
@@ -29,6 +32,7 @@
 import android.provider.Settings;
 
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
+import com.android.settings.display.AmbientDisplayAlwaysOnPreferenceController;
 import com.android.settings.search.InlinePayload;
 import com.android.settings.search.InlineSwitchPayload;
 import com.android.settings.search.ResultPayload;
@@ -67,7 +71,8 @@
     @Test
     public void isAvailable_configIsTrue_shouldReturnTrue() {
         SettingsShadowResources.overrideResource(
-            com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, Boolean.TRUE);
+                com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled,
+                Boolean.TRUE);
 
         assertThat(mController.isAvailable()).isTrue();
     }
@@ -75,7 +80,8 @@
     @Test
     public void isAvailable_configIsTrue_shouldReturnFalse() {
         SettingsShadowResources.overrideResource(
-            com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, Boolean.FALSE);
+                com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled,
+                Boolean.FALSE);
 
         assertThat(mController.isAvailable()).isFalse();
     }
@@ -101,7 +107,7 @@
     @Test
     public void testPreferenceController_ProperResultPayloadType() {
         DoubleTapPowerPreferenceController controller =
-            new DoubleTapPowerPreferenceController(mContext, KEY_DOUBLE_TAP_POWER);
+                new DoubleTapPowerPreferenceController(mContext, KEY_DOUBLE_TAP_POWER);
         ResultPayload payload = controller.getResultPayload();
         assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
     }
@@ -111,7 +117,7 @@
     public void testSetValue_updatesCorrectly() {
         int newValue = 1;
         Settings.Secure.putInt(mContentResolver,
-            Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0);
+                Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0);
 
         InlinePayload payload = ((InlineSwitchPayload) mController.getResultPayload());
         payload.setValue(mContext, newValue);
@@ -148,7 +154,7 @@
                 com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, true);
         // No stored value in shared preferences if not visited yet.
         final SharedPreferences prefs =
-            new SuggestionFeatureProviderImpl(mContext).getSharedPrefs(mContext);
+                new SuggestionFeatureProviderImpl(mContext).getSharedPrefs(mContext);
         assertThat(isSuggestionComplete(mContext, prefs)).isFalse();
     }
 
@@ -158,9 +164,23 @@
                 com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, true);
         // No stored value in shared preferences if not visited yet.
         final SharedPreferences prefs =
-            new SuggestionFeatureProviderImpl(mContext).getSharedPrefs(mContext);
+                new SuggestionFeatureProviderImpl(mContext).getSharedPrefs(mContext);
         prefs.edit().putBoolean(DoubleTapPowerSettings.PREF_KEY_SUGGESTION_COMPLETE, true).commit();
 
         assertThat(isSuggestionComplete(mContext, prefs)).isTrue();
     }
+
+    @Test
+    public void isSliceableCorrectKey_returnsTrue() {
+        final DoubleTapPowerPreferenceController controller =
+                new DoubleTapPowerPreferenceController(mContext, "gesture_double_tap_power");
+        assertThat(controller.isSliceable()).isTrue();
+    }
+
+    @Test
+    public void isSliceableIncorrectKey_returnsFalse() {
+        final DoubleTapPowerPreferenceController controller =
+                new DoubleTapPowerPreferenceController(mContext, "bad_key");
+        assertThat(controller.isSliceable()).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
index cc9347d..3d25ac7 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
@@ -16,6 +16,10 @@
 
 package com.android.settings.gestures;
 
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.when;
@@ -61,20 +65,6 @@
     }
 
     @Test
-    public void isAvailable_configIsTrue_shouldReturnTrue() {
-        when(mAmbientDisplayConfiguration.pulseOnDoubleTapAvailable()).thenReturn(true);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_configIsFalse_shouldReturnFalse() {
-        when(mAmbientDisplayConfiguration.pulseOnDoubleTapAvailable()).thenReturn(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
     public void testIsChecked_configIsSet_shouldReturnTrue() {
         // Set the setting to be enabled.
         when(mAmbientDisplayConfiguration.pulseOnDoubleTapEnabled(anyInt())).thenReturn(true);
@@ -162,4 +152,46 @@
         when(mAmbientDisplayConfiguration.alwaysOnEnabled(anyInt())).thenReturn(false);
         assertThat(mController.canHandleClicks()).isTrue();
     }
+
+    @Test
+    public void getAvailabilityStatus_aodNotSupported_UNSUPPORTED_ON_DEVICE() {
+        when(mAmbientDisplayConfiguration.doubleTapSensorAvailable()).thenReturn(false);
+        when(mAmbientDisplayConfiguration.ambientDisplayAvailable()).thenReturn(false);
+        final int availabilityStatus = mController.getAvailabilityStatus();
+
+        assertThat(availabilityStatus).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_aodOn_DISABLED_DEPENDENT_SETTING() {
+        when(mAmbientDisplayConfiguration.doubleTapSensorAvailable()).thenReturn(true);
+        when(mAmbientDisplayConfiguration.ambientDisplayAvailable()).thenReturn(false);
+        final int availabilityStatus = mController.getAvailabilityStatus();
+
+        assertThat(availabilityStatus).isEqualTo(DISABLED_DEPENDENT_SETTING);
+    }
+
+    @Test
+    public void getAvailabilityStatus_aodSupported_aodOff_AVAILABLE() {
+        when(mAmbientDisplayConfiguration.doubleTapSensorAvailable()).thenReturn(true);
+        when(mAmbientDisplayConfiguration.ambientDisplayAvailable()).thenReturn(true);
+        final int availabilityStatus = mController.getAvailabilityStatus();
+
+        assertThat(availabilityStatus).isEqualTo(AVAILABLE);
+
+    }
+
+    @Test
+    public void isSliceableCorrectKey_returnsTrue() {
+        final DoubleTapScreenPreferenceController controller =
+                new DoubleTapScreenPreferenceController(mContext,"gesture_double_tap_screen");
+        assertThat(controller.isSliceable()).isTrue();
+    }
+
+    @Test
+    public void isSliceableIncorrectKey_returnsFalse() {
+        final DoubleTapScreenPreferenceController controller =
+                new DoubleTapScreenPreferenceController(mContext, "bad_key");
+        assertThat(controller.isSliceable()).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
index 901da37..0ec5ae1 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
@@ -155,4 +155,18 @@
 
         assertThat(mController.isChecked()).isFalse();
     }
+
+    @Test
+    public void isSliceableCorrectKey_returnsTrue() {
+        final DoubleTwistPreferenceController controller =
+        new DoubleTwistPreferenceController(mContext,"gesture_double_twist");
+        assertThat(controller.isSliceable()).isTrue();
+    }
+
+    @Test
+    public void isSliceableIncorrectKey_returnsFalse() {
+        final DoubleTwistPreferenceController controller =
+        new DoubleTwistPreferenceController(mContext, "bad_key");
+        assertThat(controller.isSliceable()).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java
index 6aa451c..f609373 100644
--- a/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java
@@ -16,6 +16,10 @@
 
 package com.android.settings.gestures;
 
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.doReturn;
@@ -62,20 +66,6 @@
     }
 
     @Test
-    public void isAvailable_configIsTrue_shouldReturnTrue() {
-        when(mAmbientDisplayConfiguration.pulseOnPickupAvailable()).thenReturn(true);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_configIsFalse_shouldReturnFalse() {
-        when(mAmbientDisplayConfiguration.pulseOnPickupAvailable()).thenReturn(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
     public void testIsChecked_configIsSet_shouldReturnTrue() {
         // Set the setting to be enabled.
         when(mAmbientDisplayConfiguration.pulseOnPickupEnabled(anyInt())).thenReturn(true);
@@ -153,4 +143,45 @@
         assertThat(PickupGesturePreferenceController.isSuggestionComplete(mContext, prefs))
                 .isTrue();
     }
+
+    @Test
+    public void getAvailabilityStatus_aodNotSupported_UNSUPPORTED_ON_DEVICE() {
+        when(mAmbientDisplayConfiguration.dozePulsePickupSensorAvailable()).thenReturn(false);
+        when(mAmbientDisplayConfiguration.ambientDisplayAvailable()).thenReturn(false);
+        final int availabilityStatus = mController.getAvailabilityStatus();
+
+        assertThat(availabilityStatus).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_aodOn_DISABLED_DEPENDENT_SETTING() {
+        when(mAmbientDisplayConfiguration.dozePulsePickupSensorAvailable()).thenReturn(true);
+        when(mAmbientDisplayConfiguration.ambientDisplayAvailable()).thenReturn(false);
+        final int availabilityStatus = mController.getAvailabilityStatus();
+
+        assertThat(availabilityStatus).isEqualTo(DISABLED_DEPENDENT_SETTING);
+    }
+
+    @Test
+    public void getAvailabilityStatus_aodSupported_aodOff_AVAILABLE() {
+        when(mAmbientDisplayConfiguration.dozePulsePickupSensorAvailable()).thenReturn(true);
+        when(mAmbientDisplayConfiguration.ambientDisplayAvailable()).thenReturn(true);
+        final int availabilityStatus = mController.getAvailabilityStatus();
+
+        assertThat(availabilityStatus).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void isSliceableCorrectKey_returnsTrue() {
+        final PickupGesturePreferenceController controller =
+                new PickupGesturePreferenceController(mContext,"gesture_pick_up");
+        assertThat(controller.isSliceable()).isTrue();
+    }
+
+    @Test
+    public void isSliceableIncorrectKey_returnsFalse() {
+        final PickupGesturePreferenceController controller =
+                new PickupGesturePreferenceController(mContext, "bad_key");
+        assertThat(controller.isSliceable()).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
index c164fbf..8522229 100644
--- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
@@ -168,4 +168,18 @@
         when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
                 .thenReturn(enabled);
     }
+
+    @Test
+    public void isSliceableCorrectKey_returnsTrue() {
+        final SwipeToNotificationPreferenceController controller = new
+                SwipeToNotificationPreferenceController(mContext,"gesture_swipe_down_fingerprint");
+        assertThat(controller.isSliceable()).isTrue();
+    }
+
+    @Test
+    public void isSliceableIncorrectKey_returnsFalse() {
+        final SwipeToNotificationPreferenceController controller =
+                new SwipeToNotificationPreferenceController(mContext, "bad_key");
+        assertThat(controller.isSliceable()).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java
index 3585650..a001a4a 100644
--- a/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java
@@ -123,4 +123,18 @@
         mController.setChecked(false);
         assertThat(mController.isChecked()).isFalse();
     }
+
+    @Test
+    public void isSliceableCorrectKey_returnsTrue() {
+        final SwipeUpPreferenceController controller =
+                new SwipeUpPreferenceController(mContext,"gesture_swipe_up");
+        assertThat(controller.isSliceable()).isTrue();
+    }
+
+    @Test
+    public void isSliceableIncorrectKey_returnsFalse() {
+        final SwipeUpPreferenceController controller =
+                new SwipeUpPreferenceController(mContext, "bad_key");
+        assertThat(controller.isSliceable()).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java b/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java
new file mode 100644
index 0000000..2f51470
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java
@@ -0,0 +1,65 @@
+package com.android.settings.location;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+import android.content.res.Resources;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SliceTester;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.List;
+
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.SliceMetadata;
+import androidx.slice.SliceProvider;
+import androidx.slice.core.SliceAction;
+import androidx.slice.widget.SliceLiveData;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class LocationSliceBuilderTest {
+
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = spy(RuntimeEnvironment.application);
+
+        // Prevent crash in SliceMetadata.
+        Resources resources = spy(mContext.getResources());
+        doReturn(60).when(resources).getDimensionPixelSize(anyInt());
+        doReturn(resources).when(mContext).getResources();
+
+        // Set-up specs for SliceMetadata.
+        SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
+    }
+
+    @Test
+    public void getLocationSlice_correctSliceContent() {
+        final Slice LocationSlice = LocationSliceBuilder.getSlice(mContext);
+        final SliceMetadata metadata = SliceMetadata.from(mContext, LocationSlice);
+
+        final List<SliceAction> toggles = metadata.getToggles();
+        assertThat(toggles).isEmpty();
+
+        final SliceAction primaryAction = metadata.getPrimaryAction();
+        final IconCompat expectedToggleIcon = IconCompat.createWithResource(mContext,
+                R.drawable.ic_signal_location);
+        assertThat(primaryAction.getIcon().toString()).isEqualTo(expectedToggleIcon.toString());
+
+        final List<SliceItem> sliceItems = LocationSlice.getItems();
+        SliceTester.assertTitle(sliceItems, mContext.getString(R.string.location_settings_title));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelperTest.java b/tests/robotests/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelperTest.java
new file mode 100644
index 0000000..625a68b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelperTest.java
@@ -0,0 +1,281 @@
+/*
+ * 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.mobilenetwork;
+
+import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
+import static android.app.slice.Slice.HINT_TITLE;
+import static android.app.slice.SliceItem.FORMAT_TEXT;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.telephony.CarrierConfigManager;
+
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.SliceMetadata;
+import androidx.slice.SliceProvider;
+import androidx.slice.core.SliceAction;
+import androidx.slice.core.SliceQuery;
+import androidx.slice.widget.SliceLiveData;
+
+import com.android.ims.ImsManager;
+import com.android.settings.R;
+import com.android.settings.slices.SettingsSliceProvider;
+import com.android.settings.slices.SliceBroadcastReceiver;
+import com.android.settings.slices.SlicesFeatureProvider;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class Enhanced4gLteSliceHelperTest {
+
+    private Context mContext;
+    @Mock
+    private CarrierConfigManager mMockCarrierConfigManager;
+
+    @Mock
+    private ImsManager mMockImsManager;
+
+    private FakeEnhanced4gLteSliceHelper mEnhanced4gLteSliceHelper;
+    private SettingsSliceProvider mProvider;
+    private SliceBroadcastReceiver mReceiver;
+    private FakeFeatureFactory mFeatureFactory;
+    private SlicesFeatureProvider mSlicesFeatureProvider;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+
+        //setup for SettingsSliceProvider tests
+        mProvider = spy(new SettingsSliceProvider());
+        doReturn(mContext).when(mProvider).getContext();
+
+        //setup for SliceBroadcastReceiver test
+        mReceiver = spy(new SliceBroadcastReceiver());
+
+        mFeatureFactory = FakeFeatureFactory.setupForTest();
+        mSlicesFeatureProvider = mFeatureFactory.getSlicesFeatureProvider();
+
+        // Prevent crash in SliceMetadata.
+        Resources resources = spy(mContext.getResources());
+        doReturn(60).when(resources).getDimensionPixelSize(anyInt());
+        doReturn(resources).when(mContext).getResources();
+
+        mEnhanced4gLteSliceHelper = new FakeEnhanced4gLteSliceHelper(mContext);
+
+        // Set-up specs for SliceMetadata.
+        SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
+    }
+
+    @Test
+    public void test_CreateEnhanced4gLteSlice_invalidSubId() {
+        mEnhanced4gLteSliceHelper.setDefaultVoiceSubId(-1);
+
+        final Slice slice = mEnhanced4gLteSliceHelper.createEnhanced4gLteSlice(
+                Enhanced4gLteSliceHelper.SLICE_URI);
+
+        assertThat(slice).isNull();
+    }
+
+    @Test
+    public void test_CreateEnhanced4gLteSlice_enhanced4gLteNotSupported() {
+        when(mMockImsManager.isVolteEnabledByPlatform()).thenReturn(false);
+
+        final Slice slice = mEnhanced4gLteSliceHelper.createEnhanced4gLteSlice(
+                Enhanced4gLteSliceHelper.SLICE_URI);
+
+        assertThat(mEnhanced4gLteSliceHelper.getDefaultVoiceSubId()).isEqualTo(1);
+        assertThat(slice).isNull();
+    }
+
+    @Test
+    public void test_CreateEnhanced4gLteSlice_success() {
+        when(mMockImsManager.isVolteEnabledByPlatform()).thenReturn(true);
+        when(mMockImsManager.isVolteProvisionedOnDevice()).thenReturn(true);
+        when(mMockImsManager.isEnhanced4gLteModeSettingEnabledByUser()).thenReturn(true);
+        when(mMockImsManager.isNonTtyOrTtyOnVolteEnabled()).thenReturn(true);
+        when(mMockCarrierConfigManager.getConfigForSubId(1)).thenReturn(null);
+
+        final Slice slice = mEnhanced4gLteSliceHelper.createEnhanced4gLteSlice(
+                Enhanced4gLteSliceHelper.SLICE_URI);
+
+        assertThat(mEnhanced4gLteSliceHelper.getDefaultVoiceSubId()).isEqualTo(1);
+        testEnhanced4gLteSettingsToggleSlice(slice);
+    }
+
+    @Test
+    public void test_SettingSliceProvider_getsRightSliceEnhanced4gLte() {
+        when(mMockImsManager.isVolteEnabledByPlatform()).thenReturn(true);
+        when(mMockImsManager.isVolteProvisionedOnDevice()).thenReturn(true);
+        when(mMockImsManager.isEnhanced4gLteModeSettingEnabledByUser()).thenReturn(true);
+        when(mMockImsManager.isNonTtyOrTtyOnVolteEnabled()).thenReturn(true);
+        when(mMockCarrierConfigManager.getConfigForSubId(1)).thenReturn(null);
+        when(mSlicesFeatureProvider.getNewEnhanced4gLteSliceHelper(mContext))
+                .thenReturn(mEnhanced4gLteSliceHelper);
+
+        final Slice slice = mProvider.onBindSlice(Enhanced4gLteSliceHelper.SLICE_URI);
+
+        assertThat(mEnhanced4gLteSliceHelper.getDefaultVoiceSubId()).isEqualTo(1);
+        testEnhanced4gLteSettingsToggleSlice(slice);
+    }
+
+    @Test
+    public void test_SliceBroadcastReceiver_toggleOffEnhanced4gLte() {
+        when(mMockImsManager.isVolteEnabledByPlatform()).thenReturn(true);
+        when(mMockImsManager.isVolteProvisionedOnDevice()).thenReturn(true);
+        when(mMockImsManager.isEnhanced4gLteModeSettingEnabledByUser()).thenReturn(false);
+        when(mMockImsManager.isNonTtyOrTtyOnVolteEnabled()).thenReturn(true);
+        when(mSlicesFeatureProvider.getNewEnhanced4gLteSliceHelper(mContext))
+                .thenReturn(mEnhanced4gLteSliceHelper);
+
+        ArgumentCaptor<Boolean> mEnhanced4gLteSettingCaptor = ArgumentCaptor.forClass(
+                Boolean.class);
+
+        // turn on Enhanced4gLte setting
+        Intent intent = new Intent(Enhanced4gLteSliceHelper.ACTION_ENHANCED_4G_LTE_CHANGED);
+        intent.putExtra(EXTRA_TOGGLE_STATE, true);
+
+        // change the setting
+        mReceiver.onReceive(mContext, intent);
+
+        verify((mMockImsManager)).setEnhanced4gLteModeSetting(
+                mEnhanced4gLteSettingCaptor.capture());
+
+        // assert the change
+        assertThat(mEnhanced4gLteSettingCaptor.getValue()).isTrue();
+    }
+
+    private void testEnhanced4gLteSettingsUnavailableSlice(Slice slice,
+            PendingIntent expectedPrimaryAction) {
+        final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
+
+        //Check there is no toggle action
+        final List<SliceAction> toggles = metadata.getToggles();
+        assertThat(toggles).isEmpty();
+
+        // Check whether the primary action is to open Enhanced4gLte settings activity
+        final PendingIntent primaryPendingIntent =
+                metadata.getPrimaryAction().getAction();
+        assertThat(primaryPendingIntent).isEqualTo(expectedPrimaryAction);
+
+        // Check the title
+        final List<SliceItem> sliceItems = slice.getItems();
+        assertTitle(sliceItems, mContext.getString(R.string.enhanced_4g_lte_mode_title));
+    }
+
+    private void testEnhanced4gLteSettingsToggleSlice(Slice slice) {
+        final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
+
+        final List<SliceAction> toggles = metadata.getToggles();
+        assertThat(toggles).hasSize(1);
+
+        final SliceAction mainToggleAction = toggles.get(0);
+
+        // Check intent in Toggle Action
+        final PendingIntent togglePendingIntent = mainToggleAction.getAction();
+        final PendingIntent expectedToggleIntent = getBroadcastIntent(
+                Enhanced4gLteSliceHelper.ACTION_ENHANCED_4G_LTE_CHANGED);
+        assertThat(togglePendingIntent).isEqualTo(expectedToggleIntent);
+
+        // Check primary intent
+        final PendingIntent primaryPendingIntent = metadata.getPrimaryAction().getAction();
+        final PendingIntent expectedPendingIntent =
+                getActivityIntent(Enhanced4gLteSliceHelper.ACTION_MOBILE_NETWORK_SETTINGS_ACTIVITY);
+        assertThat(primaryPendingIntent).isEqualTo(expectedPendingIntent);
+
+        // Check the title
+        final List<SliceItem> sliceItems = slice.getItems();
+        assertTitle(sliceItems, mContext.getString(R.string.enhanced_4g_lte_mode_title));
+    }
+
+    private PendingIntent getBroadcastIntent(String action) {
+        final Intent intent = new Intent(action);
+        intent.setClass(mContext, SliceBroadcastReceiver.class);
+        return PendingIntent.getBroadcast(mContext, 0 /* requestCode */, intent,
+                PendingIntent.FLAG_CANCEL_CURRENT);
+    }
+
+    private PendingIntent getActivityIntent(String action) {
+        final Intent intent = new Intent(action);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, 0 /* flags */);
+    }
+
+    private void assertTitle(List<SliceItem> sliceItems, String title) {
+        boolean hasTitle = false;
+        for (SliceItem item : sliceItems) {
+            List<SliceItem> titleItems = SliceQuery.findAll(item, FORMAT_TEXT, HINT_TITLE,
+                    null /* non-hints */);
+            if (titleItems == null) {
+                continue;
+            }
+
+            hasTitle = true;
+            for (SliceItem subTitleItem : titleItems) {
+                assertThat(subTitleItem.getText()).isEqualTo(title);
+            }
+        }
+        assertThat(hasTitle).isTrue();
+    }
+
+    private class FakeEnhanced4gLteSliceHelper extends Enhanced4gLteSliceHelper {
+        int mSubId = 1;
+
+        FakeEnhanced4gLteSliceHelper(Context context) {
+            super(context);
+        }
+
+        @Override
+        protected CarrierConfigManager getCarrierConfigManager() {
+            return mMockCarrierConfigManager;
+        }
+
+        @Override
+        protected ImsManager getImsManager(int subId) {
+            return mMockImsManager;
+        }
+
+        protected int getDefaultVoiceSubId() {
+            return mSubId;
+        }
+
+        protected void setDefaultVoiceSubId(int id) {
+            mSubId = id;
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
index 47e4b5a..4eaffbb 100644
--- a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
@@ -21,13 +21,11 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
-import androidx.lifecycle.LifecycleOwner;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.provider.Settings;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
+import android.provider.SettingsSlicesContract;
 
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.testutils.FakeFeatureFactory;
@@ -43,6 +41,10 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 public class AirplaneModePreferenceControllerTest {
 
@@ -69,12 +71,12 @@
         mResolver = RuntimeEnvironment.application.getContentResolver();
         doReturn(mPackageManager).when(mContext).getPackageManager();
         mController = new AirplaneModePreferenceController(mContext,
-                AirplaneModePreferenceController.KEY_TOGGLE_AIRPLANE);
+                SettingsSlicesContract.KEY_AIRPLANE_MODE);
 
         mPreferenceManager = new PreferenceManager(mContext);
         mScreen = mPreferenceManager.createPreferenceScreen(mContext);
         mPreference = new RestrictedSwitchPreference(mContext);
-        mPreference.setKey("toggle_airplane");
+        mPreference.setKey(SettingsSlicesContract.KEY_AIRPLANE_MODE);
         mScreen.addPreference(mPreference);
         mController.setFragment(null);
         mLifecycleOwner = () -> mLifecycle;
@@ -177,4 +179,18 @@
 
         assertThat(mPreference.isChecked()).isTrue();
     }
+
+    @Test
+    public void isSliceableCorrectKey_returnsTrue() {
+        final AirplaneModePreferenceController controller =
+                new AirplaneModePreferenceController(mContext,"toggle_airplane");
+        assertThat(controller.isSliceable()).isTrue();
+    }
+
+    @Test
+    public void isSliceableIncorrectKey_returnsFalse() {
+        final AirplaneModePreferenceController controller =
+                new AirplaneModePreferenceController(mContext, "bad_key");
+        assertThat(controller.isSliceable()).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
index dfea6fb..72f36c6 100644
--- a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
@@ -19,6 +19,7 @@
 import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OFF;
 import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC;
 import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME;
+import static android.provider.Settings.Global.PRIVATE_DNS_MODE;
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.anyInt;
 import static org.mockito.Mockito.doReturn;
@@ -158,24 +159,21 @@
     public void testOnClick_positiveButtonClicked_saveData() {
         // Set the default settings to OFF
         final ContentResolver contentResolver = mContext.getContentResolver();
-        Settings.Global.putString(contentResolver, Settings.Global.PRIVATE_DNS_MODE,
-                ConnectivityManager.PRIVATE_DNS_MODE_OFF);
+        Settings.Global.putString(contentResolver, PRIVATE_DNS_MODE, PRIVATE_DNS_MODE_OFF);
 
         mPreference.mMode = ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC;
         mPreference.onClick(null, DialogInterface.BUTTON_POSITIVE);
 
         // Change to OPPORTUNISTIC
-        assertThat(Settings.Global.getString(contentResolver,
-                Settings.Global.PRIVATE_DNS_MODE)).isEqualTo(
-                ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC);
+        assertThat(Settings.Global.getString(contentResolver, PRIVATE_DNS_MODE)).isEqualTo(
+                PRIVATE_DNS_MODE_OPPORTUNISTIC);
     }
 
     @Test
     public void testOnClick_negativeButtonClicked_doNothing() {
         // Set the default settings to OFF
         final ContentResolver contentResolver = mContext.getContentResolver();
-        Settings.Global.putString(contentResolver, Settings.Global.PRIVATE_DNS_MODE,
-                ConnectivityManager.PRIVATE_DNS_MODE_OFF);
+        Settings.Global.putString(contentResolver, PRIVATE_DNS_MODE, PRIVATE_DNS_MODE_OFF);
 
         mPreference.mMode = ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC;
         mPreference.onClick(null, DialogInterface.BUTTON_NEGATIVE);
diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java
index 665b3c2..eff20d3 100644
--- a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java
@@ -21,6 +21,7 @@
 import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OFF;
 import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC;
 import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME;
+import static android.provider.Settings.Global.PRIVATE_DNS_DEFAULT_MODE;
 import static android.provider.Settings.Global.PRIVATE_DNS_MODE;
 import static android.provider.Settings.Global.PRIVATE_DNS_SPECIFIER;
 import static com.google.common.truth.Truth.assertThat;
@@ -220,6 +221,34 @@
                 getResourceString(R.string.private_dns_mode_provider_failure));
     }
 
+    @Test
+    public void getSummary_PrivateDnsDefaultMode() {
+        // Default mode is opportunistic, unless overridden by a Settings push.
+        setPrivateDnsMode("");
+        setPrivateDnsProviderHostname("");
+        mController.updateState(mPreference);
+        verify(mController, atLeastOnce()).getSummary();
+        verify(mPreference).setSummary(getResourceString(R.string.private_dns_mode_opportunistic));
+
+        reset(mController);
+        reset(mPreference);
+        // Pretend an emergency gservices setting has disabled default-opportunistic.
+        Settings.Global.putString(mContentResolver, PRIVATE_DNS_DEFAULT_MODE, PRIVATE_DNS_MODE_OFF);
+        mController.updateState(mPreference);
+        verify(mController, atLeastOnce()).getSummary();
+        verify(mPreference).setSummary(getResourceString(R.string.private_dns_mode_off));
+
+        reset(mController);
+        reset(mPreference);
+        // The user interacting with the Private DNS menu, explicitly choosing
+        // opportunistic mode, will be able to use despite the change to the
+        // default setting above.
+        setPrivateDnsMode(PRIVATE_DNS_MODE_OPPORTUNISTIC);
+        mController.updateState(mPreference);
+        verify(mController, atLeastOnce()).getSummary();
+        verify(mPreference).setSummary(getResourceString(R.string.private_dns_mode_opportunistic));
+    }
+
     private void setPrivateDnsMode(String mode) {
         Settings.Global.putString(mContentResolver, PRIVATE_DNS_MODE, mode);
     }
diff --git a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java
index 850f46f..6d0dd28 100644
--- a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java
@@ -33,13 +33,15 @@
 import android.net.NetworkRequest;
 import android.os.IBinder;
 import android.os.UserHandle;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
+import android.provider.SettingsSlicesContract;
 
 import com.android.internal.net.VpnConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -88,7 +90,7 @@
         doReturn(true).when(mController).isAvailable();
         mController.displayPreference(mScreen);
 
-        verify(mPreference).setDependency(AirplaneModePreferenceController.KEY_TOGGLE_AIRPLANE);
+        verify(mPreference).setDependency(SettingsSlicesContract.KEY_AIRPLANE_MODE);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java
index 0fb041b..71f94fd 100644
--- a/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java
@@ -72,7 +72,8 @@
                 UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId())).thenReturn(false);
         when(NfcAdapter.getDefaultAdapter(mContext)).thenReturn(mNfcAdapter);
 
-        mAndroidBeamController = new AndroidBeamPreferenceController(mContext);
+        mAndroidBeamController = new AndroidBeamPreferenceController(mContext,
+                AndroidBeamPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
         mAndroidBeamPreference = new RestrictedPreference(RuntimeEnvironment.application);
         when(mScreen.findPreference(mAndroidBeamController.getPreferenceKey())).thenReturn(
                 mAndroidBeamPreference);
diff --git a/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java b/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java
new file mode 100644
index 0000000..5efa94a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java
@@ -0,0 +1,86 @@
+/*
+ * 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.nfc;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.nfc.NfcAdapter;
+import android.provider.Settings;
+
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowNfcAdapter;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = {ShadowNfcAdapter.class})
+public class NfcAirplaneModeObserverTest {
+
+    Context mContext;
+    private NfcAdapter mNfcAdapter;
+    private SwitchPreference mNfcPreference;
+    private NfcAirplaneModeObserver mNfcAirplaneModeObserver;
+
+    @Before
+    public void setUp() {
+        mContext = ShadowApplication.getInstance().getApplicationContext();
+        mNfcAdapter = NfcAdapter.getDefaultAdapter(mContext);
+
+        mNfcPreference = new SwitchPreference(RuntimeEnvironment.application);
+
+        mNfcAirplaneModeObserver = new NfcAirplaneModeObserver(mContext, mNfcAdapter,
+                (Preference) mNfcPreference);
+    }
+
+    @Test
+    public void NfcAirplaneModeObserver_airplaneOn_shouldDisableNfc() {
+        ReflectionHelpers.setField(mNfcAirplaneModeObserver,
+                "mAirplaneMode", 0);
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.AIRPLANE_MODE_ON, 1);
+
+        mNfcAirplaneModeObserver.onChange(false,
+                NfcAirplaneModeObserver.AIRPLANE_MODE_URI);
+
+        assertThat(mNfcAdapter.isEnabled()).isFalse();
+        assertThat(mNfcPreference.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void NfcAirplaneModeObserver_airplaneOff_shouldEnableNfc() {
+        ReflectionHelpers.setField(mNfcAirplaneModeObserver,
+                "mAirplaneMode", 1);
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.AIRPLANE_MODE_ON, 0);
+
+        mNfcAirplaneModeObserver.onChange(false,
+                NfcAirplaneModeObserver.AIRPLANE_MODE_URI);
+
+        assertThat(mNfcAdapter.isEnabled()).isTrue();
+        assertThat(mNfcPreference.isEnabled()).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java
index 9ddcc69..eaf6425 100644
--- a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
@@ -26,6 +27,9 @@
 import android.os.UserManager;
 import android.provider.Settings;
 
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
@@ -39,9 +43,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 public class NfcPreferenceControllerTest {
 
@@ -69,8 +70,10 @@
         when(mContext.getSystemService(Context.NFC_SERVICE)).thenReturn(mManager);
         when(NfcAdapter.getDefaultAdapter(mContext)).thenReturn(mNfcAdapter);
 
-        mNfcController = new NfcPreferenceController(mContext);
+        mNfcController = new NfcPreferenceController(mContext,
+                NfcPreferenceController.KEY_TOGGLE_NFC);
         mNfcPreference = new SwitchPreference(RuntimeEnvironment.application);
+
         when(mScreen.findPreference(mNfcController.getPreferenceKey())).thenReturn(mNfcPreference);
 
         Settings.Global.putString(mContext.getContentResolver(),
@@ -84,15 +87,17 @@
     }
 
     @Test
-    public void isAvailable_hasNfc_shouldReturnTrue() {
+    public void getAvailabilityStatus_hasNfc_shouldReturnAvailable() {
         when(mNfcAdapter.isEnabled()).thenReturn(true);
-        assertThat(mNfcController.isAvailable()).isTrue();
+        assertThat(mNfcController.getAvailabilityStatus())
+                .isEqualTo(NfcPreferenceController.AVAILABLE);
     }
 
     @Test
-    public void isAvailable_noNfcAdapter_shouldReturnFalse() {
+    public void getAvailabilityStatus_noNfcAdapter_shouldReturnDisabledUnsupported() {
         ReflectionHelpers.setField(mNfcController, "mNfcAdapter", null);
-        assertThat(mNfcController.isAvailable()).isFalse();
+        assertThat(mNfcController.getAvailabilityStatus())
+                .isEqualTo(NfcPreferenceController.UNSUPPORTED_ON_DEVICE);
     }
 
     @Test
@@ -158,4 +163,46 @@
 
         assertThat(keys).hasSize(1);
     }
+    @Test
+    public void setChecked_True_nfcShouldEnable() {
+        mNfcController.setChecked(true);
+        mNfcController.onResume();
+
+        verify(mNfcAdapter).enable();
+    }
+
+    @Test
+    public void setChecked_False_nfcShouldDisable() {
+        mNfcController.setChecked(false);
+        mNfcController.onResume();
+
+        verify(mNfcAdapter).disable();
+    }
+
+    @Test
+    public void hasAsyncUpdate_shouldReturnTrue() {
+        assertThat(mNfcController.hasAsyncUpdate()).isTrue();
+    }
+
+    @Test
+    public void isToggleableInAirplaneMode_containNfc_shouldReturnTrue() {
+        Settings.Global.putString(mContext.getContentResolver(),
+                Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS,
+                Settings.Global.RADIO_NFC);
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.AIRPLANE_MODE_ON, 1);
+
+        assertThat(NfcPreferenceController.isToggleableInAirplaneMode(mContext)).isTrue();
+    }
+
+    @Test
+    public void isToggleableInAirplaneMode_withoutNfc_shouldReturnFalse() {
+        Settings.Global.putString(mContext.getContentResolver(),
+                Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS,
+                "null");
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.AIRPLANE_MODE_ON, 1);
+
+        assertThat(NfcPreferenceController.isToggleableInAirplaneMode(mContext)).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
index 0268711..b85bdda 100644
--- a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
@@ -18,11 +18,16 @@
 package com.android.settings.nfc;
 
 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.when;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
+import android.content.pm.UserInfo;
+import android.os.UserHandle;
+import android.os.UserManager;
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
@@ -45,22 +50,31 @@
 
     static final String PAYMENT_KEY = "nfc_payment";
     static final String FOREGROUND_KEY = "nfc_foreground";
+    static final String PAYMENT_SCREEN_KEY = "nfc_payment_settings_screen";
 
     private Context mContext;
 
     @Mock
-    private PackageManager mManager;
+    private PackageManager mPackageManager;
+
+    @Mock
+    private UserManager mUserManager;
+
+    @Mock
+    private UserInfo mUserInfo;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = spy(RuntimeEnvironment.application);
-        when(mContext.getPackageManager()).thenReturn(mManager);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
+        when(mUserManager.getUserInfo(UserHandle.myUserId())).thenReturn(mUserInfo);
     }
 
     @Test
-    public void getNonIndexableKey_NoNFC_AllKeysAdded() {
-        when(mManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(false);
+    public void getNonIndexableKey_noNFC_allKeysAdded() {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(false);
 
         final List<String> niks =
                 PaymentSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
@@ -70,8 +84,8 @@
     }
 
     @Test
-    public void getNonIndexableKey_NFC_ForegroundKeyAdded() {
-        when(mManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(true);
+    public void getNonIndexableKey_NFC_foregroundKeyAdded() {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(true);
 
         final List<String> niks =
                 PaymentSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
@@ -79,6 +93,27 @@
         assertThat(niks).contains(FOREGROUND_KEY);
     }
 
+    @Test
+    public void getNonIndexableKey_primaryUser_returnsTrue() {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(true);
+
+        final List<String> niks =
+                PaymentSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
+
+        assertThat(niks).containsExactly(FOREGROUND_KEY);
+    }
+
+    @Test
+    public void getNonIndexabkeKey_guestUser_returnsFalse() {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(true);
+        when(mUserInfo.isGuest()).thenReturn(true);
+
+        final List<String> niks =
+                PaymentSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
+
+        assertThat(niks).containsAllOf(FOREGROUND_KEY, PAYMENT_KEY, PAYMENT_SCREEN_KEY);
+    }
+
     @Implements(PaymentBackend.class)
     public static class ShadowPaymentBackend {
         private ArrayList<PaymentBackend.PaymentAppInfo> mAppInfos;
diff --git a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java
index 6e8476c..4f48b77 100644
--- a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java
@@ -73,4 +73,9 @@
     public void getAudioStream_shouldReturnAlarm() {
         assertThat(mController.getAudioStream()).isEqualTo(AudioManager.STREAM_ALARM);
     }
+
+    @Test
+    public void isSliceableCorrectKey_returnsTrue() {
+        assertThat(mController.isSliceable()).isTrue();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java
index 326e495..6899124 100644
--- a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java
@@ -183,4 +183,19 @@
 
         assertThat(updatedValue).isEqualTo(ON);
     }
+
+    @Test
+    public void isSliceableCorrectKey_returnsTrue() {
+        final BadgingNotificationPreferenceController controller =
+                new BadgingNotificationPreferenceController(mContext,
+                        "notification_badging");
+        assertThat(controller.isSliceable()).isTrue();
+    }
+
+    @Test
+    public void isSliceableIncorrectKey_returnsFalse() {
+        final BadgingNotificationPreferenceController controller =
+                new BadgingNotificationPreferenceController(mContext, "bad_key");
+        assertThat(controller.isSliceable()).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java
index fbc9689..a13946e 100644
--- a/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java
@@ -250,8 +250,7 @@
 
         verify(mBackend, times(2)).updateChannel(any(), anyInt(), any());
 
-        // 2 calls for onSwitchChanged + once when calling updateState originally
-        verify(mBackend, times(3)).setNotificationsEnabledForPackage(
+        verify(mBackend, times(2)).setNotificationsEnabledForPackage(
                 anyString(), anyInt(), anyBoolean());
     }
 
diff --git a/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java
index bed45e5..f20409a 100644
--- a/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java
@@ -92,4 +92,18 @@
 
         assertThat(mController.getAudioStream()).isEqualTo(AudioManager.STREAM_BLUETOOTH_SCO);
     }
+
+    @Test
+    public void isSliceableCorrectKey_returnsTrue() {
+        final CallVolumePreferenceController controller =
+        new CallVolumePreferenceController(mContext,"call_volume");
+        assertThat(controller.isSliceable()).isTrue();
+    }
+
+    @Test
+    public void isSliceableIncorrectKey_returnsFalse() {
+        final CallVolumePreferenceController controller =
+        new CallVolumePreferenceController(mContext, "bad_key");
+        assertThat(controller.isSliceable()).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java
index 3659a30..49fd6d4 100644
--- a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import android.content.Context;
 import android.media.AudioManager;
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -33,9 +34,12 @@
 
     private MediaVolumePreferenceController mController;
 
+    private Context mContext;
+
     @Before
     public void setUp() {
-        mController = new MediaVolumePreferenceController(RuntimeEnvironment.application);
+        mContext = RuntimeEnvironment.application;
+        mController = new MediaVolumePreferenceController(mContext);
     }
 
     @Test
@@ -53,4 +57,11 @@
     public void getAudioStream_shouldReturnMusic() {
         assertThat(mController.getAudioStream()).isEqualTo(AudioManager.STREAM_MUSIC);
     }
+
+    @Test
+    public void isSliceableCorrectKey_returnsTrue() {
+        final MediaVolumePreferenceController controller = new MediaVolumePreferenceController(
+                mContext);
+        assertThat(controller.isSliceable()).isTrue();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java
index c209c1b..9d805e8 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java
@@ -95,4 +95,11 @@
     public void getAudioStream_shouldReturnNotification() {
         assertThat(mController.getAudioStream()).isEqualTo(AudioManager.STREAM_NOTIFICATION);
     }
+
+    @Test
+    public void isSliceableCorrectKey_returnsTrue() {
+        final NotificationVolumePreferenceController controller =
+                new NotificationVolumePreferenceController(mContext);
+        assertThat(controller.isSliceable()).isTrue();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java
index e006530..65bc7e6 100644
--- a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java
@@ -97,4 +97,11 @@
     public void getAudioStream_shouldReturnRing() {
         assertThat(mController.getAudioStream()).isEqualTo(AudioManager.STREAM_RING);
     }
+
+    @Test
+    public void isSliceableCorrectKey_returnsTrue() {
+        final RingVolumePreferenceController controller =
+                new RingVolumePreferenceController(mContext);
+        assertThat(controller.isSliceable()).isTrue();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java
index 19dd042..82357d8 100644
--- a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java
@@ -183,4 +183,18 @@
         assertThat(shadowContentResolver.getContentObservers(
                 Settings.System.getUriFor(VIBRATE_WHEN_RINGING))).isEmpty();
     }
+
+    @Test
+    public void isSliceableCorrectKey_returnsTrue() {
+        final VibrateWhenRingPreferenceController controller =
+                new VibrateWhenRingPreferenceController(mContext, "vibrate_when_ringing");
+        assertThat(controller.isSliceable()).isTrue();
+    }
+
+    @Test
+    public void isSliceableIncorrectKey_returnsFalse() {
+        final VibrateWhenRingPreferenceController controller =
+                new VibrateWhenRingPreferenceController(mContext, "bad_key");
+        assertThat(controller.isSliceable()).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java
index 9a2bccd..064c091 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java
@@ -23,12 +23,25 @@
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.doAnswer;
+import org.mockito.stubbing.Answer;
+import org.mockito.invocation.InvocationOnMock;
 
 import android.app.NotificationManager;
 import android.content.ComponentName;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
+import android.database.CharArrayBuffer;
+import android.database.ContentObserver;
+import android.database.Cursor;
+import android.database.DataSetObserver;
+import android.net.Uri;
+import android.os.Bundle;
+
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
@@ -42,6 +55,8 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.shadows.ShadowApplication;
 import org.robolectric.util.ReflectionHelpers;
+import java.util.ArrayList;
+import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 public class ZenModeStarredContactsPreferenceControllerTest {
@@ -148,4 +163,31 @@
 
         assertThat(mMessagesController.isAvailable()).isTrue();
     }
+
+    @Test
+    public void updateSummary_nullCursorValues() {
+        Cursor testCursorWithNullValues = mock(Cursor.class);
+        when(testCursorWithNullValues.moveToFirst()).thenReturn(true);
+
+        doAnswer(new Answer<Boolean>() {
+            int count = 0;
+            @Override
+            public Boolean answer(InvocationOnMock invocation) throws Throwable {
+                if (count < 3) {
+                    count++;
+                    return true;
+                }
+                return false;
+            }
+
+        }).when(testCursorWithNullValues).moveToNext();
+
+        when(testCursorWithNullValues.getString(0)).thenReturn(null);
+
+        // expected - no null  values
+        List<String> contacts = mMessagesController.getStarredContacts(testCursorWithNullValues);
+        for (int i = 0 ; i < contacts.size(); i++) {
+            assertThat(contacts.get(i)).isNotNull();
+        }
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java
index 4544622..9f8e91a 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java
@@ -85,6 +85,7 @@
         ReflectionHelpers.setField(mController, "mBackend", mBackend);
 
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref);
+        mController.displayPreference(mScreen);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/search/DeviceIndexFeatureProviderTest.java b/tests/robotests/src/com/android/settings/search/DeviceIndexFeatureProviderTest.java
index d4c1580..b49ef1d 100644
--- a/tests/robotests/src/com/android/settings/search/DeviceIndexFeatureProviderTest.java
+++ b/tests/robotests/src/com/android/settings/search/DeviceIndexFeatureProviderTest.java
@@ -15,7 +15,6 @@
 package com.android.settings.search;
 
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -23,27 +22,42 @@
 
 import android.app.Activity;
 import android.app.job.JobScheduler;
+import android.os.Binder;
 import android.provider.Settings;
 
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
+import org.robolectric.shadows.ShadowBinder;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 public class DeviceIndexFeatureProviderTest {
 
+    @Mock
+    private JobScheduler mJobScheduler;
     private DeviceIndexFeatureProvider mProvider;
     private Activity mActivity;
 
     @Before
     public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        ShadowBinder.reset();
         FakeFeatureFactory.setupForTest();
         mActivity = spy(Robolectric.buildActivity(Activity.class).create().visible().get());
         mProvider = spy(new DeviceIndexFeatureProviderImpl());
+        when(mActivity.getSystemService(JobScheduler.class)).thenReturn(mJobScheduler);
+    }
+
+    @After
+    public void tearDown() {
+        ShadowBinder.reset();
     }
 
     @Test
@@ -51,7 +65,7 @@
         when(mProvider.isIndexingEnabled()).thenReturn(false);
 
         mProvider.updateIndex(mActivity, false);
-        verify(mProvider, never()).index(any(), any(), any(), any(), any());
+        verify(mJobScheduler, never()).schedule(any());
     }
 
     @Test
@@ -62,18 +76,73 @@
 
         mProvider.updateIndex(mActivity, false);
 
-        verify(mProvider, never()).index(any(), any(), any(), any(), any());
+        verify(mJobScheduler, never()).schedule(any());
     }
 
     @Test
     public void updateIndex_enabled_provisioned_shouldIndex() {
         Settings.Global.putInt(mActivity.getContentResolver(),
                 Settings.Global.DEVICE_PROVISIONED, 1);
-        JobScheduler jobScheduler = mock(JobScheduler.class);
         when(mProvider.isIndexingEnabled()).thenReturn(true);
-        when(mActivity.getSystemService(JobScheduler.class)).thenReturn(jobScheduler);
 
         mProvider.updateIndex(mActivity, false);
-        verify(jobScheduler).schedule(any());
+        verify(mJobScheduler).schedule(any());
+    }
+
+    @Test
+    public void updateIndex_enabled_provisioned_newBuild_shouldIndex() {
+        Settings.Global.putInt(mActivity.getContentResolver(),
+                Settings.Global.DEVICE_PROVISIONED, 1);
+        DeviceIndexFeatureProvider.setIndexState(mActivity);
+        Settings.Global.putString(mActivity.getContentResolver(),
+                DeviceIndexFeatureProvider.INDEX_VERSION, "new version");
+        Settings.Global.putString(mActivity.getContentResolver(),
+                DeviceIndexFeatureProvider.LANGUAGE.toString(),
+                DeviceIndexFeatureProvider.INDEX_LANGUAGE);
+        when(mProvider.isIndexingEnabled()).thenReturn(true);
+
+        mProvider.updateIndex(mActivity, false);
+        verify(mJobScheduler).schedule(any());
+    }
+
+    @Test
+    public void updateIndex_enabled_provisioned_differentUid_shouldNotIndex() {
+        Settings.Global.putInt(mActivity.getContentResolver(),
+                Settings.Global.DEVICE_PROVISIONED, 1);
+        when(mProvider.isIndexingEnabled()).thenReturn(true);
+
+        ShadowBinder.setCallingUid(Binder.getCallingUid() + 2000);
+
+        mProvider.updateIndex(mActivity, false);
+        verify(mJobScheduler, never()).schedule(any());
+    }
+
+    @Test
+    public void updateIndex_enabled_provisioned_newIndex_shouldIndex() {
+        Settings.Global.putInt(mActivity.getContentResolver(),
+                Settings.Global.DEVICE_PROVISIONED, 1);
+        DeviceIndexFeatureProvider.setIndexState(mActivity);
+        Settings.Global.putString(mActivity.getContentResolver(),
+                DeviceIndexFeatureProvider.INDEX_LANGUAGE, "new language");
+
+        when(mProvider.isIndexingEnabled()).thenReturn(true);
+
+        mProvider.updateIndex(mActivity, false);
+        verify(mJobScheduler).schedule(any());
+    }
+
+    @Test
+    public void updateIndex_enabled_provisioned_sameBuild_sameLang_shouldNotIndex() {
+        // Enabled
+        when(mProvider.isIndexingEnabled()).thenReturn(true);
+        // Provisioned
+        Settings.Global.putInt(mActivity.getContentResolver(),
+                Settings.Global.DEVICE_PROVISIONED, 1);
+        // Same build and same language
+        DeviceIndexFeatureProvider.setIndexState(mActivity);
+
+        mProvider.updateIndex(mActivity, false);
+
+        verify(mJobScheduler, never()).schedule(any());
     }
 }
diff --git a/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java b/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java
index ec16893..1c02b99 100644
--- a/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java
+++ b/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java
@@ -45,7 +45,7 @@
 import java.util.List;
 
 import androidx.slice.Slice;
-import androidx.slice.SliceManager;
+import androidx.slice.SliceViewManager;
 import androidx.slice.SliceMetadata;
 
 @RunWith(SettingsRobolectricTestRunner.class)
@@ -57,17 +57,17 @@
 
     private Activity mActivity;
     private DeviceIndexUpdateJobService mJob;
-    private SliceManager mSliceManager;
+    private SliceViewManager mSliceManager;
 
     @Before
     public void setup() {
         FakeFeatureFactory.setupForTest();
         mActivity = spy(Robolectric.buildActivity(Activity.class).create().visible().get());
         mJob = spy(new DeviceIndexUpdateJobService());
-        mSliceManager = mock(SliceManager.class);
+        mSliceManager = mock(SliceViewManager.class);
 
         doReturn(mActivity.getPackageName()).when(mJob).getPackageName();
-        doReturn(mSliceManager).when(mJob).getSliceManager();
+        doReturn(mSliceManager).when(mJob).getSliceViewManager();
         doNothing().when(mJob).jobFinished(null, false);
     }
 
@@ -124,6 +124,7 @@
 
         DeviceIndexFeatureProvider indexFeatureProvider = FakeFeatureFactory.getFactory(mActivity)
                 .getDeviceIndexFeatureProvider();
+        verify(indexFeatureProvider).clearIndex(any());
         verify(indexFeatureProvider, times(1)).index(any(), any(), any(), any(), any());
     }
 
@@ -143,4 +144,4 @@
         when(mSliceManager.getSliceDescendants(BASE_URI)).thenReturn(mUris);
     }
 
-}
\ No newline at end of file
+}
diff --git a/tests/robotests/src/com/android/settings/slices/FakePreferenceController.java b/tests/robotests/src/com/android/settings/slices/FakePreferenceController.java
index 6c861db..d0e33f0ec 100644
--- a/tests/robotests/src/com/android/settings/slices/FakePreferenceController.java
+++ b/tests/robotests/src/com/android/settings/slices/FakePreferenceController.java
@@ -35,4 +35,9 @@
     public int getSliceType() {
         return SliceData.SliceType.SLIDER;
     }
+
+    @Override
+    public boolean isSliceable() {
+        return true;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
index fe6d512..6b1262a 100644
--- a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
@@ -18,34 +18,42 @@
 package com.android.settings.slices;
 
 import static android.content.ContentResolver.SCHEME_CONTENT;
-
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.ArgumentMatchers.eq;
+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.app.slice.SliceManager;
+import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
 import android.os.StrictMode;
 import android.provider.SettingsSlicesContract;
+import android.util.ArraySet;
 
-import com.android.settings.wifi.WifiSliceBuilder;
+import com.android.settings.bluetooth.BluetoothSliceBuilder;
+import com.android.settings.location.LocationSliceBuilder;
 import com.android.settings.notification.ZenModeSliceBuilder;
 import com.android.settings.testutils.DatabaseTestUtils;
 import com.android.settings.testutils.FakeToggleController;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowThreadUtils;
+import com.android.settings.wifi.WifiSliceBuilder;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.annotation.Resetter;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -53,6 +61,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import androidx.slice.Slice;
 
@@ -60,6 +69,7 @@
  * TODO Investigate using ShadowContentResolver.registerProviderInternal(String, ContentProvider)
  */
 @RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = ShadowThreadUtils.class)
 public class SettingsSliceProviderTest {
 
     private static final String KEY = "KEY";
@@ -79,7 +89,9 @@
     private SliceManager mManager;
 
     private static final List<Uri> SPECIAL_CASE_PLATFORM_URIS = Arrays.asList(
-            WifiSliceBuilder.WIFI_URI
+            WifiSliceBuilder.WIFI_URI,
+            BluetoothSliceBuilder.BLUETOOTH_URI,
+            LocationSliceBuilder.LOCATION_URI
     );
 
     private static final List<Uri> SPECIAL_CASE_OEM_URIS = Arrays.asList(
@@ -90,6 +102,7 @@
     public void setUp() {
         mContext = spy(RuntimeEnvironment.application);
         mProvider = spy(new SettingsSliceProvider());
+        ShadowStrictMode.reset();
         mProvider.mSliceWeakDataCache = new HashMap<>();
         mProvider.mSliceDataCache = new HashMap<>();
         mProvider.mSlicesDatabaseAccessor = new SlicesDatabaseAccessor(mContext);
@@ -104,6 +117,7 @@
 
     @After
     public void cleanUp() {
+        ShadowThreadUtils.reset();
         DatabaseTestUtils.clearDb(mContext);
     }
 
@@ -176,7 +190,8 @@
     }
 
     @Test
-    public void onBindSlice_shouldNotOverrideStrictMode() {
+    public void onBindSlice_mainThread_shouldNotOverrideStrictMode() {
+        ShadowThreadUtils.setIsMainThread(true);
         final StrictMode.ThreadPolicy oldThreadPolicy = StrictMode.getThreadPolicy();
         SliceData data = getDummyData();
         mProvider.mSliceWeakDataCache.put(data.getUri(), data);
@@ -188,6 +203,36 @@
     }
 
     @Test
+    @Config(shadows = ShadowStrictMode.class)
+    public void onBindSlice_backgroundThread_shouldOverrideStrictMode() {
+        ShadowThreadUtils.setIsMainThread(false);
+
+        SliceData data = getDummyData();
+        mProvider.mSliceWeakDataCache.put(data.getUri(), data);
+        mProvider.onBindSlice(data.getUri());
+
+        assertThat(ShadowStrictMode.isThreadPolicyOverridden()).isTrue();
+    }
+
+    @Test
+    public void onBindSlice_requestsBlockedSlice_returnsNull() {
+        final String blockedKey = "blocked_key";
+        final Set<String> blockedSet = new ArraySet<>();
+        blockedSet.add(blockedKey);
+        doReturn(blockedSet).when(mProvider).getBlockedKeys();
+        final Uri blockedUri = new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+                .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
+                .appendPath(blockedKey)
+                .build();
+
+        final Slice slice = mProvider.onBindSlice(blockedUri);
+
+        assertThat(slice).isNull();
+    }
+
+    @Test
     public void testLoadSlice_cachedEntryRemovedOnUnpin() {
         SliceData data = getDummyData();
         mProvider.mSliceDataCache.put(data.getUri(), data);
@@ -399,6 +444,18 @@
         assertThat(wifiSlice.getUri()).isEqualTo(WifiSliceBuilder.WIFI_URI);
     }
 
+    @Test
+    public void onSlicePinned_noIntentRegistered_specialCaseUri_doesNotCrash() {
+        final Uri uri = new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(SettingsSlicesContract.AUTHORITY)
+                .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
+                .appendPath(SettingsSlicesContract.KEY_LOCATION)
+                .build();
+
+        mProvider.onSlicePinned(uri);
+    }
+
     private void insertSpecialCase(String key) {
         insertSpecialCase(key, true);
     }
@@ -418,7 +475,7 @@
         mDb.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values);
     }
 
-    private SliceData getDummyData() {
+    private static SliceData getDummyData() {
         return new SliceData.Builder()
                 .setKey(KEY)
                 .setTitle(TITLE)
@@ -430,4 +487,24 @@
                 .setPreferenceControllerClassName(PREF_CONTROLLER)
                 .build();
     }
+
+    @Implements(value = StrictMode.class, inheritImplementationMethods = true)
+    public static class ShadowStrictMode {
+
+        private static int sSetThreadPolicyCount;
+
+        @Resetter
+        public static void reset() {
+            sSetThreadPolicyCount = 0;
+        }
+
+        @Implementation
+        public static void setThreadPolicy(final StrictMode.ThreadPolicy policy) {
+            sSetThreadPolicyCount++;
+        }
+
+        public static boolean isThreadPolicyOverridden() {
+            return sSetThreadPolicyCount != 0;
+        }
+    }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
index f03f88e..6d18449 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
@@ -23,6 +23,7 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
@@ -95,8 +96,16 @@
     @Test
     public void onReceive_toggleChanged() {
         final String key = "key";
+        final Uri uri = new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+                .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
+                .appendPath(key)
+                .build();
         mSearchFeatureProvider.getSearchIndexableResources().getProviderValues().clear();
         insertSpecialCase(key);
+        final ContentResolver resolver = mock(ContentResolver.class);
+        doReturn(resolver).when(mContext).getContentResolver();
         // Turn on toggle setting
         FakeToggleController fakeToggleController = new FakeToggleController(mContext, key);
         fakeToggleController.setChecked(true);
@@ -120,14 +129,81 @@
         assertThat(namePair.first).isEqualTo(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME);
         assertThat(namePair.second).isEqualTo(fakeToggleController.getPreferenceKey());
 
+        verify(resolver).notifyChange(uri, null);
         assertThat(valuePair.first)
                 .isEqualTo(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE);
         assertThat(valuePair.second).isEqualTo(0);
     }
 
     @Test
+    public void toggleUpdate_synchronously_notifyChange_should_be_called() {
+        // Monitor the ContentResolver
+        final ContentResolver resolver = spy(mContext.getContentResolver());
+        doReturn(resolver).when(mContext).getContentResolver();
+
+        final String key = "key";
+        mSearchFeatureProvider.getSearchIndexableResources().getProviderValues().clear();
+        insertSpecialCase(key);
+
+        FakeToggleController fakeToggleController = new FakeToggleController(mContext, key);
+        fakeToggleController.setChecked(true);
+        // Set the toggle setting update synchronously.
+        fakeToggleController.setAsyncUpdate(false);
+        Intent intent = new Intent(SettingsSliceProvider.ACTION_TOGGLE_CHANGED);
+        intent.putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, key);
+
+        assertThat(fakeToggleController.isChecked()).isTrue();
+
+        // Toggle setting
+        mReceiver.onReceive(mContext, intent);
+
+        assertThat(fakeToggleController.isChecked()).isFalse();
+
+        final Uri expectedUri = new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+                .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
+                .appendPath(key)
+                .build();
+        verify(resolver).notifyChange(expectedUri, null);
+    }
+
+    @Test
+    public void toggleUpdate_asynchronously_notifyChange_should_not_be_called() {
+        // Monitor the ContentResolver
+        final ContentResolver resolver = spy(mContext.getContentResolver());
+        doReturn(resolver).when(mContext).getContentResolver();
+
+        final String key = "key";
+        mSearchFeatureProvider.getSearchIndexableResources().getProviderValues().clear();
+        insertSpecialCase(key);
+
+        FakeToggleController fakeToggleController = new FakeToggleController(mContext, key);
+        fakeToggleController.setChecked(true);
+        // Set the toggle setting update asynchronously.
+        fakeToggleController.setAsyncUpdate(true);
+        Intent intent = new Intent(SettingsSliceProvider.ACTION_TOGGLE_CHANGED);
+        intent.putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, key);
+
+        assertThat(fakeToggleController.isChecked()).isTrue();
+
+        // Toggle setting
+        mReceiver.onReceive(mContext, intent);
+
+        verify(resolver, never()).notifyChange(null, null);
+    }
+
+    @Test
     public void onReceive_sliderChanged() {
         final String key = "key";
+        final Uri uri = new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+                .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
+                .appendPath(key)
+                .build();
+        final ContentResolver resolver = mock(ContentResolver.class);
+        doReturn(resolver).when(mContext).getContentResolver();
         final int position = FakeSliderController.MAX_STEPS - 1;
         final int oldPosition = FakeSliderController.MAX_STEPS;
         mSearchFeatureProvider.getSearchIndexableResources().getProviderValues().clear();
@@ -158,6 +234,7 @@
         assertThat(namePair.first).isEqualTo(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME);
         assertThat(namePair.second).isEqualTo(key);
 
+        verify(resolver).notifyChange(uri, null);
         assertThat(valuePair.first)
                 .isEqualTo(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE);
         assertThat(valuePair.second).isEqualTo(position);
@@ -231,8 +308,12 @@
 
         // Check the value is the same and the Uri has been notified.
         assertThat(fakeToggleController.isChecked()).isTrue();
-        final Uri expectedUri = SliceBuilderUtils.getUri(
-                SettingsSlicesContract.PATH_SETTING_ACTION + "/" + key, false);
+        final Uri expectedUri = new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+                .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
+                .appendPath(key)
+                .build();
         verify(resolver).notifyChange(eq(expectedUri), eq(null));
     }
 
@@ -268,8 +349,12 @@
 
         // Check position is the same and the Uri has been notified.
         assertThat(fakeSliderController.getSliderPosition()).isEqualTo(oldPosition);
-        final Uri expectedUri = SliceBuilderUtils.getUri(
-                SettingsSlicesContract.PATH_SETTING_ACTION + "/" + key, false);
+        final Uri expectedUri = new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+                .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
+                .appendPath(key)
+                .build();
         verify(resolver).notifyChange(eq(expectedUri), eq(null));
     }
 
diff --git a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
index 00e8fe1..96e475e 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
@@ -336,7 +336,7 @@
 
         final Slice slice = SliceBuilderUtils.buildSlice(mContext, data);
 
-        SliceTester.testSettingsUnavailableSlice(mContext, slice, data);
+        assertThat(slice).isNull();
     }
 
     @Test
@@ -349,7 +349,7 @@
 
         final Slice slice = SliceBuilderUtils.buildSlice(mContext, data);
 
-        SliceTester.testSettingsUnavailableSlice(mContext, slice, data);
+        assertThat(slice).isNull();
     }
 
     @Test
@@ -394,7 +394,7 @@
                 .isEqualTo(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME);
         assertThat(capturedLoggingPair.second)
                 .isEqualTo(data.getKey());
-        SliceTester.testSettingsUnavailableSlice(mContext, slice, data);
+        assertThat(slice).isNull();
     }
 
     @Test
@@ -408,16 +408,6 @@
         assertThat(intentData).isEqualTo(expectedUri);
     }
 
-    @Test
-    public void getSettingsIntent_createsIntentToSettings() {
-        final Intent intent = new Intent(Settings.ACTION_SETTINGS);
-        final PendingIntent expectedIntent = PendingIntent.getActivity(mContext, 0, intent, 0);
-
-        final PendingIntent settingsIntent = SliceBuilderUtils.getSettingsIntent(mContext);
-
-        assertThat(expectedIntent).isEqualTo(settingsIntent);
-    }
-
     private SliceData getDummyData() {
         return getDummyData(TOGGLE_CONTROLLER, SUMMARY, SliceData.SliceType.SWITCH, SCREEN_TITLE);
     }
diff --git a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java
index 1788d93..c571d85 100644
--- a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java
@@ -70,6 +70,11 @@
         mAccessor = spy(new SlicesDatabaseAccessor(mContext));
         mDb = SlicesDatabaseHelper.getInstance(mContext).getWritableDatabase();
         SlicesDatabaseHelper.getInstance(mContext).setIndexedState();
+
+        // Register the fake a11y Service
+        ShadowAccessibilityManager shadowAccessibilityManager = Shadow.extract(
+                RuntimeEnvironment.application.getSystemService(AccessibilityManager.class));
+        shadowAccessibilityManager.setInstalledAccessibilityServiceList(new ArrayList<>());
     }
 
     @After
@@ -173,10 +178,6 @@
     public void getSliceKeys_indexesDatabase() {
         // Force new indexing
         Locale.setDefault(new Locale("ca"));
-        // Register the fake a11y Service
-        ShadowAccessibilityManager shadowAccessibilityManager = Shadow.extract(
-                RuntimeEnvironment.application.getSystemService(AccessibilityManager.class));
-        shadowAccessibilityManager.setInstalledAccessibilityServiceList(new ArrayList<>());
         final SearchFeatureProvider provider = new SearchFeatureProviderImpl();
         final SlicesFeatureProvider sliceProvider = spy(new SlicesFeatureProviderImpl());
         final FakeFeatureFactory factory = FakeFeatureFactory.setupForTest();
diff --git a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
index fa7e1db..56a5aa7 100644
--- a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
@@ -42,6 +42,7 @@
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothManager;
+import android.content.pm.PackageManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.IntentFilter;
@@ -72,7 +73,9 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
 import org.robolectric.shadows.ShadowBluetoothDevice;
+import org.robolectric.shadows.ShadowPackageManager;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -122,6 +125,7 @@
     private List<BluetoothDevice> mProfileConnectedDevices;
     private List<BluetoothDevice> mHearingAidActiveDevices;
     private List<BluetoothDevice> mEmptyDevices;
+    private ShadowPackageManager mPackageManager;
 
     @Before
     public void setUp() {
@@ -139,6 +143,8 @@
         when(mLocalBluetoothProfileManager.getA2dpProfile()).thenReturn(mA2dpProfile);
         when(mLocalBluetoothProfileManager.getHearingAidProfile()).thenReturn(mHearingAidProfile);
         when(mLocalBluetoothProfileManager.getHeadsetProfile()).thenReturn(mHeadsetProfile);
+        mPackageManager = Shadow.extract(mContext.getPackageManager());
+        mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, true);
 
         mBluetoothManager = new BluetoothManager(mContext);
         mBluetoothAdapter = mBluetoothManager.getAdapter();
@@ -174,13 +180,46 @@
     }
 
     @Test
-    public void getAvailabilityStatus_byDefault_isAvailable() {
+    public void constructor_notSupportBluetooth_shouldReturnBeforeUsingLocalBluetoothManager() {
+        ShadowBluetoothUtils.reset();
+        mLocalBluetoothManager = ShadowBluetoothUtils.getLocalBtManager(mContext);
+
+        AudioSwitchPreferenceController controller = new AudioSwitchPreferenceControllerTestable(
+                mContext, TEST_KEY);
+
+        assertThat(mLocalBluetoothManager).isNull();
+    }
+
+    @Test
+    public void getAvailabilityStatus_disableFlagNoBluetoothFeature_returnUnavailable() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.AUDIO_SWITCHER_SETTINGS, false);
+        mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, false);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_disableFlagWithBluetoothFeature_returnUnavailable() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.AUDIO_SWITCHER_SETTINGS, false);
+        mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, true);
+
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_enableFlagWithBluetoothFeature_returnAvailable() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.AUDIO_SWITCHER_SETTINGS, true);
+        mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, true);
+
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }
 
     @Test
-    public void getAvailabilityStatus_whenNotVisible_isDisable() {
-        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.AUDIO_SWITCHER_SETTINGS, false);
+    public void getAvailabilityStatus_enableFlagNoBluetoothFeature_returnUnavailable() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.AUDIO_SWITCHER_SETTINGS, true);
+        mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, false);
+
         assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
 
@@ -226,7 +265,7 @@
 
         mController.onPreferenceChange(mPreference, TEST_DEVICE_ADDRESS_1);
 
-        assertThat(mPreference.getSummary()).isEqualTo(mBluetoothDevice.getName());
+        assertThat(mPreference.getSummary()).isEqualTo(TEST_DEVICE_NAME_1);
     }
 
     /**
@@ -246,7 +285,7 @@
 
         mController.onPreferenceChange(mPreference, TEST_DEVICE_ADDRESS_2);
 
-        assertThat(mPreference.getSummary()).isEqualTo(secondBluetoothDevice.getName());
+        assertThat(mPreference.getSummary()).isEqualTo(TEST_DEVICE_NAME_2);
     }
 
     /**
diff --git a/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java
index 381587a..4e67143 100644
--- a/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java
@@ -253,7 +253,7 @@
         mController.updateState(mPreference);
 
         assertThat(mPreference.isVisible()).isTrue();
-        assertThat(mPreference.getSummary()).isEqualTo(mBluetoothDevice.getName());
+        assertThat(mPreference.getSummary()).isEqualTo(TEST_DEVICE_NAME_1);
     }
 
     /**
@@ -275,7 +275,7 @@
         mController.updateState(mPreference);
 
         assertThat(mPreference.isVisible()).isTrue();
-        assertThat(mPreference.getSummary()).isEqualTo(mSecondBluetoothDevice.getName());
+        assertThat(mPreference.getSummary()).isEqualTo(TEST_DEVICE_NAME_2);
     }
 
     /**
diff --git a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
index 0b894da..e1b9301 100644
--- a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
@@ -305,7 +305,7 @@
         mController.updateState(mPreference);
 
         assertThat(mPreference.isVisible()).isTrue();
-        assertThat(mPreference.getSummary()).isEqualTo(mBluetoothDevice.getName());
+        assertThat(mPreference.getSummary()).isEqualTo(TEST_DEVICE_NAME_1);
     }
 
     /**
@@ -326,7 +326,7 @@
         mController.updateState(mPreference);
 
         assertThat(mPreference.isVisible()).isTrue();
-        assertThat(mPreference.getSummary()).isEqualTo(mSecondBluetoothDevice.getName());
+        assertThat(mPreference.getSummary()).isEqualTo(TEST_DEVICE_NAME_2);
     }
 
     /**
diff --git a/tests/robotests/src/com/android/settings/testutils/FakeSliderController.java b/tests/robotests/src/com/android/settings/testutils/FakeSliderController.java
index 530bdee..ca306da 100644
--- a/tests/robotests/src/com/android/settings/testutils/FakeSliderController.java
+++ b/tests/robotests/src/com/android/settings/testutils/FakeSliderController.java
@@ -53,4 +53,9 @@
         return Settings.Global.getInt(mContext.getContentResolver(),
                 AVAILABILITY_KEY, AVAILABLE);
     }
+
+    @Override
+    public boolean isSliceable() {
+        return true;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java b/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java
index bae267a..8e408f0 100644
--- a/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java
+++ b/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java
@@ -36,6 +36,8 @@
     private final int ON = 1;
     private final int OFF = 0;
 
+    private boolean mIsAsyncUpdate = false;
+
     public FakeToggleController(Context context, String preferenceKey) {
         super(context, preferenceKey);
     }
@@ -62,4 +64,18 @@
     public IntentFilter getIntentFilter() {
         return INTENT_FILTER;
     }
+
+    @Override
+    public boolean isSliceable() {
+        return true;
+    }
+
+    @Override
+    public boolean hasAsyncUpdate() {
+        return mIsAsyncUpdate;
+    }
+
+    public void setAsyncUpdate(boolean isAsyncUpdate) {
+        mIsAsyncUpdate = isAsyncUpdate;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/testutils/FakeUnavailablePreferenceController.java b/tests/robotests/src/com/android/settings/testutils/FakeUnavailablePreferenceController.java
index 1ceaad8..eef4761 100644
--- a/tests/robotests/src/com/android/settings/testutils/FakeUnavailablePreferenceController.java
+++ b/tests/robotests/src/com/android/settings/testutils/FakeUnavailablePreferenceController.java
@@ -18,4 +18,9 @@
         return Settings.Global.getInt(mContext.getContentResolver(),
                 AVAILABILITY_KEY, 0);
     }
+
+    @Override
+    public boolean isSliceable() {
+        return true;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/testutils/ShadowIconDrawableFactory.java b/tests/robotests/src/com/android/settings/testutils/ShadowIconDrawableFactory.java
new file mode 100644
index 0000000..cfba1e1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/ShadowIconDrawableFactory.java
@@ -0,0 +1,35 @@
+/*
+ * 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.testutils;
+
+import android.content.pm.ApplicationInfo;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.util.IconDrawableFactory;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@Implements(IconDrawableFactory.class)
+public class ShadowIconDrawableFactory {
+
+    @Implementation
+    public Drawable getBadgedIcon(ApplicationInfo appInfo) {
+        return new ColorDrawable(Color.BLUE);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/SliceTester.java b/tests/robotests/src/com/android/settings/testutils/SliceTester.java
index d71abb3..e72168d 100644
--- a/tests/robotests/src/com/android/settings/testutils/SliceTester.java
+++ b/tests/robotests/src/com/android/settings/testutils/SliceTester.java
@@ -43,6 +43,7 @@
 import androidx.slice.builders.ListBuilder;
 import androidx.slice.core.SliceAction;
 import androidx.slice.core.SliceQuery;
+import androidx.slice.widget.EventInfo;
 
 import androidx.core.graphics.drawable.IconCompat;
 
@@ -75,7 +76,7 @@
 
         final SliceItem colorItem = SliceQuery.findSubtype(slice, FORMAT_INT, SUBTYPE_COLOR);
         final int color = colorItem.getInt();
-        assertThat(color).isEqualTo(Utils.getColorAccent(context));
+        assertThat(color).isEqualTo(Utils.getColorAccentDefaultColor(context));
 
         final List<SliceAction> toggles = metadata.getToggles();
         assertThat(toggles).isEmpty();
@@ -105,7 +106,7 @@
 
         final SliceItem colorItem = SliceQuery.findSubtype(slice, FORMAT_INT, SUBTYPE_COLOR);
         final int color = colorItem.getInt();
-        assertThat(color).isEqualTo(Utils.getColorAccent(context));
+        assertThat(color).isEqualTo(Utils.getColorAccentDefaultColor(context));
 
         final List<SliceAction> toggles = metadata.getToggles();
         assertThat(toggles).hasSize(1);
@@ -148,16 +149,22 @@
 
         final SliceItem colorItem = SliceQuery.findSubtype(slice, FORMAT_INT, SUBTYPE_COLOR);
         final int color = colorItem.getInt();
-        assertThat(color).isEqualTo(Utils.getColorAccent(context));
+        assertThat(color).isEqualTo(Utils.getColorAccentDefaultColor(context));
 
-        final IconCompat expectedToggleIcon = IconCompat.createWithResource(context,
+        final SliceAction primaryAction = metadata.getPrimaryAction();
+
+        final IconCompat expectedIcon = IconCompat.createWithResource(context,
                 sliceData.getIconResource());
+        assertThat(expectedIcon.toString()).isEqualTo(primaryAction.getIcon().toString());
 
         final long sliceTTL = metadata.getExpiry();
         assertThat(sliceTTL).isEqualTo(ListBuilder.INFINITY);
 
+        final int headerType = metadata.getHeaderType();
+        assertThat(headerType).isEqualTo(EventInfo.ROW_TYPE_SLIDER);
+
         // Check primary intent
-        final PendingIntent primaryPendingIntent = metadata.getPrimaryAction().getAction();
+        final PendingIntent primaryPendingIntent = primaryAction.getAction();
         assertThat(primaryPendingIntent).isEqualTo(
                 SliceBuilderUtils.getContentPendingIntent(context, sliceData));
 
@@ -185,26 +192,14 @@
 
         final SliceItem colorItem = SliceQuery.findSubtype(slice, FORMAT_INT, SUBTYPE_COLOR);
         final int color = colorItem.getInt();
-        assertThat(color).isEqualTo(Utils.getColorAccent(context));
+        assertThat(color).isEqualTo(Utils.getColorAccentDefaultColor(context));
 
         final List<SliceAction> toggles = metadata.getToggles();
         assertThat(toggles).isEmpty();
 
         final PendingIntent primaryPendingIntent = metadata.getPrimaryAction().getAction();
-        final int availabilityStatus = SliceBuilderUtils.getPreferenceController(context,
-                sliceData).getAvailabilityStatus();
-        switch (availabilityStatus) {
-            case UNSUPPORTED_ON_DEVICE:
-            case CONDITIONALLY_UNAVAILABLE:
-                assertThat(primaryPendingIntent).isEqualTo(
-                        SliceBuilderUtils.getSettingsIntent(context));
-                break;
-            case DISABLED_FOR_USER:
-            case DISABLED_DEPENDENT_SETTING:
-                assertThat(primaryPendingIntent).isEqualTo(
-                        SliceBuilderUtils.getContentPendingIntent(context, sliceData));
-                break;
-        }
+        assertThat(primaryPendingIntent).isEqualTo(SliceBuilderUtils.getContentPendingIntent(
+                context, sliceData));
 
         final List<SliceItem> sliceItems = slice.getItems();
         assertTitle(sliceItems, sliceData.getTitle());
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
index 167abc4..b184eb2 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
@@ -1,7 +1,6 @@
 package com.android.settings.testutils.shadow;
 
 import static android.util.TypedValue.TYPE_REFERENCE;
-
 import static org.robolectric.RuntimeEnvironment.application;
 import static org.robolectric.Shadows.shadowOf;
 import static org.robolectric.shadow.api.Shadow.directlyOn;
@@ -122,8 +121,6 @@
             id = R.drawable.ic_settings_wireless;
         } else if (id == R.drawable.app_filter_spinner_background) {
             id = R.drawable.ic_expand_more_inverse;
-        } else if (id == R.drawable.selectable_card_grey) {
-            id = R.drawable.ic_expand_more_inverse;
         }
         return super.loadDrawable(value, id, theme);
     }
@@ -135,6 +132,14 @@
                 || id == com.android.settings.R.array.batterymeter_plus_points) {
             return new int[2];
         }
+
+        final Object override;
+        synchronized (sResourceOverrides) {
+            override = sResourceOverrides.get(id);
+        }
+        if (override instanceof int[]) {
+            return (int[]) override;
+        }
         return directlyOn(realResources, Resources.class).getIntArray(id);
     }
 
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java
index 3fb8e2d..e9c7b58 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java
@@ -50,8 +50,6 @@
             id = R.drawable.ic_settings_wireless;
         } else if (id == R.drawable.app_filter_spinner_background) {
             id = R.drawable.ic_expand_more_inverse;
-        } else if (id == R.drawable.selectable_card_grey) {
-            id = R.drawable.ic_expand_more_inverse;
         } else if (id == R.drawable.color_bar_progress
                 || id == R.drawable.ring_progress) {
             // color_bar_progress and ring_progress use hidden resources, so just use the regular
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothAdapter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothAdapter.java
new file mode 100644
index 0000000..2bd2ec3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothAdapter.java
@@ -0,0 +1,36 @@
+/*
+ * 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.testutils.shadow;
+
+import android.bluetooth.BluetoothAdapter;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Implements(value = BluetoothAdapter.class, inheritImplementationMethods = true)
+public class ShadowBluetoothAdapter extends org.robolectric.shadows.ShadowBluetoothAdapter {
+    /**
+     * Do nothing, implement it to avoid null pointer error inside BluetoothAdapter
+     */
+    @Implementation
+    public List<Integer> getSupportedProfiles() {
+        return new ArrayList<Integer>();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLocalBluetoothAdapter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLocalBluetoothAdapter.java
new file mode 100644
index 0000000..ddac6c7
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLocalBluetoothAdapter.java
@@ -0,0 +1,55 @@
+/*
+ * 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.testutils.shadow;
+
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@Implements(LocalBluetoothAdapter.class)
+public class ShadowLocalBluetoothAdapter {
+
+    private static String sName;
+    private boolean isBluetoothEnabled = true;
+
+    public static void setName(String name) {
+        sName = name;
+    }
+
+    @Implementation
+    public String getName() {
+        return sName;
+    }
+
+    @Implementation
+    public boolean isEnabled() {
+        return isBluetoothEnabled;
+    }
+
+    @Implementation
+    public boolean enable() {
+        isBluetoothEnabled = true;
+        return true;
+    }
+
+    @Implementation
+    public boolean disable() {
+        isBluetoothEnabled = false;
+        return true;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLocalBluetoothProfileManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLocalBluetoothProfileManager.java
new file mode 100644
index 0000000..9e64e34
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLocalBluetoothProfileManager.java
@@ -0,0 +1,38 @@
+/*
+ * 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.testutils.shadow;
+
+import android.content.Context;
+
+import com.android.settingslib.bluetooth.BluetoothEventManager;
+import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
+
+import org.robolectric.annotation.Implements;
+
+@Implements(LocalBluetoothProfileManager.class)
+public class ShadowLocalBluetoothProfileManager {
+
+    public void __constructor__(Context context,
+            LocalBluetoothAdapter adapter,
+            CachedBluetoothDeviceManager deviceManager,
+            BluetoothEventManager eventManager) {
+
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNfcAdapter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNfcAdapter.java
index e4421ee..07c8e54 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNfcAdapter.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNfcAdapter.java
@@ -33,6 +33,7 @@
 @Implements(NfcAdapter.class)
 public class ShadowNfcAdapter {
     private static boolean sReaderModeEnabled;
+    private boolean mIsNfcEnabled = false;
 
     @Implementation
     public void enableReaderMode(Activity activity, NfcAdapter.ReaderCallback callback, int flags,
@@ -46,6 +47,23 @@
                 NfcAdapter.class, ClassParameter.from(Context.class, context));
     }
 
+    @Implementation
+    public boolean isEnabled() {
+        return mIsNfcEnabled;
+    }
+
+    @Implementation
+    public boolean enable() {
+        mIsNfcEnabled = true;
+        return true;
+    }
+
+    @Implementation
+    public boolean disable() {
+        mIsNfcEnabled = false;
+        return true;
+    }
+
     public static boolean isReaderModeEnabled() {
         return sReaderModeEnabled;
     }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowThreadUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowThreadUtils.java
index 6b0411e..9513098 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowThreadUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowThreadUtils.java
@@ -20,10 +20,18 @@
 
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
+import org.robolectric.annotation.Resetter;
 
 @Implements(ThreadUtils.class)
 public class ShadowThreadUtils {
 
+    private static boolean sIsMainThread = true;
+
+    @Resetter
+    public static void reset() {
+        sIsMainThread = true;
+    }
+
     @Implementation
     public static void postOnBackgroundThread(Runnable runnable) {
         runnable.run();
@@ -33,4 +41,14 @@
     public static void postOnMainThread(Runnable runnable) {
         runnable.run();
     }
+
+    @Implementation
+    public static boolean isMainThread() {
+        return sIsMainThread;
+    }
+
+    public static void setIsMainThread(boolean isMainThread) {
+        sIsMainThread = isMainThread;
+    }
+
 }
diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
index 44d355c..d6f7960 100644
--- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
@@ -31,6 +31,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.ResolveInfo;
 import android.graphics.drawable.ColorDrawable;
@@ -38,12 +39,14 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.android.settings.R;
 import com.android.settings.applications.LayoutPreference;
-import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.ShadowIconDrawableFactory;
+import com.android.settingslib.applications.ApplicationsState;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -52,6 +55,7 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
 
 import androidx.preference.Preference;
 
@@ -69,12 +73,10 @@
     private LayoutInflater mLayoutInflater;
     private PackageInfo mInfo;
     private EntityHeaderController mController;
-    private FakeFeatureFactory mFeatureFactory;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mFeatureFactory = FakeFeatureFactory.setupForTest();
         mShadowContext = RuntimeEnvironment.application;
         when(mActivity.getApplicationContext()).thenReturn(mShadowContext);
         when(mContext.getApplicationContext()).thenReturn(mContext);
@@ -256,6 +258,23 @@
     }
 
     @Test
+    @Config(shadows = ShadowIconDrawableFactory.class)
+    public void setIcon_usingAppEntry_shouldLoadIconFromDrawableFactory() {
+        final View view = mLayoutInflater
+                .inflate(R.layout.settings_entity_header, null /* root */);
+        final ApplicationsState.AppEntry entry = mock(ApplicationsState.AppEntry.class);
+        entry.info = new ApplicationInfo();
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, view);
+        mController.setIcon(entry).done(mActivity);
+        final ImageView iconView = view.findViewById(R.id.entity_header_icon);
+
+        // Icon is set
+        assertThat(iconView.getDrawable()).isNotNull();
+        // ... and entry.icon is still empty. This means the icon didn't come from cache.
+        assertThat(entry.icon).isNull();
+    }
+
+    @Test
     public void bindButton_hasAppNotifIntent_shouldShowButton() {
         final View appLinks = mLayoutInflater
                 .inflate(R.layout.settings_entity_header, null /* root */);
diff --git a/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java
similarity index 60%
rename from tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java
index 5ede773..c88e7f8 100644
--- a/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java
@@ -17,34 +17,27 @@
 package com.android.settings.widget;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 
 import android.content.Context;
-import androidx.preference.PreferenceScreen;
 import android.view.View;
 import android.widget.Button;
 
+import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-public class TwoStateButtonPreferenceControllerTest {
+public class TwoStateButtonPreferenceTest {
 
-    private static final String KEY = "pref_key";
-
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-    @Mock
     private TwoStateButtonPreference mPreference;
-    private TwoStateButtonPreferenceController mController;
     private Context mContext;
     private Button mButtonOn;
     private Button mButtonOff;
@@ -53,35 +46,34 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = spy(RuntimeEnvironment.application);
-        doReturn(mPreference).when(mPreferenceScreen).findPreference(anyString());
+        mPreference = spy(new TwoStateButtonPreference(mContext, null /* AttributeSet */));
         mButtonOn = new Button(mContext);
-        doReturn(mButtonOn).when(mPreference).getStateOnButton();
+        mButtonOn.setId(R.id.state_on_button);
         mButtonOff = new Button(mContext);
-        doReturn(mButtonOff).when(mPreference).getStateOffButton();
-
-        mController = new TestButtonsPreferenceController(mContext, KEY);
-        mController.displayPreference(mPreferenceScreen);
+        mButtonOff.setId(R.id.state_off_button);
+        ReflectionHelpers.setField(mPreference, "mButtonOn", mButtonOn);
+        ReflectionHelpers.setField(mPreference, "mButtonOff", mButtonOff);
     }
 
     @Test
     public void testSetButtonVisibility_stateOn_onlyShowButtonOn() {
-        mController.setButtonVisibility(true /* stateOn */);
-
-        assertThat(mButtonOn.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(mButtonOff.getVisibility()).isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void testSetButtonVisibility_stateOff_onlyShowButtonOff() {
-        mController.setButtonVisibility(false /* stateOn */);
+        mPreference.setChecked(true /* stateOn */);
 
         assertThat(mButtonOn.getVisibility()).isEqualTo(View.GONE);
         assertThat(mButtonOff.getVisibility()).isEqualTo(View.VISIBLE);
     }
 
     @Test
+    public void testSetButtonVisibility_stateOff_onlyShowButtonOff() {
+        mPreference.setChecked(false /* stateOn */);
+
+        assertThat(mButtonOn.getVisibility()).isEqualTo(View.VISIBLE);
+        assertThat(mButtonOff.getVisibility()).isEqualTo(View.GONE);
+    }
+
+    @Test
     public void testSetButtonEnabled_enabled_buttonEnabled() {
-        mController.setButtonEnabled(true /* enabled */);
+        mPreference.setButtonEnabled(true /* enabled */);
 
         assertThat(mButtonOn.isEnabled()).isTrue();
         assertThat(mButtonOff.isEnabled()).isTrue();
@@ -89,30 +81,18 @@
 
     @Test
     public void testSetButtonEnabled_disabled_buttonDisabled() {
-        mController.setButtonEnabled(false /* enabled */);
+        mPreference.setButtonEnabled(false /* enabled */);
 
         assertThat(mButtonOn.isEnabled()).isFalse();
         assertThat(mButtonOff.isEnabled()).isFalse();
     }
 
-    /**
-     * Controller to test methods in {@link TwoStateButtonPreferenceController}
-     */
-    public static class TestButtonsPreferenceController
-        extends TwoStateButtonPreferenceController {
+    @Test
+    public void onClick_shouldPropagateChangeToListener() {
+        mPreference.onClick(mButtonOn);
+        verify(mPreference).callChangeListener(true);
 
-        TestButtonsPreferenceController(Context context, String key) {
-            super(context, key);
-        }
-
-        @Override
-        public void onButtonClicked(boolean stateOn) {
-            //do nothing
-        }
-
-        @Override
-        public int getAvailabilityStatus() {
-            return AVAILABLE;
-        }
+        mPreference.onClick(mButtonOff);
+        verify(mPreference).callChangeListener(false);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
index ddbc851..43e87d8 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
@@ -259,26 +259,13 @@
     }
 
     @Test
-    public void hiddenView_isDisabledWhenAppropriate() {
-        View hiddenSpinner = mView.findViewById(R.id.hidden_settings);
-        assertThat(hiddenSpinner.isEnabled()).isFalse();
+    public void hiddenField_visibilityUpdatesCorrectly() {
+        View hiddenField = mView.findViewById(R.id.hidden_settings_field);
+        assertThat(hiddenField.getVisibility()).isEqualTo(View.GONE);
 
         mController = new TestWifiConfigController(mConfigUiBase, mView, null /* accessPoint */,
                 WifiConfigUiBase.MODE_CONNECT);
-        assertThat(hiddenSpinner.isEnabled()).isTrue();
-    }
-
-
-    @Test
-    public void hiddenSpinner_visibilityUpdatesCorrectly() {
-        View hiddenSpinner = mView.findViewById(R.id.hidden_settings);
-        assertThat(hiddenSpinner.isEnabled()).isFalse();
-        assertThat(hiddenSpinner.getVisibility()).isEqualTo(View.GONE);
-
-        mController = new TestWifiConfigController(mConfigUiBase, mView, null /* accessPoint */,
-                WifiConfigUiBase.MODE_CONNECT);
-        assertThat(hiddenSpinner.isEnabled()).isTrue();
-        assertThat(hiddenSpinner.getVisibility()).isEqualTo(View.VISIBLE);
+        assertThat(hiddenField.getVisibility()).isEqualTo(View.VISIBLE);
     }
 
     public class TestWifiConfigController extends WifiConfigController {
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSliceBuilderTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSliceBuilderTest.java
index f709e00..b761806 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiSliceBuilderTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiSliceBuilderTest.java
@@ -26,7 +26,6 @@
 import android.content.Context;
 
 import com.android.settings.R;
-import com.android.settings.wifi.WifiSliceBuilder;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.SliceTester;
 
@@ -68,7 +67,7 @@
     }
 
     @Test
-    public void getWifiSlice_correctData() {
+    public void getWifiSlice_correctSliceContent() {
         final Slice wifiSlice = WifiSliceBuilder.getSlice(mContext);
         final SliceMetadata metadata = SliceMetadata.from(mContext, wifiSlice);
 
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java
index 198517a..1f49654 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java
@@ -43,6 +43,6 @@
         assertThat(WifiUtils.isHotspotPasswordValid("12345678")).isTrue();
         assertThat(WifiUtils.isHotspotPasswordValid("1234567890")).isTrue();
         assertThat(WifiUtils.isHotspotPasswordValid(longPassword)).isFalse();
-        assertThat(WifiUtils.isHotspotPasswordValid("")).isTrue();
+        assertThat(WifiUtils.isHotspotPasswordValid("")).isFalse();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java
index ac3ff3f..6388297 100644
--- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java
@@ -20,9 +20,12 @@
 import static android.app.slice.Slice.HINT_TITLE;
 import static android.app.slice.SliceItem.FORMAT_TEXT;
 
+import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_PLATFORM_DEFINED;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -41,8 +44,11 @@
 import androidx.slice.SliceProvider;
 import androidx.slice.core.SliceAction;
 import androidx.slice.core.SliceQuery;
+import androidx.slice.widget.ListContent;
+import androidx.slice.widget.RowContent;
 import androidx.slice.widget.SliceLiveData;
 
+import com.android.ims.ImsConfig;
 import com.android.ims.ImsManager;
 import com.android.settings.R;
 import com.android.settings.slices.SettingsSliceProvider;
@@ -61,6 +67,8 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 
+import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
@@ -73,8 +81,6 @@
     @Mock
     private ImsManager mMockImsManager;
 
-    private final Uri mWfcURI = Uri.parse("content://com.android.settings.slices/wifi_calling");
-
     private FakeWifiCallingSliceHelper mWfcSliceHelper;
     private SettingsSliceProvider mProvider;
     private SliceBroadcastReceiver mReceiver;
@@ -111,21 +117,21 @@
     public void test_CreateWifiCallingSlice_invalidSubId() {
         mWfcSliceHelper.setDefaultVoiceSubId(-1);
 
-        final Slice slice = mWfcSliceHelper.createWifiCallingSlice(mWfcURI);
+        final Slice slice = mWfcSliceHelper.createWifiCallingSlice(
+                WifiCallingSliceHelper.WIFI_CALLING_URI);
 
-        testWifiCallingSettingsUnavailableSlice(slice, null,
-                SliceBuilderUtils.getSettingsIntent(mContext));
+        assertThat(slice).isNull();
     }
 
     @Test
     public void test_CreateWifiCallingSlice_wfcNotSupported() {
-        doReturn(false).when(mMockImsManager).isWfcEnabledByPlatform();
+        when(mMockImsManager.isWfcEnabledByPlatform()).thenReturn(false);
 
-        final Slice slice = mWfcSliceHelper.createWifiCallingSlice(mWfcURI);
+        final Slice slice = mWfcSliceHelper.createWifiCallingSlice(
+                WifiCallingSliceHelper.WIFI_CALLING_URI);
 
         assertThat(mWfcSliceHelper.getDefaultVoiceSubId()).isEqualTo(1);
-        testWifiCallingSettingsUnavailableSlice(slice, null,
-                SliceBuilderUtils.getSettingsIntent(mContext));
+        assertThat(slice).isNull();
     }
 
     @Test
@@ -135,29 +141,32 @@
         turned off) we need to guide the user to wifi calling settings
         activity so the user can perform the activation there.(PrimaryAction)
          */
-        doReturn(true).when(mMockImsManager).isWfcEnabledByPlatform();
-        doReturn(true).when(mMockImsManager).isWfcProvisionedOnDevice();
-        doReturn(false).when(mMockImsManager).isWfcEnabledByUser();
-        doReturn(false).when(mMockImsManager).isNonTtyOrTtyOnVolteEnabled();
-        doReturn(null).when(mMockCarrierConfigManager).getConfigForSubId(1);
+        when(mMockImsManager.isWfcEnabledByPlatform()).thenReturn(true);
+        when(mMockImsManager.isWfcProvisionedOnDevice()).thenReturn(true);
+        when(mMockImsManager.isWfcEnabledByUser()).thenReturn(false);
+        when(mMockImsManager.isNonTtyOrTtyOnVolteEnabled()).thenReturn(false);
+        when(mMockCarrierConfigManager.getConfigForSubId(1)).thenReturn(null);
         mWfcSliceHelper.setActivationAppIntent(new Intent()); // dummy Intent
 
-        final Slice slice  = mWfcSliceHelper.createWifiCallingSlice(mWfcURI);
+        final Slice slice  = mWfcSliceHelper.createWifiCallingSlice(
+                WifiCallingSliceHelper.WIFI_CALLING_URI);
 
         assertThat(mWfcSliceHelper.getDefaultVoiceSubId()).isEqualTo(1);
         testWifiCallingSettingsUnavailableSlice(slice, null,
-                getActivityIntent(WifiCallingSliceHelper.ACTION_WIFI_CALLING_SETTINGS_ACTIVITY));
+                getActivityIntent(WifiCallingSliceHelper.ACTION_WIFI_CALLING_SETTINGS_ACTIVITY),
+                mContext.getString(R.string.wifi_calling_settings_title));
     }
 
     @Test
     public void test_CreateWifiCallingSlice_success() {
-        doReturn(true).when(mMockImsManager).isWfcEnabledByPlatform();
-        doReturn(true).when(mMockImsManager).isWfcProvisionedOnDevice();
-        doReturn(true).when(mMockImsManager).isWfcEnabledByUser();
-        doReturn(true).when(mMockImsManager).isNonTtyOrTtyOnVolteEnabled();
-        doReturn(null).when(mMockCarrierConfigManager).getConfigForSubId(1);
+        when(mMockImsManager.isWfcEnabledByPlatform()).thenReturn(true);
+        when(mMockImsManager.isWfcProvisionedOnDevice()).thenReturn(true);
+        when(mMockImsManager.isWfcEnabledByUser()).thenReturn(true);
+        when(mMockImsManager.isNonTtyOrTtyOnVolteEnabled()).thenReturn(true);
+        when(mMockCarrierConfigManager.getConfigForSubId(1)).thenReturn(null);
 
-        final Slice slice = mWfcSliceHelper.createWifiCallingSlice(mWfcURI);
+        final Slice slice = mWfcSliceHelper.createWifiCallingSlice(
+                WifiCallingSliceHelper.WIFI_CALLING_URI);
 
         assertThat(mWfcSliceHelper.getDefaultVoiceSubId()).isEqualTo(1);
         testWifiCallingSettingsToggleSlice(slice, null);
@@ -165,28 +174,28 @@
 
     @Test
     public void test_SettingSliceProvider_getsRightSliceWifiCalling() {
-        doReturn(true).when(mMockImsManager).isWfcEnabledByPlatform();
-        doReturn(true).when(mMockImsManager).isWfcProvisionedOnDevice();
-        doReturn(true).when(mMockImsManager).isWfcEnabledByUser();
-        doReturn(true).when(mMockImsManager).isNonTtyOrTtyOnVolteEnabled();
-        doReturn(null).when(mMockCarrierConfigManager).getConfigForSubId(1);
-        doReturn(mWfcSliceHelper).when(mSlicesFeatureProvider)
-              .getNewWifiCallingSliceHelper(mContext);
+        when(mMockImsManager.isWfcEnabledByPlatform()).thenReturn(true);
+        when(mMockImsManager.isWfcProvisionedOnDevice()).thenReturn(true);
+        when(mMockImsManager.isWfcEnabledByUser()).thenReturn(true);
+        when(mMockImsManager.isNonTtyOrTtyOnVolteEnabled()).thenReturn(true);
+        when(mMockCarrierConfigManager.getConfigForSubId(1)).thenReturn(null);
+        when(mSlicesFeatureProvider.getNewWifiCallingSliceHelper(mContext))
+                .thenReturn(mWfcSliceHelper);
 
-        final Slice slice = mProvider.onBindSlice(mWfcURI);
+        final Slice slice = mProvider.onBindSlice(WifiCallingSliceHelper.WIFI_CALLING_URI);
 
         assertThat(mWfcSliceHelper.getDefaultVoiceSubId()).isEqualTo(1);
         testWifiCallingSettingsToggleSlice(slice, null);
     }
 
     @Test
-    public void test_SliceBroadcastReceiver_toggleOffWifiCalling() {
-        doReturn(true).when(mMockImsManager).isWfcEnabledByPlatform();
-        doReturn(true).when(mMockImsManager).isWfcProvisionedOnDevice();
-        doReturn(false).when(mMockImsManager).isWfcEnabledByUser();
-        doReturn(true).when(mMockImsManager).isNonTtyOrTtyOnVolteEnabled();
-        doReturn(mWfcSliceHelper).when(mSlicesFeatureProvider)
-              .getNewWifiCallingSliceHelper(mContext);
+    public void test_SliceBroadcastReceiver_toggleOnWifiCalling() {
+        when(mMockImsManager.isWfcEnabledByPlatform()).thenReturn(true);
+        when(mMockImsManager.isWfcProvisionedOnDevice()).thenReturn(true);
+        when(mMockImsManager.isWfcEnabledByUser()).thenReturn(false);
+        when(mMockImsManager.isNonTtyOrTtyOnVolteEnabled()).thenReturn(true);
+        when(mSlicesFeatureProvider.getNewWifiCallingSliceHelper(mContext))
+                .thenReturn(mWfcSliceHelper);
         mWfcSliceHelper.setActivationAppIntent(null);
 
         ArgumentCaptor<Boolean> mWfcSettingCaptor = ArgumentCaptor.forClass(Boolean.class);
@@ -204,8 +213,104 @@
         assertThat(mWfcSettingCaptor.getValue()).isTrue();
     }
 
+    @Test
+    public void test_CreateWifiCallingPreferenceSlice_prefNotEditable() {
+        when(mMockImsManager.isWfcEnabledByPlatform()).thenReturn(true);
+        when(mMockImsManager.isWfcProvisionedOnDevice()).thenReturn(true);
+        when(mMockImsManager.isWfcEnabledByUser()).thenReturn(true);
+        when(mMockImsManager.isNonTtyOrTtyOnVolteEnabled()).thenReturn(true);
+        mWfcSliceHelper.setIsWifiCallingPrefEditable(false);
+
+        final Slice slice = mWfcSliceHelper.createWifiCallingPreferenceSlice(
+                WifiCallingSliceHelper.WIFI_CALLING_PREFERENCE_URI);
+
+        assertThat(mWfcSliceHelper.getDefaultVoiceSubId()).isEqualTo(1);
+        assertThat(slice).isNull();
+    }
+
+    @Test
+    public void test_CreateWifiCallingPreferenceSlice_wfcOff() {
+        when(mMockImsManager.isWfcEnabledByPlatform()).thenReturn(true);
+        when(mMockImsManager.isWfcProvisionedOnDevice()).thenReturn(true);
+        when(mMockImsManager.isWfcEnabledByUser()).thenReturn(false);
+        when(mMockImsManager.isNonTtyOrTtyOnVolteEnabled()).thenReturn(true);
+        mWfcSliceHelper.setIsWifiCallingPrefEditable(true);
+
+        final Slice slice = mWfcSliceHelper.createWifiCallingPreferenceSlice(
+                WifiCallingSliceHelper.WIFI_CALLING_PREFERENCE_URI);
+
+        assertThat(mWfcSliceHelper.getDefaultVoiceSubId()).isEqualTo(1);
+        testWifiCallingSettingsUnavailableSlice(slice, null,
+                getActivityIntent(WifiCallingSliceHelper.ACTION_WIFI_CALLING_SETTINGS_ACTIVITY),
+                mContext.getString(R.string.wifi_calling_mode_title));
+    }
+
+    @Test
+    public void test_CreateWifiCallingPreferenceSlice_success() {
+        when(mMockImsManager.isWfcEnabledByPlatform()).thenReturn(true);
+        when(mMockImsManager.isWfcProvisionedOnDevice()).thenReturn(true);
+        when(mMockImsManager.isWfcEnabledByUser()).thenReturn(true);
+        when(mMockImsManager.isNonTtyOrTtyOnVolteEnabled()).thenReturn(true);
+        when(mMockImsManager.getWfcMode(false)).thenReturn(
+                ImsConfig.WfcModeFeatureValueConstants.WIFI_PREFERRED);
+        mWfcSliceHelper.setIsWifiCallingPrefEditable(true);
+
+        final Slice slice = mWfcSliceHelper.createWifiCallingPreferenceSlice(
+                WifiCallingSliceHelper.WIFI_CALLING_PREFERENCE_URI);
+
+        assertThat(mWfcSliceHelper.getDefaultVoiceSubId()).isEqualTo(1);
+        testWifiCallingPreferenceSlice(slice, null,
+                getActivityIntent(WifiCallingSliceHelper.ACTION_WIFI_CALLING_SETTINGS_ACTIVITY));
+    }
+
+    @Test
+    public void test_SettingsSliceProvider_getWfcPreferenceSlice() {
+        when(mMockImsManager.isWfcEnabledByPlatform()).thenReturn(true);
+        when(mMockImsManager.isWfcProvisionedOnDevice()).thenReturn(true);
+        when(mMockImsManager.isWfcEnabledByUser()).thenReturn(true);
+        when(mMockImsManager.isNonTtyOrTtyOnVolteEnabled()).thenReturn(true);
+        when(mMockImsManager.getWfcMode(false)).thenReturn(
+                ImsConfig.WfcModeFeatureValueConstants.WIFI_PREFERRED);
+        when(mSlicesFeatureProvider.getNewWifiCallingSliceHelper(mContext))
+                .thenReturn(mWfcSliceHelper);
+        mWfcSliceHelper.setIsWifiCallingPrefEditable(true);
+
+        final Slice slice = mProvider.onBindSlice(
+                WifiCallingSliceHelper.WIFI_CALLING_PREFERENCE_URI);
+
+        assertThat(mWfcSliceHelper.getDefaultVoiceSubId()).isEqualTo(1);
+        testWifiCallingPreferenceSlice(slice, null,
+                getActivityIntent(WifiCallingSliceHelper.ACTION_WIFI_CALLING_SETTINGS_ACTIVITY));
+    }
+    @Test
+    public void test_SliceBroadcastReceiver_setWfcPrefCellularPref() {
+        when(mMockImsManager.isWfcEnabledByPlatform()).thenReturn(true);
+        when(mMockImsManager.isWfcProvisionedOnDevice()).thenReturn(true);
+        when(mMockImsManager.isWfcEnabledByUser()).thenReturn(true);
+        when(mMockImsManager.isNonTtyOrTtyOnVolteEnabled()).thenReturn(true);
+        when(mMockImsManager.getWfcMode(false)).thenReturn(
+                ImsConfig.WfcModeFeatureValueConstants.WIFI_PREFERRED);
+        when(mSlicesFeatureProvider.getNewWifiCallingSliceHelper(mContext))
+                .thenReturn(mWfcSliceHelper);
+        mWfcSliceHelper.setIsWifiCallingPrefEditable(true);
+
+        ArgumentCaptor<Integer> mWfcPreferenceCaptor = ArgumentCaptor.forClass(Integer.class);
+
+        // Change preference to Cellular pref
+        Intent intent = new Intent(
+                WifiCallingSliceHelper.ACTION_WIFI_CALLING_PREFERENCE_CELLULAR_PREFERRED);
+
+        mReceiver.onReceive(mContext, intent);
+
+        verify((mMockImsManager)).setWfcMode(mWfcPreferenceCaptor.capture(), eq(false));
+
+        // assert the change
+        assertThat(mWfcPreferenceCaptor.getValue()).isEqualTo(
+                ImsConfig.WfcModeFeatureValueConstants.CELLULAR_PREFERRED);
+    }
+
     private void testWifiCallingSettingsUnavailableSlice(Slice slice,
-            SliceData sliceData, PendingIntent expectedPrimaryAction) {
+            SliceData sliceData, PendingIntent expectedPrimaryAction, String title) {
         final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
 
         //Check there is no toggle action
@@ -219,7 +324,7 @@
 
         // Check the title
         final List<SliceItem> sliceItems = slice.getItems();
-        assertTitle(sliceItems, mContext.getString(R.string.wifi_calling_settings_title));
+        assertTitle(sliceItems, title);
     }
 
     private void testWifiCallingSettingsToggleSlice(Slice slice,
@@ -248,6 +353,51 @@
         assertTitle(sliceItems, mContext.getString(R.string.wifi_calling_settings_title));
     }
 
+    private void testWifiCallingPreferenceSlice(Slice slice, SliceData sliceData,
+            PendingIntent expectedPrimaryAction) {
+        final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
+
+        //Check there is no toggle action
+        final List<SliceAction> toggles = metadata.getToggles();
+        assertThat(toggles).isEmpty();
+
+        // Check whether the primary action is to open wifi calling settings activity
+        final PendingIntent primaryPendingIntent =
+                metadata.getPrimaryAction().getAction();
+        assertThat(primaryPendingIntent).isEqualTo(expectedPrimaryAction);
+
+        // Get all the rows
+        final ListContent listContent = new ListContent(mContext, slice);
+        final ArrayList<SliceItem> rowItems = listContent.getRowItems();
+
+        assertThat(rowItems.size()).isEqualTo(4 /* 4 items including header */);
+
+        // First row is HEADER
+        SliceItem rowSliceItem = rowItems.get(0);
+        RowContent rowContent =  new RowContent(mContext, rowSliceItem, true);
+        assertThat(rowContent.getTitleItem().getText()).isEqualTo(mContext.getText(
+                R.string.wifi_calling_mode_title));
+
+        // next is WIFI_ONLY
+        rowSliceItem = rowItems.get(1);
+        rowContent =  new RowContent(mContext, rowSliceItem, false);
+        assertThat(rowContent.getTitleItem().getText()).isEqualTo(mContext.getText(
+                com.android.internal.R.string.wfc_mode_wifi_only_summary));
+
+        // next is WIFI_PREFERRED
+        rowSliceItem = rowItems.get(2);
+        rowContent =  new RowContent(mContext, rowSliceItem, false);
+        assertThat(rowContent.getTitleItem().getText()).isEqualTo(mContext.getText(
+                com.android.internal.R.string.wfc_mode_wifi_preferred_summary));
+
+        // next is CELLULAR_PREFERRED
+        rowSliceItem = rowItems.get(3);
+        rowContent =  new RowContent(mContext, rowSliceItem, false);
+        assertThat(rowContent.getTitleItem().getText()).isEqualTo(mContext.getText(
+                com.android.internal.R.string.wfc_mode_cellular_preferred_summary));
+
+    }
+
     private PendingIntent getBroadcastIntent(String action) {
         final Intent intent = new Intent(action);
         intent.setClass(mContext, SliceBroadcastReceiver.class);
@@ -279,6 +429,8 @@
     }
     private class FakeWifiCallingSliceHelper extends WifiCallingSliceHelper {
         int mSubId = 1;
+        boolean isWifiCallingPrefEditable = true;
+        boolean isWifiOnlySupported = true;
 
         private Intent mActivationAppIntent;
         FakeWifiCallingSliceHelper(Context context) {
@@ -308,9 +460,23 @@
         protected Intent getWifiCallingCarrierActivityIntent(int subId) {
             return mActivationAppIntent;
         }
+        @Override
+        protected boolean isCarrierConfigManagerKeyEnabled(String key, int subId,
+                boolean defaultValue) {
+            if(key.equals(CarrierConfigManager.KEY_EDITABLE_WFC_MODE_BOOL)) {
+                return isWifiCallingPrefEditable;
+            } else if(key.equals(CarrierConfigManager.KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL)) {
+                return isWifiOnlySupported;
+            }
+            return defaultValue;
+        }
 
         public void setActivationAppIntent(Intent intent) {
             mActivationAppIntent = intent;
         }
+
+        public void setIsWifiCallingPrefEditable(boolean isWifiCallingPrefEditable) {
+            this.isWifiCallingPrefEditable = isWifiCallingPrefEditable;
+        }
     }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
index f7cc4fb..a790d52 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
@@ -42,6 +42,8 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 public class WifiTetherPasswordPreferenceControllerTest {
 
+    private static final String VALID_PASS = "12345678";
+    private static final String VALID_PASS2 = "23456789";
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     @Mock
@@ -87,11 +89,13 @@
     @Test
     public void changePreference_shouldUpdateValue() {
         mController.displayPreference(mScreen);
-        mController.onPreferenceChange(mPreference, "1");
-        assertThat(mController.getPassword()).isEqualTo("1");
+        mController.onPreferenceChange(mPreference, VALID_PASS);
+        assertThat(mController.getPasswordValidated(WifiConfiguration.KeyMgmt.WPA2_PSK))
+                .isEqualTo(VALID_PASS);
 
-        mController.onPreferenceChange(mPreference, "0");
-        assertThat(mController.getPassword()).isEqualTo("0");
+        mController.onPreferenceChange(mPreference, VALID_PASS2);
+        assertThat(mController.getPasswordValidated(WifiConfiguration.KeyMgmt.WPA2_PSK))
+                .isEqualTo(VALID_PASS2);
 
         verify(mListener, times(2)).onTetherConfigUpdated();
     }
@@ -100,62 +104,33 @@
     public void updateDisplay_shouldUpdateValue() {
         // Set controller password to anything and verify is set.
         mController.displayPreference(mScreen);
-        mController.onPreferenceChange(mPreference, "1");
-        assertThat(mController.getPassword()).isEqualTo("1");
+        mController.onPreferenceChange(mPreference, VALID_PASS);
+        assertThat(mController.getPasswordValidated(WifiConfiguration.KeyMgmt.WPA2_PSK))
+                .isEqualTo(VALID_PASS);
 
         // Create a new config using different password
         final WifiConfiguration config = new WifiConfiguration();
-        config.preSharedKey = "test_1234";
+        config.preSharedKey = VALID_PASS2;
         when(mWifiManager.getWifiApConfiguration()).thenReturn(config);
 
         // Call updateDisplay and verify it's changed.
         mController.updateDisplay();
-        assertThat(mController.getPassword()).isEqualTo(config.preSharedKey);
+        assertThat(mController.getPasswordValidated(WifiConfiguration.KeyMgmt.WPA2_PSK))
+                .isEqualTo(config.preSharedKey);
         assertThat(mPreference.getSummary()).isEqualTo(config.preSharedKey);
     }
 
     @Test
-    public void getSecuritySettingForPassword_returnCorrectType() {
-        // valid wpa2 password
-        mController.displayPreference(mScreen);
-        assertThat(mController.getSecuritySettingForPassword())
-                .isEqualTo(WifiConfiguration.KeyMgmt.WPA2_PSK);
-
-        // password which is empty returns NONE
-        mConfig = new WifiConfiguration();
-        mConfig.SSID = "test_1234";
-        mConfig.preSharedKey = "";
-        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
-        when(mWifiManager.getWifiApConfiguration()).thenReturn(mConfig);
-        mController = new WifiTetherPasswordPreferenceController(mContext, mListener);
-
-        mController.displayPreference(mScreen);
-        assertThat(mController.getSecuritySettingForPassword())
-                .isEqualTo(WifiConfiguration.KeyMgmt.NONE);
-
-        // default for unsupported types is wpa2
-        mConfig = new WifiConfiguration();
-        mConfig.SSID = "test_1234";
-        mConfig.preSharedKey = "short";
-        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
-        when(mWifiManager.getWifiApConfiguration()).thenReturn(mConfig);
-        mController = new WifiTetherPasswordPreferenceController(mContext, mListener);
-
-        mController.displayPreference(mScreen);
-        assertThat(mController.getSecuritySettingForPassword())
-                .isEqualTo(WifiConfiguration.KeyMgmt.WPA2_PSK);
-    }
-
-    @Test
     public void updateDisplay_shouldSetInputType() {
         // Set controller password to anything and verify is set.
         mController.displayPreference(mScreen);
-        mController.onPreferenceChange(mPreference, "1");
-        assertThat(mController.getPassword()).isEqualTo("1");
+        mController.onPreferenceChange(mPreference, VALID_PASS);
+        assertThat(mController.getPasswordValidated(WifiConfiguration.KeyMgmt.WPA2_PSK))
+                .isEqualTo(VALID_PASS);
 
         // Create a new config using different password
         final WifiConfiguration config = new WifiConfiguration();
-        config.preSharedKey = "test_1234";
+        config.preSharedKey = VALID_PASS2;
         when(mWifiManager.getWifiApConfiguration()).thenReturn(config);
 
         // Call updateDisplay and verify it's changed.
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java
new file mode 100644
index 0000000..86f03e0
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java
@@ -0,0 +1,99 @@
+package com.android.settings.wifi.tether;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class WifiTetherSecurityPreferenceControllerTest {
+
+    private static final String WPA2_PSK = String.valueOf(WifiConfiguration.KeyMgmt.WPA2_PSK);
+    private static final String NONE = String.valueOf(WifiConfiguration.KeyMgmt.NONE);
+    @Mock
+    private WifiTetherBasePreferenceController.OnTetherConfigUpdateListener mListener;
+    private Context mContext;
+    @Mock
+    private ConnectivityManager mConnectivityManager;
+    @Mock
+    private WifiManager mWifiManager;
+    @Mock
+    private PreferenceScreen mScreen;
+    private WifiTetherSecurityPreferenceController mController;
+    private ListPreference mPreference;
+    private WifiConfiguration mConfig;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mConfig = new WifiConfiguration();
+        mConfig.SSID = "test_1234";
+        mConfig.preSharedKey = "test_password";
+        mConfig.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA2_PSK);
+        mContext = spy(RuntimeEnvironment.application);
+
+        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
+        when(mWifiManager.getWifiApConfiguration()).thenReturn(mConfig);
+        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
+                .thenReturn(mConnectivityManager);
+        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
+        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
+
+        mController = new WifiTetherSecurityPreferenceController(mContext, mListener);
+        mPreference = new ListPreference(RuntimeEnvironment.application);
+        mController.mPreference = mPreference;
+    }
+
+    @Test
+    public void onPreferenceChange_securityValueUpdated() {
+        mController.onPreferenceChange(mPreference, WPA2_PSK);
+        assertThat(mController.getSecurityType()).isEqualTo(WifiConfiguration.KeyMgmt.WPA2_PSK);
+        assertThat(mPreference.getSummary()).isEqualTo("WPA2 PSK");
+
+        mController.onPreferenceChange(mPreference, NONE);
+        assertThat(mController.getSecurityType()).isEqualTo(WifiConfiguration.KeyMgmt.NONE);
+        assertThat(mPreference.getSummary()).isEqualTo("None");
+    }
+
+    @Test
+    public void updateDisplay_preferenceUpdated() {
+        // test defaulting to WPA2 PSK on new config
+        when(mWifiManager.getWifiApConfiguration()).thenReturn(null);
+        mController.updateDisplay();
+        assertThat(mController.getSecurityType()).isEqualTo(WifiConfiguration.KeyMgmt.WPA2_PSK);
+        assertThat(mPreference.getSummary()).isEqualTo("WPA2 PSK");
+
+        // test open tether network
+        when(mWifiManager.getWifiApConfiguration()).thenReturn(mConfig);
+        mConfig.allowedKeyManagement.clear();
+        mConfig.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE);
+        mController.updateDisplay();
+        assertThat(mController.getSecurityType()).isEqualTo(WifiConfiguration.KeyMgmt.NONE);
+        assertThat(mPreference.getSummary()).isEqualTo("None");
+
+        // test WPA2 PSK tether network
+        mConfig.allowedKeyManagement.clear();
+        mConfig.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA2_PSK);
+        mController.updateDisplay();
+        assertThat(mController.getSecurityType()).isEqualTo(WifiConfiguration.KeyMgmt.WPA2_PSK);
+        assertThat(mPreference.getSummary()).isEqualTo("WPA2 PSK");
+    }
+}
diff --git a/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java
index 5655213..96ffe23 100644
--- a/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java
@@ -26,6 +26,7 @@
 import static org.mockito.Mockito.when;
 
 import android.content.ContextWrapper;
+import android.content.om.IOverlayManager;
 import android.content.om.OverlayInfo;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
@@ -33,9 +34,6 @@
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
-import androidx.preference.ListPreference;
-
-import com.android.settings.wrapper.OverlayManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -44,18 +42,20 @@
 
 import java.util.ArrayList;
 
+import androidx.preference.ListPreference;
+
 @SmallTest
 @RunWith(AndroidJUnit4.class)
 public class ThemePreferenceControllerTest {
 
-    private OverlayManagerWrapper mMockOverlayManager;
+    private IOverlayManager mMockOverlayManager;
     private ContextWrapper mContext;
     private ThemePreferenceController mPreferenceController;
     private PackageManager mMockPackageManager;
 
     @Before
     public void setup() {
-        mMockOverlayManager = mock(OverlayManagerWrapper.class);
+        mMockOverlayManager = mock(IOverlayManager.class);
         mMockPackageManager = mock(PackageManager.class);
         mContext = new ContextWrapper(InstrumentationRegistry.getTargetContext()) {
             @Override
@@ -69,9 +69,9 @@
     @Test
     public void testUpdateState() throws Exception {
         OverlayInfo info1 = new OverlayInfo("com.android.Theme1", "android",
-                "", "", OverlayInfo.STATE_ENABLED, 0, 0, true);
+                OverlayInfo.CATEGORY_THEME, "", OverlayInfo.STATE_ENABLED, 0, 0, true);
         OverlayInfo info2 = new OverlayInfo("com.android.Theme2", "android",
-                "", "", 0, 0, 0, true);
+                OverlayInfo.CATEGORY_THEME, "", 0, 0, 0, true);
         when(mMockPackageManager.getApplicationInfo(any(), anyInt())).thenAnswer(inv -> {
             ApplicationInfo info = mock(ApplicationInfo.class);
             if ("com.android.Theme1".equals(inv.getArguments()[0])) {
@@ -105,9 +105,9 @@
     @Test
     public void testUpdateState_withStaticOverlay() throws Exception {
         OverlayInfo info1 = new OverlayInfo("com.android.Theme1", "android",
-                "", "", OverlayInfo.STATE_ENABLED, 0, 0, true);
+                OverlayInfo.CATEGORY_THEME, "", OverlayInfo.STATE_ENABLED, 0, 0, true);
         OverlayInfo info2 = new OverlayInfo("com.android.Theme2", "android",
-                "", "", OverlayInfo.STATE_ENABLED, 0, 0, true);
+                OverlayInfo.CATEGORY_THEME, "", OverlayInfo.STATE_ENABLED, 0, 0, true);
         when(mMockPackageManager.getApplicationInfo(any(), anyInt())).thenAnswer(inv -> {
             ApplicationInfo info = mock(ApplicationInfo.class);
             if ("com.android.Theme1".equals(inv.getArguments()[0])) {
@@ -140,29 +140,10 @@
         verify(pref).setValue(eq("com.android.Theme2"));
     }
 
-    @Test
-    public void testAvailable_false() throws Exception {
-        when(mMockPackageManager.getPackageInfo(anyString(), anyInt())).thenReturn(
-                new PackageInfo());
-        when(mMockOverlayManager.getOverlayInfosForTarget(any(), anyInt()))
-                .thenReturn(list(new OverlayInfo("", "", "", "", 0, 0, 0, false)));
-        assertThat(mPreferenceController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void testAvailable_true() throws Exception {
-        when(mMockPackageManager.getPackageInfo(anyString(), anyInt())).thenReturn(
-                 new PackageInfo());
-        when(mMockOverlayManager.getOverlayInfosForTarget(any(), anyInt()))
-                .thenReturn(list(new OverlayInfo("", "", "", "", 0, 0, 0, true),
-                        new OverlayInfo("", "", "", "", 0, 0, 0, true)));
-        assertThat(mPreferenceController.isAvailable()).isTrue();
-    }
-
-    private ArrayList<OverlayManagerWrapper.OverlayInfo> list(OverlayInfo... infos) {
-        ArrayList<OverlayManagerWrapper.OverlayInfo> list = new ArrayList<>();
+    private ArrayList<OverlayInfo> list(OverlayInfo... infos) {
+        ArrayList<OverlayInfo> list = new ArrayList<>();
         for (OverlayInfo info : infos) {
-            list.add(new OverlayManagerWrapper.OverlayInfo(info));
+            list.add(info);
         }
         return list;
     }
diff --git a/tests/unit/src/com/android/settings/slices/SliceDeepLinkSpringBoardTest.java b/tests/unit/src/com/android/settings/slices/SliceDeepLinkSpringBoardTest.java
index e7c5d6e..91057b8 100644
--- a/tests/unit/src/com/android/settings/slices/SliceDeepLinkSpringBoardTest.java
+++ b/tests/unit/src/com/android/settings/slices/SliceDeepLinkSpringBoardTest.java
@@ -21,14 +21,22 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.platform.test.annotations.Presubmit;
 import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
 import android.support.test.runner.AndroidJUnit4;
 
+import com.android.settings.bluetooth.BluetoothSliceBuilder;
+import com.android.settings.location.LocationSliceBuilder;
+import com.android.settings.notification.ZenModeSliceBuilder;
+import com.android.settings.wifi.WifiSliceBuilder;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
+@MediumTest
 public class SliceDeepLinkSpringBoardTest {
     private Context mContext;
 
@@ -38,18 +46,57 @@
     }
 
     @Test
-    public void launcheDeepLinkIntent_shouldNotCrash() {
-        final Uri springBoardIntentUri = createDeepLink(
-                new Intent(SliceDeepLinkSpringBoard.ACTION_VIEW_SLICE)
-                        .setPackage(mContext.getPackageName())
-                        .putExtra(SliceDeepLinkSpringBoard.EXTRA_SLICE,
-                                "content://com.android.settings.slices/action/test_slice")
-                        .toUri(Intent.URI_ANDROID_APP_SCHEME));
-
-        final Intent deepLinkIntent = new Intent(Intent.ACTION_VIEW)
-                .setData(springBoardIntentUri)
-                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+    @Presubmit
+    public void launchesDeepLinkIntent_shouldNotCrash() {
+        final Intent deepLinkIntent = getSpringboardIntent(
+                "content://com.android.settings.slices/action/test_slice");
 
         mContext.startActivity(deepLinkIntent);
     }
+
+    @Test
+    @Presubmit
+    public void launchesDeepLinkIntent_wifiSlice_shouldNotCrash() {
+        final Intent deepLinkIntent = getSpringboardIntent(WifiSliceBuilder.WIFI_URI.toString());
+
+        mContext.startActivity(deepLinkIntent);
+    }
+
+    @Test
+    @Presubmit
+    public void launchesDeepLinkIntent_bluetoothSlice_shouldNotCrash() {
+        final Intent deepLinkIntent = getSpringboardIntent(
+                BluetoothSliceBuilder.BLUETOOTH_URI.toString());
+
+        mContext.startActivity(deepLinkIntent);
+    }
+
+    @Test
+    @Presubmit
+    public void launchesDeepLinkIntent_dndSlice_shouldNotCrash() {
+        final Intent deepLinkIntent = getSpringboardIntent(
+                ZenModeSliceBuilder.ZEN_MODE_URI.toString());
+
+        mContext.startActivity(deepLinkIntent);
+    }
+
+    @Test
+    @Presubmit
+    public void launchesDeepLinkIntent_locationSlice_shouldNotCrash() {
+        final Intent deepLinkIntent = getSpringboardIntent(
+                LocationSliceBuilder.LOCATION_URI.toString());
+
+        mContext.startActivity(deepLinkIntent);
+    }
+
+    private Intent getSpringboardIntent(String uriString) {
+        final Uri uri = createDeepLink(new Intent(SliceDeepLinkSpringBoard.ACTION_VIEW_SLICE)
+                .setPackage(mContext.getPackageName())
+                .putExtra(SliceDeepLinkSpringBoard.EXTRA_SLICE, uriString)
+                .toUri(Intent.URI_ANDROID_APP_SCHEME));
+
+        return new Intent(Intent.ACTION_VIEW)
+                .setData(uri)
+                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+    }
 }