diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2795ba1..dbe231b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -716,15 +716,6 @@
                 android:value="true" />
         </activity>
 
-        <!-- Keep compatibility with old shortcuts. -->
-        <activity-alias android:name="UserDictionarySettings"
-                android:label="@string/user_dict_settings_title"
-                android:exported="true"
-                android:targetActivity="Settings$UserDictionarySettingsActivity">
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.UserDictionarySettings" />
-        </activity-alias>
-
         <activity
             android:name="Settings$ZenModeSettingsActivity"
             android:label="@string/zen_mode_settings_title"
@@ -868,25 +859,6 @@
         </activity>
 
         <activity
-            android:name="Settings$ZenModeExternalRuleSettingsActivity"
-            android:exported="true"
-            android:taskAffinity="com.android.settings"
-            android:parentActivityName="Settings">
-            <intent-filter android:priority="1">
-                <action android:name="android.settings.ZEN_MODE_EXTERNAL_RULE_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" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.notification.ZenModeExternalRuleSettings" />
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                android:value="true" />
-        </activity>
-
-        <activity
             android:name="Settings$DisplaySettingsActivity"
             android:label="@string/display_settings"
             android:icon="@drawable/ic_homepage_display"
@@ -1251,7 +1223,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.BackgroundCheckSummary" />
+                android:value="com.android.settings.applications.appops.BackgroundCheckSummary" />
         </activity>
 
         <activity
@@ -2248,7 +2220,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.fuelgauge.BatterySaverSettings" />
+                android:value="com.android.settings.fuelgauge.batterysaver.BatterySaverSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
diff --git a/res/layout/color_mode_preview.xml b/res/layout/color_mode_preview.xml
new file mode 100644
index 0000000..bcd385d
--- /dev/null
+++ b/res/layout/color_mode_preview.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/color_mode_preview_height"
+        android:paddingBottom="@dimen/color_mode_preview_padding_bottom"
+        android:scaleType="centerCrop"
+        android:cropToPadding="true"
+        android:src="@drawable/caption_background"
+        android:contentDescription="@null" />
+
+</FrameLayout>
diff --git a/res/layout/preference_app.xml b/res/layout/preference_app.xml
index 550ab34..9d3e2fa 100644
--- a/res/layout/preference_app.xml
+++ b/res/layout/preference_app.xml
@@ -72,9 +72,11 @@
                       android:textColor="?android:attr/textColorSecondary" />
 
             <TextView android:id="@+id/appendix"
-                      android:layout_width="wrap_content"
+                      android:layout_width="0dp"
                       android:layout_height="wrap_content"
+                      android:layout_weight="1"
                       android:textAppearance="@style/TextAppearance.Small"
+                      android:textAlignment="viewEnd"
                       android:textColor="?android:attr/textColorSecondary"
                       android:maxLines="1"
                       android:ellipsize="end" />
diff --git a/res/layout/suggestion_container.xml b/res/layout/suggestion_container.xml
index 95a00cc..ee7631d 100644
--- a/res/layout/suggestion_container.xml
+++ b/res/layout/suggestion_container.xml
@@ -23,40 +23,11 @@
     android:paddingTop="2dp"
     android:orientation="vertical">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal"
-        android:gravity="center_vertical">
-
-        <TextView
-            android:id="@android:id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_centerVertical="true"
-            android:gravity="start"
-            android:text="@string/suggestions_title_v2"
-            android:textAppearance="@style/TextAppearance.SuggestionHeader" />
-
-        <TextView
-            android:id="@android:id/summary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_marginEnd="24dp"
-            android:layout_centerVertical="true"
-            android:gravity="end"
-            android:textAppearance="@style/TextAppearance.SuggestionHeader" />
-
-    </LinearLayout>
-
     <android.support.v7.widget.RecyclerView
         android:id="@+id/suggestion_list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="12dp"
-        android:paddingBottom="13dp"
+        android:paddingBottom="16dp"
         android:scrollbars="none"/>
 
 </LinearLayout>
diff --git a/res/layout/suggestion_tile.xml b/res/layout/suggestion_tile.xml
index 850e55a..9493e2d 100644
--- a/res/layout/suggestion_tile.xml
+++ b/res/layout/suggestion_tile.xml
@@ -18,8 +18,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/suggestion_card"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginStart="16dp"
+    android:layout_marginEnd="16dp"
     app:cardPreventCornerOverlap="false"
     app:cardUseCompatPadding="true"
     app:cardElevation="2dp"
@@ -27,8 +29,8 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="112dp"
+        android:layout_height="112dp"
+        android:paddingBottom="8dp"
         android:orientation="vertical">
 
         <RelativeLayout
@@ -42,7 +44,7 @@
                 android:layout_height="@dimen/suggestion_card_icon_size"
                 style="@style/SuggestionCardIcon"
                 android:layout_marginTop="16dp"
-                android:layout_marginBottom="8dp" />
+                android:layout_marginBottom="6dp" />
 
             <ImageView
                 android:id="@+id/close_button"
@@ -66,7 +68,6 @@
             android:layout_marginEnd="12dp"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.SuggestionTitle"
-            android:ellipsize="end"
             android:fadingEdge="horizontal" />
 
         <TextView
@@ -76,6 +77,7 @@
             style="@style/SuggestionCardText"
             android:layout_marginStart="12dp"
             android:layout_marginEnd="12dp"
+            android:singleLine="true"
             android:textAppearance="@style/TextAppearance.SuggestionSummary" />
 
     </LinearLayout>
diff --git a/res/layout/suggestion_tile_two_cards.xml b/res/layout/suggestion_tile_two_cards.xml
new file mode 100644
index 0000000..c06fb7a
--- /dev/null
+++ b/res/layout/suggestion_tile_two_cards.xml
@@ -0,0 +1,77 @@
+<?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.
+-->
+
+<android.support.v7.widget.CardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/suggestion_card"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:cardPreventCornerOverlap="false"
+    app:cardUseCompatPadding="true"
+    app:cardElevation="2dp"
+    app:cardCornerRadius="@dimen/suggestion_card_corner_radius">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="112dp"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@android:id/icon"
+                android:layout_width="@dimen/suggestion_card_icon_size"
+                android:layout_height="@dimen/suggestion_card_icon_size"
+                style="@style/SuggestionCardIcon"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="8dp" />
+
+            <ImageView
+                android:id="@+id/close_button"
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:alpha="0.54"
+                android:layout_alignParentEnd="true"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="8dp"
+                android:contentDescription="@string/dlg_close"
+                android:src="@drawable/ic_suggestion_close_button"/>
+
+        </RelativeLayout>
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            style="@style/SuggestionCardText"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="12dp"
+            android:layout_marginBottom="16dp"
+            android:gravity="center_vertical"
+            android:textAppearance="@style/TextAppearance.SuggestionTitle"
+            android:maxLines="3"
+            android:ellipsize="end"
+            android:fadingEdge="horizontal" />
+
+    </LinearLayout>
+
+</android.support.v7.widget.CardView>
diff --git a/res/layout/suggestion_tile_with_button.xml b/res/layout/suggestion_tile_with_button.xml
index 8fb8e84..7b9ddf9 100644
--- a/res/layout/suggestion_tile_with_button.xml
+++ b/res/layout/suggestion_tile_with_button.xml
@@ -18,8 +18,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/suggestion_card"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginStart="16dp"
+    android:layout_marginEnd="16dp"
     app:cardPreventCornerOverlap="false"
     app:cardUseCompatPadding="true"
     app:cardElevation="2dp"
@@ -27,8 +29,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="112dp"
+        android:layout_height="160dp"
         android:orientation="vertical">
 
         <RelativeLayout
@@ -42,7 +43,7 @@
                 android:layout_height="@dimen/suggestion_card_icon_size"
                 style="@style/SuggestionCardIcon"
                 android:layout_marginTop="16dp"
-                android:layout_marginBottom="8dp" />
+                android:layout_marginBottom="6dp" />
 
             <ImageView
                 android:id="@+id/close_button"
@@ -66,7 +67,6 @@
             android:layout_marginEnd="12dp"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.SuggestionTitle"
-            android:ellipsize="end"
             android:fadingEdge="horizontal" />
 
         <TextView
@@ -76,6 +76,7 @@
             style="@style/SuggestionCardText"
             android:layout_marginStart="12dp"
             android:layout_marginEnd="12dp"
+            android:singleLine="true"
             android:textAppearance="@style/TextAppearance.SuggestionSummary" />
 
         <Button
@@ -84,7 +85,7 @@
             android:layout_gravity="center"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
+            android:layout_marginTop="16dp"
             android:layout_marginBottom="18dp"
             android:text="@string/suggestion_button_text" />
 
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index f4659df..a14f4d4 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 uur"</item>
     <item msgid="5198271470953124739">"Moenie uittel nie"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (Verstek)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Swak"</item>
     <item msgid="2042505933058940139">"Swak"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Hanteer as beperk"</item>
     <item msgid="2266114985518865625">"Hanteer as onbeperk"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Outomaties (op grond van die tyd van die dag)"</item>
+    <item msgid="6620560879508595181">"Altyd aan"</item>
+    <item msgid="6385301106124765323">"Altyd af"</item>
+  </string-array>
 </resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index f8b3862..20a5dfa 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Onthou instellings"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maksimum aantal gekoppelde Bluetooth-oudiotoestelle"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Kies maksimum aantal gekoppelde Bluetooth-oudiotoestelle"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Aktiveer Bluetooth-AVDTP-vertragingverslae"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Laat toe dat Bluetooth-AVDTP-vertragingverslae ontvang word"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Saai uit"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Aktiveer draadlose skermdeling"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Geen nabygeleë toestelle is gekry nie."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Ligging vir werkprofiel"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Programvlak-toestemmings"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Onlangse liggingversoeke"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Geen programme het onlangs ligging versoek nie"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Liggingdienste"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Hoë batterygebruik"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Gebruik diens"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Gebruik kleurregstelling"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Gebruik onderskrifte"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"AAN"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"AF"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Aan"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Af"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Wys in Vinnige instellings"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Regstellingmodus"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Jou toestel moet \'n veilige sluitskerm hê voordat jy eiebewysberging kan gebruik"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"STEL SLOT OP"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Programme met gebruiktoegang"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Noodtoon"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Rugsteun en laai terug"</string>
@@ -2888,6 +2893,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"reeksnommer, hardewareweergawe"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android-sekuriteitregstellingvlak, basisband-weergawe, kernweergawe"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Stemmingvertoning, sluitskermvertoning"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"vingerafdruk"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Stel Wi-Fi-NFC-merker op"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skryf"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tik \'n merker om te skryf …"</string>
@@ -2921,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Dokluidspreker speel"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Alle oudio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Net media-oudio"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Stil"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Klank"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibreer"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Aanskakel-klanke"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Nooit"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Verander tot <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> na net wekkers"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Verander na onderbreek altyd"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Wanneer die skerm aan is"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Laat kennisgewings wat stilgemaak is deur Moenie Steur Nie op die skerm opspring"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Laat kennisgewings wat deur Moenie Steur Nie stilgemaak is op die skerm opspring en \'n statusbalkikoon wys"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Wanneer die skerm af is"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Laat kennisgewings wat stilgemaak is deur Moenie Steur Nie die skerm aanskakel en die lig laat flikker"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Laat kennisgewings wat stilgemaak is deur Moenie Steur Nie die skerm aanskakel"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Hierdie toestel as MIDI te gebruik"</string>
     <string name="usb_use" msgid="3372728031108932425">"Gebruik USB vir"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Gebruik USB ook vir"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Verstek-USB-opstelling"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Wanneer \'n ander toestel gekoppel is en jou foon is ontsluit, sal hierdie instellings toegepas word. Koppel net aan vertroude toestelle."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Laai tans hierdie toestel"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Laai tans gekoppelde toestel"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Gemiddeld <xliff:g id="USED_MEMORY">%1$s</xliff:g> van <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> berging gebruik"</string>
     <string name="users_summary" msgid="1674864467098487328">"Aangemeld as <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> is die verstek"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"AAN"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"AF"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Aan"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Af"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Rugsteun is gedeaktiveer"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Opgedateer na Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Opdatering is beskikbaar"</string>
@@ -3657,9 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Gekoppel aan <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Gekoppel aan veelvuldige toestelle"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Stelsel-UI-demonstrasiemodus"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Nagmodus"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Stel nagmodus"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Kitsinstellings-ontwikkelaarteëls"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Vensterspoor"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Oppervlakspoor"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope-spoor"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Werkprofielinstellings"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontaksoektog"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Gebruik Bluetooth terwyl jy bestuur"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Skakel Bluetooth outomaties aan terwyl jy bestuur"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Sien Android 8.0-batteryinstellings"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index e632ea2..01ac1e2 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 ሰዓት"</item>
     <item msgid="5198271470953124739">"በጭራሽ አታቋርጥ"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (ነባሪ)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"ደካማ"</item>
     <item msgid="2042505933058940139">"ደካማ"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"እንደ ተለካ አስተናግድ"</item>
     <item msgid="2266114985518865625">"እንደ ያልተለካ አስተናግድ"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"ራስ-ሰር (በቀኑ ጊዜ ላይ በመመርኮዝ)"</item>
+    <item msgid="6620560879508595181">"ሁልጊዜ አብራ"</item>
+    <item msgid="6385301106124765323">"ሁልጊዜ አጥፋ"</item>
+  </string-array>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 94a62c3..f255e6a 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ቅንብሮች አስታውስ"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"ከፍተኛው የተገናኙ የብሉቱዝ ኦዲዮ መሣሪያዎች ብዛት"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"ከፍተኛው የተገናኙ የብሉቱዝ ኦዲዮ መሣሪያዎች ብዛትን ይምረጡ"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"የብሉቱዝ AVDTP መዘግየት ሪፖርቶችን አንቃ"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"የብሉቱዝ AVDTP መዘግየት ሪፖርቶችን መቀበልን ፍቀድ"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"ውሰድ"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"ገመድ-አልባ ማሳየትን ያንቁ"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"በአቅራቢያ ምንም መሳሪያዎች አልተገኙም።"</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"የስራ መገለጫ አካባቢ"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"የመተግበሪያ ደረጃ ፈቃዶች"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"የቅርብ ጊዜ የአካባቢ ጥያቄዎች"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"ምንም መተግበሪያዎች በቅርብ ጊዜ አካባቢ አልጠየቁም"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"የአካባቢ አገልግሎቶች"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"ከፍተኛ የባትሪ አጠቃቀም"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"አገልግሎትን ተጠቀም"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"የቀለም ማስተካከያን ተጠቀም"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"መግለጫ ጽሑፎችን ተጠቀም"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"በርቷል"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ጠፍቷል"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"አብራ"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"አጥፋ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"በፈጣን ቅንብሮች ውስጥ አሳይ"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"የእርማት ሁነታ"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"የምስክርነት ማከማቻን መጠቀም ከመቻልዎ በፊት የእርስዎ መሣሪያ ደህንነቱ የተጠበቀ የመቆለፊያ ማያ ገጽ ሊኖረው ይገባል"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ቁልፍ አዘጋጅ"</string>
     <string name="usage_access_title" msgid="332333405495457839">"የአጠቃቀም መዳረሻ ያላቸው መተግበሪያዎች"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"የአደጋ ጊዜ ድምፅ"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"የአደጋጊዜ ጥሪ ሲደረግ ባህሪ አዘጋጅ"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"ምትኬ"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"ምትኬ &amp; እነበረበት መልስ"</string>
@@ -2888,6 +2893,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"ተከታታይ ቁጥር፣ የሃርድዌር ስሪት"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"የandroid ደህንነት መጠገኛ ደረጃ፣ የመሰረተ-ድግ ስሪት፣ የአውራ ከዋኝ ስሪት"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"ድባባዊ ማሳያ፣ የማያ ገጽ ቁልፍ ማሳያ"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"የጣት አሻራ"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"የWi-Fi NFC መለያ ያዋቅሩ"</string>
     <string name="write_tag" msgid="8571858602896222537">"ጻፍ"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ለመጻፍ አንድ መለያ መታ ያድርጉ..."</string>
@@ -2921,9 +2927,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"ፀጥታ"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"ማንቂያ"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ንዘር"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"ድምፆችን ያብሩ"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"በጭራሽ"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"እስከ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> ድረስ ብቻ ወደ ማንቂያዎች ይቀይሩ"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"ወደ ሁልጊዜ አቋርጥ ለውጥ"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"ማያ ገጹ ሲበራ"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"በአትረብሽ ጸጥ የተሰኙ ማሳወቂያዎች በማያ ገጹ ላይ ብቅ ይበሉ"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"በማያ ገጽ ላይ በአትረብሽ ብቅ ባይ ማሳወቂያዎች ጸጥ እንዲሉ አድርግ እና የሁነታ አሞሌን አዶ አሳይ"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"ማያ ገጹ ሲጠፋ"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"በአትረብሽ ጸጥ የተሰኙ ማሳወቂያዎች ማያ ገጹን ያብሩትና ብርሃኑን ያብለጨልጩት"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"በአትረብሽ ጸጥ የተሰኙ ማሳወቂያዎች ማያ ገጹን ያብሩት"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"ይህን መሣሪያ እንደ MIDI ይጠቀሙበት"</string>
     <string name="usb_use" msgid="3372728031108932425">"ዩኤስቢ ተጠቀም ለ"</string>
     <string name="usb_use_also" msgid="557340935190819370">"እንዲሁም ዩኤስቢን በተጨማሪ ተጠቀም ለ፦"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"ነባሪ የዩኤስቢ ውቅረት"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"ሌላ መሣሪያ ሲገናኝ እና የእርስዎ ስልክ ሲከፈት እነዚህ ቅንብሮች ተፈጻሚ ይሆናሉ። ከሚታመኑ መሣሪያዎች ጋር ብቻ ይገናኙ።"</string>
     <string name="usb_pref" msgid="1400617804525116158">"ዩ ኤስ ቢ"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"የዚህን መሣሪያ ኃይል በመሙላት ላይ"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"የተገናኘ መሣሪያ ኃይል በመሙላት ላይ"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"በአማካይ <xliff:g id="USED_MEMORY">%1$s</xliff:g> ከ<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> ማህደረ ትውስጥ ስራ ላይ ውሏል"</string>
     <string name="users_summary" msgid="1674864467098487328">"እንደ <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> ነባሪ ነው"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"በርቷል"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"ጠፍቷል"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"አብራ"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"አጥፋ"</string>
     <string name="backup_disabled" msgid="485189128759595412">"ምትኬ ተሰናክሏል"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"ወደ Android <xliff:g id="VERSION">%1$s</xliff:g> ተዘምኗል"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"ዝማኔ ይገኛል"</string>
@@ -3657,9 +3664,10 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"የፈጣን ቅንብሮች ገንቢ ሰድሮች"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"መስኮት መከታተያ"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"የላይ ሽፋን መከታተያ"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"የስራ መገለጫ ቅንብሮች"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"የእውቂያ ፍለጋ"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"መኪና ሲነዳ ብሉቱዝ ተጠቀም"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"እየነዳሁ ሳለ ብሉቱዝን በራስ-ሰር አብራ"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"የAndroid 8.0 ባትሪ ቅንብሮችን ይመልከቱ"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 9a2427b..39d9d79 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"ساعة واحدة"</item>
     <item msgid="5198271470953124739">"بلا مهلة"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"١ (الإعداد التلقائي)"</item>
-    <item msgid="7584056855393485416">"٢"</item>
-    <item msgid="844570832050176311">"٣"</item>
-    <item msgid="1896812737336024220">"٤"</item>
-    <item msgid="2664420770707984266">"٥"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"١"</item>
-    <item msgid="2731443086402670729">"٢"</item>
-    <item msgid="74627748729027880">"٣"</item>
-    <item msgid="2654447223197666662">"٤"</item>
-    <item msgid="7026157954713482328">"٥"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"ضعيفة"</item>
     <item msgid="2042505933058940139">"ضعيفة"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"معاملة الشبكة باعتبارها ذات سعة استخدام محدودة"</item>
     <item msgid="2266114985518865625">"معاملة الشبكة باعتبارها ذات سعة غير محدودة"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"تلقائي (حسب الوقت من اليوم)"</item>
+    <item msgid="6620560879508595181">"التشغيل دائمًا"</item>
+    <item msgid="6385301106124765323">"إيقاف دائمًا"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 85669f2..15ca385 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -751,6 +751,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"تذكّر الإعدادات"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"الحد الأقصى لعدد الأجهزة الصوتية المتصلة باستخدم البلوتوث"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"اختيار الحد الأقصى لعدد الأجهزة الصوتية المتصلة باستخدام البلوتوث"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"‏تفعيل استلام تقارير التأخير في AVDTP عبر البلوتوث"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"‏السماح باستلام تقارير التأخير في AVDTP عبر البلوتوث"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"إرسال"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"تمكين عرض شاشة لاسلكي"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"لم يتم العثور على أجهزة."</string>
@@ -1493,6 +1495,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"موقع الملف الشخصي للعمل"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"الأذونات على مستوى التطبيقات"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"طلبات الموقع الأخيرة"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"لم تطلب أي تطبيقات الوصول إلى الموقع مؤخرًا"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"خدمات الموقع"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"استخدام عالٍ للبطارية"</string>
@@ -1936,8 +1940,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"استخدام الخدمة"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"استخدام تصحيح الألوان"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"استخدام الشرح"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"تشغيل"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"إيقاف"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"مفعّل"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"غير مفعّل"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"إظهار في الإعدادات السريعة"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"وضع التصحيح"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2417,7 +2421,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"قبل أن تتمكن من استخدام وحدة تخزين بيانات الاعتماد، يلزم تعيين شاشة تأمين آمنة لجهازك"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"تعيين القفل"</string>
     <string name="usage_access_title" msgid="332333405495457839">"تطبيقات مع بيانات الاستخدام"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"نغمة الطوارئ"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"تعيين السلوك عند إجراء اتصال بالطوارئ"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"الاحتفاظ بنسخة احتياطية"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"النسخ الاحتياطي والاستعادة"</string>
@@ -3012,6 +3017,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"رقم تسلسلي، إصدار الجهاز"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"‏مستوى رمز تصحيح أمان android، إصدار النطاق الأساسي، إصدار النواة"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"العرض على الشاشة، عرض شاشة التأمين"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"بصمة الإصبع"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏إعداد علامة NFC عبر Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"كتابة"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"انقر على كلمة علامة لكتابة..."</string>
@@ -3045,9 +3051,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"صامت"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"تنبيه"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"اهتزاز"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"أصوات تشغيل الجهاز"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"مطلقًا"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3326,7 +3335,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"التغيير إلى التنبيهات فقط حتى <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"تغيير إلى المقاطعة دائمًا"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"عندما تكون الشاشة قيد التشغيل"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"السماح للإشعارات التي يتجاهلها وضع \"الرجاء عدم الإزعاج\" بالظهور بسرعة على الشاشة"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"السماح للإشعارات التي تم كتم صوتها بواسطة وضع \"الرجاء عدم الإزعاج\" بالظهور بسرعة على الشاشة وعرض رمز شريط الحالة"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"عندما تكون الشاشة متوقفة"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"السماح للإشعارات التي يتجاهلها وضع \"الرجاء عدم الإزعاج\" بتشغيل الشاشة وإحداث وميض ضوئي"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"السماح للإشعارات التي يتجاهلها وضع \"الرجاء عدم الإزعاج\" بتشغيل الشاشة"</string>
@@ -3538,10 +3547,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"‏يمكنك استخدام هذا الجهاز باعتباره MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"‏استخدام USB في"</string>
     <string name="usb_use_also" msgid="557340935190819370">"‏استخدام USB أيضًا من أجل"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"‏تهيئة USB التلقائية"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"عند الاتصال بجهاز آخر وإلغاء قفل هاتفك، سيتم تطبيق هذه الإعدادات. لذلك يجب الاتصال بالأجهزة الموثوق بها فقط."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"شحن هذا الجهاز"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"شحن الجهاز المتصل"</string>
@@ -3670,8 +3677,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"تم استخدام متوسط ذاكرة بحجم <xliff:g id="USED_MEMORY">%1$s</xliff:g> من إجمالي <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"تم تسجيل الدخول باسم <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> هو التطبيق الافتراضي"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"مفعّل"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"إيقاف"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"مفعّل"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"غير مفعّل"</string>
     <string name="backup_disabled" msgid="485189128759595412">"تم تعطيل الاحتفاظ بنسخة احتياطية"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"‏تم التحديث إلى الإصدار <xliff:g id="VERSION">%1$s</xliff:g> من Android."</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"هناك تحديث متوفّر."</string>
@@ -3865,9 +3872,10 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"فئات مطوّري البرامج في الإعدادات السريعة"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"تتبّع النوافذ"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"تتبّع الطبقات على الشاشة"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"إعدادات الملف الشخصي للعمل"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"البحث في جهات الاتصال"</string>
@@ -4103,4 +4111,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"استخدام البلوتوث أثناء القيادة"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"تفعيل البلوتوث تلقائيًا أثناء القيادة"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"‏الاطلاع على إعدادات بطارية Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-as/arrays.xml b/res/values-as/arrays.xml
index e1c748f..d140aef 100644
--- a/res/values-as/arrays.xml
+++ b/res/values-as/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"১ ঘণ্টা"</item>
     <item msgid="5198271470953124739">"কেতিয়াও সময় উকলি নাযায়"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"ডিফ\'ল্ট"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"৩"</item>
-    <item msgid="1896812737336024220">"৪"</item>
-    <item msgid="2664420770707984266">"৫"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"১"</item>
-    <item msgid="2731443086402670729">"২"</item>
-    <item msgid="74627748729027880">"৩"</item>
-    <item msgid="2654447223197666662">"৪"</item>
-    <item msgid="7026157954713482328">"৫"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"দুৰ্বল"</item>
     <item msgid="2042505933058940139">"দুৰ্বল"</item>
@@ -497,4 +489,7 @@
     <item msgid="8745603368609022803">"মিটাৰ কৰা হিছাপে আচৰণ কৰক"</item>
     <item msgid="2266114985518865625">"নিৰিখ অনিৰ্দিষ্ট বুলি গণ্য কৰক"</item>
   </string-array>
+    <!-- no translation found for dark_ui_mode_entries:0 (146804192658443142) -->
+    <!-- no translation found for dark_ui_mode_entries:1 (6620560879508595181) -->
+    <!-- no translation found for dark_ui_mode_entries:2 (6385301106124765323) -->
 </resources>
diff --git a/res/values-az/arrays.xml b/res/values-az/arrays.xml
index c3e76e7..f94d3f7 100644
--- a/res/values-az/arrays.xml
+++ b/res/values-az/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 saat"</item>
     <item msgid="5198271470953124739">"Heç vaxt taym aut olmasın"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (Defolt)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Keyfiyyətsiz"</item>
     <item msgid="2042505933058940139">"Zəif"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Limitli olaraq qəbul edin"</item>
     <item msgid="2266114985518865625">"Limitisiz olaraq qəbul edin"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Avtomatik (günün vaxtından aslı olaraq)"</item>
+    <item msgid="6620560879508595181">"Həmişə aktiv"</item>
+    <item msgid="6385301106124765323">"Həmişə deaktiv"</item>
+  </string-array>
 </resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 82ac422..daca061 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ayarları yadda saxlayın"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maksimum qoşulmuş Bluetooth audio cihazı"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Maksimum sayda qoşulmuş Bluetooth audio cihazları seçin"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Bluetooth AVDTP gecikmə şikayətlərini aktiv edin"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Bluetooth AVDTP gecikmə şikayətlərini əldə etmək üçün icazə edin"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Yayım"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Naqilsiz displeyi aktivləşdirin"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Yaxınlıqda heç bir cihaz tapılmadı."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"İş profili üçün yer"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Tətbiq səviyyəsi icazələri"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Son məkan sorğuları"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Son vaxtlar heç bir tətbiq tərəfindən məkan sorğusu olmayıb"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Məkan xidmətləri"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Çox batareya istifadəsi"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Xidmətdən istifadə edin"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Rəng korreksiyasından istifadə edin"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Başlıqlardan istifadə edin"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"AKTİV"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DEAKTİV"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Aktiv"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Deaktiv"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Sürətli Ayarlarda Göstər"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Korreksiya rejimi"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Kredensial yaddaşdan istifadə etmədən öncə cihazınızda təhlükəsiz kilid ekranı olmalıdır"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"KİLİD AYARLAYIN"</string>
     <string name="usage_access_title" msgid="332333405495457839">"İstifadə girişi olan tətbiqlər"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Həyəcan tonu"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Yedəkləyin &amp; bərpa edin"</string>
@@ -2888,6 +2893,7 @@
     <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>
     <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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC Teqi quraşdırın"</string>
     <string name="write_tag" msgid="8571858602896222537">"Yazın"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tazmaq üçü teqə tıklayın..."</string>
@@ -2921,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Dinamik oxutması"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Bütün audio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Yalnız media audio"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Səssiz"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Xəbərdarlıq"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrasiya"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Səsləri aktiv edin"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Heç vaxt"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Yalnız <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> vaxtınadək xəbərdarlıqları dəyişin"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Həmişə fasiləyə dəyişin"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Ekran yanılı olduqda"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"\"Narahat Etməyin\" rejimi ilə susturulan mesajlar ekranda görünsün"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Narahat Etməyin rejimində səssiz edilən bildirişlərə ekranda baxın və status panelini göstərin"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Ekran sönülü olduqda"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"\"Narahat Etməyin\" rejimi ilə susdurulan mesajlar ekranda aktiv olsun və ekranın işığı yansın"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"\"Narahat Etməyin\" rejimi ilə susdurulan mesajlar ekranda aktiv olsun"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Bu cihazı MIDI kimi istifadə edin"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB istifadəsi"</string>
     <string name="usb_use_also" msgid="557340935190819370">"USB istifadə edin"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Defolt USB Konfiqurasiyası"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Digər cihaz qoşulu olduqda və telefon kiliddə olmadıqda bu ayarlar tətbiq olunacaq. Yalnız etibar edilən cihazlara qoşulacaqsınız."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Enerji dodlurulması"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Qoşulmuş cihaza enerji doldurulur"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Ümumi <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> yaddaşdan ortalama <xliff:g id="USED_MEMORY">%1$s</xliff:g> yaddaş istifadə olunub"</string>
     <string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> kimi daxil olundu"</string>
     <string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> deloftdur"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"AKTİV"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"QAPALI"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Aktiv"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Deaktiv"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Yedəkləmə deaktiv edildi"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> versiyasına güncəlləndi"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Güncəlləmə əlçatandır"</string>
@@ -3657,9 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> cihazına qoşuldu"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Bir çox cihaza qoşuldu"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Sistem İİ demo rejimi"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Gecə rejimi"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Gecə rejimi ayarlayın"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Sürətli ayarlar üzrə developer xanaları"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Pəncərə Obyekti"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Səth İzi"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope Fəaliyyəti"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"İş profil ayarları"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontakt axtarışı"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Maşında Bluetooth\'dan istifadə edin"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Avtomobil idarə edərkən Bluetooth\'u avtomatik aktiv edin"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 versiyasında batareya ayarlarına baxın"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-b+sr+Latn/arrays.xml b/res/values-b+sr+Latn/arrays.xml
index 2bf4e79..c31ec3e 100644
--- a/res/values-b+sr+Latn/arrays.xml
+++ b/res/values-b+sr+Latn/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 sat"</item>
     <item msgid="5198271470953124739">"Bez čekanja"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (podrazumevano)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Slaba"</item>
     <item msgid="2042505933058940139">"Slaba"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Tretiraj kao mrežu sa ograničenjem"</item>
     <item msgid="2266114985518865625">"Tretiraj kao mrežu bez ograničenja"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automatski (u zavisnosti od doba dana)"</item>
+    <item msgid="6620560879508595181">"Uvek uključeno"</item>
+    <item msgid="6385301106124765323">"Uvek isključeno"</item>
+  </string-array>
 </resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 6070700..30e52a9 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -718,6 +718,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamti podešavanja"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maksimalni broj povezanih Bluetooth audio uređaja"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Izaberite maksimalni broj povezanih Bluetooth audio uređaja"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Omogućite prijem izveštaja o kašnjenju za AVDTP preko Bluetooth veze"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Omogućava prijem izveštaja o kašnjenju za AVDTP preko Bluetooth veze"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Prebacivanje"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Omogući bežični prikaz"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nema uređaja u blizini."</string>
@@ -1454,6 +1456,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Lokacija za poslovni profil"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Dozvole na nivou aplikacija"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nedavni zahtevi za lokaciju"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Nijedna aplikacija nije skoro tražila lokaciju"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Usluge lokacije"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Velika potrošnja baterije"</string>
@@ -1894,8 +1898,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Koristi uslugu"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Koristi korekciju boja"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Koristi natpise"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"UKLJUČENO"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ISKLJUČENO"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Uključeno"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Isključeno"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Prikaži u Brzim podešavanjima"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Režim ispravljanja"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2339,7 +2343,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Da biste mogli da koristite skladište akreditiva, uređaj mora da ima bezbednu opciju za zaključavanje ekrana"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"PODESITE ZAKLJUČAVANJE"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apl. sa pristupom podacima o korišćenju"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Ton za hitne pozive"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Rezervna kopija i resetovanje"</string>
@@ -2919,6 +2924,7 @@
     <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>
     <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>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Podesite Wi-Fi NFC oznaku"</string>
     <string name="write_tag" msgid="8571858602896222537">"Napiši"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Dodirnite oznaku da biste pisali..."</string>
@@ -2952,9 +2958,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Reprodukuje bazna stanica"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Svi zvukovi"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Samo medijski zvukovi"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Nečujno"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Obaveštenje"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibracija"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Zvukovi pri uključivanju"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Nikad"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3209,7 +3218,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Prebacuje u režim samo sa alarmima do <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Prebacuje u režim uvek prekidaj"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Kada je ekran uključen"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Neka obaveštenja koja su isključena režimom Ne uznemiravaj iskaču na ekranu"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Neka obaveštenja isključena režimom Ne uznemiravaj iskaču na ekranu i prikažu ikonu na statusnoj traci"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Kada je ekran isključen"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Neka obaveštenja koja su isključena režimom Ne uznemiravaj uključe ekran i aktiviraju svetlosni signal"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Neka obaveštenja koja su isključena režimom Ne uznemiravaj uključe ekran"</string>
@@ -3403,10 +3412,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Koristite ovaj uređaj kao MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Koristi USB za"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Koristite USB i za"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Podrazumevana USB konfiguracija"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Kad se poveže drugi uređaj, a telefon je otključan, primenjuju se ova podešavanja. Povezujte se samo sa pouzdanim uređajima."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Punjenje uređaja"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Punjenje povezanog uređaja"</string>
@@ -3529,8 +3536,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"U proseku je korišćeno <xliff:g id="USED_MEMORY">%1$s</xliff:g> od <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> memorije"</string>
     <string name="users_summary" msgid="1674864467098487328">"Prijavljeni ste kao <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> je podrazumevana"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"UKLJUČENO"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"ISKLJUČENO"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Uključeno"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Isključeno"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Pravljenje rezervne kopije je onemogućeno"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Ažurirano na Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Dostupno je ažuriranje"</string>
@@ -3709,9 +3716,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Povezan je sa uređajem <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Povezan je sa više uređaja"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Režim demonstracije za korisnički interfejs sistema"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Noćni režim"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Podesi Noćni režim"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Pločice programera za brza podešavanja"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Trag prozora"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Površinski trag"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope trag"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Podešavanja poslovnog profila"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Pretraga kontakata"</string>
@@ -3917,4 +3925,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Uključi Bluetooth tokom vožnje"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Uključite Bluetooth automatski kada vozite"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Pogledajte podešavanja baterije za Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index 6407a92..a3b7b06 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 гадзіна"</item>
     <item msgid="5198271470953124739">"Ніколі не ўключаць тайм-аўт"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (стандартна)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Дрэнная"</item>
     <item msgid="2042505933058940139">"Дрэнны"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Лімітная"</item>
     <item msgid="2266114985518865625">"Безлімітная"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Аўтаматычна (у залежнасці ад часу сутак)"</item>
+    <item msgid="6620560879508595181">"Заўсёды ўключана"</item>
+    <item msgid="6385301106124765323">"Заўсёды выключана"</item>
+  </string-array>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 7734be5..cc7a1fc 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -729,6 +729,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запомніць налады"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Максімальная колькасць падключаных аўдыяпрылад Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Выбар максімальнай колькасці падключаных аўдыяпрылад Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Уключыць справаздачы аб затрымках AVDTP па Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Дазволіць атрыманне справаздач аб затрымках AVDTP па Bluetooth"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Перадача"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Уключыць бесправадны дысплей"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Прылад побач не знойдзена."</string>
@@ -1468,6 +1470,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Месца для рабочага профілю"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Дазволы на ўзроўні праграм"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Апошнія запыты пра месцазнах."</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"У апошні час запытаў ад дадаткаў на вызначэнне месцазнаходжання не паступала"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Службы вызначэння месцазнаходжання"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Выс. узровень выкарыст. акум."</string>
@@ -1909,8 +1913,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Карыстанне сэрвісам"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Карыстанне карэкцыяй колераў"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Карыстанне цітрамі"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"УКЛЮЧАНА"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"АДКЛЮЧАНА"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Уключана"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Выключана"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Паказваць у Хуткіх наладах"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Рэжым карэкцыі"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2366,7 +2370,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Перш чым вы зможаце карыстацца сховішчам уліковых даных, трэба наладзіць надзейную блакіроўку экрана прылады"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"БЛАКІРОЎКА ЭКРАНА"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Праграмы з доступам да даных"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Надзвычайны гук"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"Задаць паводзіны на выпадак экстранага выкліку"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Рэзервовае капіраванне"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Рэзервовае капіяванне і аднаўленне"</string>
@@ -2951,6 +2956,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"серыйны нумар, версія апаратнага забеспячэння"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"узровень патчу бяспекі android, версія дыяпазону, версія ядра"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Аўтаматычнае ўключэнне экрана, экран блакіроўкі"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"адбітак пальца"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Усталяваць Wi-Fi NFC-метку"</string>
     <string name="write_tag" msgid="8571858602896222537">"Запісаць"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Для завяршэння дакраніцеся да меткі..."</string>
@@ -2984,9 +2990,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Ціхі рэжым"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Абвестка"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вібрацыя"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Гукі пры ўключэнні"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Ніколі"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3249,7 +3258,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Пераключыцца на рэжым «толькі будзільнікі» да <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Уключыць усе апавяшчэнні"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Калі экран уключаны"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Дазволіць апавяшчэнням, паказ якіх адключаны ў рэжыме \"Не турбаваць\", усплываць на экране"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Дазволіць апавяшчэнням, адключаным у рэжыме \"Не турбаваць\", усплываць на экране і паказваць значок панэлі стану"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Калі экран выключаны"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Уключаць экран і светлавы індыкатар для апавяшчэнняў, адключаных у рэжыме \"Не турбаваць\""</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Уключаць экран для апавяшчэнняў, адключаных у рэжыме \"Не турбаваць\""</string>
@@ -3578,8 +3587,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"У сярэднім <xliff:g id="USED_MEMORY">%1$s</xliff:g> з <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> памяці выкарыстана"</string>
     <string name="users_summary" msgid="1674864467098487328">"Вы ўвайшлі як <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> з\'яўляецца стандартнай праграмай"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"УКЛ."</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"ВЫКЛ."</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Уключана"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Выключана"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Рэзервовае капіраванне адключана"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Абноўлена да версіі Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Ёсць абнаўленне"</string>
@@ -3763,9 +3772,10 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"Пліткі хуткіх налад для распрацоўшчыкаў"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Трасіроўка вокан"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Трасіроўка паверхні"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Налады працоўнага профілю"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Пошук кантактаў"</string>
@@ -3981,4 +3991,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"За рулём выкарыстоўвайце Bluetooth"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Аўтаматычна ўключаць Bluetooth, калі вы за рулём"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Налады акумулятара для Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 3d28410..4b5934a 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 час"</item>
     <item msgid="5198271470953124739">"Времето за изчакване да не изтича никога"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (по подразбиране)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Слаб"</item>
     <item msgid="2042505933058940139">"Слаб"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Третиране като мрежа с отчитане"</item>
     <item msgid="2266114985518865625">"Третиране като мрежа без отчитане"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Автоматично (въз основа на часа от денонощието)"</item>
+    <item msgid="6620560879508595181">"Винаги включено"</item>
+    <item msgid="6385301106124765323">"Винаги изключено"</item>
+  </string-array>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 294da2c..f31782f 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запомняне на настройки"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Максимален брой свързани аудиоустройства с Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Изберете максималния брой свързани аудиоустройства с Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Активиране на отчетите за закъснение от AVDTP през Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Рарешаване на получаването на отчети за закъснение от AVDTP през Bluetooth"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Предаване"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Активир. на безжичния дисплей"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Няма намерени устройства наблизо."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Местоп. за служ. потр. профил"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Разрешения на ниво приложение"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Скорошни заявки за местопол."</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Нито едно приложение не е заявило достъп до местоположението наскоро"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Услуги за местоположение"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Висок разход на батерията"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Използване на услугата"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Използване на корекция на цветовете"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Използване на надписи"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ВКЛЮЧЕНО"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ИЗКЛЮЧЕНО"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Включено"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Изключено"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Показване в „Бързи настройки“"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Режим на коригиране"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Преди да можете да използвате хранилището за идентификационни данни, устройството ви трябва да има защитен заключен екран"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ЗАКЛЮЧВ.: ЗАДАВАНЕ"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Прил. с достъп до използването"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Тон за спешност"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"Задаване на поведение при спешно обаждане"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Резервно копие"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Резервни копия и възстановяване"</string>
@@ -2888,6 +2893,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"сериен номер, версия на хардуера"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"ниво на корекцията на сигурността под Android, версия на радиомодула, версия на ядрото"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Дисплей, открояващ важни неща, дисплей на заключения екран"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"отпечатък"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Маркер за КБП за Wi-Fi: Настр."</string>
     <string name="write_tag" msgid="8571858602896222537">"Записване"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"За записване докоснете маркер..."</string>
@@ -2921,9 +2927,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Тих режим"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Сигнал"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вибриране"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Звуци при включване"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Никога"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Активиране на режима „Само будилници“ до <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Активиране на режима „Прекъсване винаги“"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Когато екранът е включен"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Разрешаване на известията, блокирани чрез „Не безпокойте“, да изскачат на екрана"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Разрешаване на известията, блокирани чрез „Не безпокойте“, да изскачат на екрана и да показват иконата на лентата на състоянието"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Когато екранът е изключен"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Разрешаване на известията, блокирани чрез „Не безпокойте“, да включват екрана и да задействат премигването на светлината"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Разрешаване на известията, блокирани чрез „Не безпокойте“, да включват екрана"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Използване на това устройство като MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Използване на USB за"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Използване на USB и за"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Стандартна конфигурация за USB"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Тези настройки ще се прилагат, когато е установена връзка с друго устройство и телефонът ви е отключен. Свързвайте се само с надеждни устройства."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Зареждане на това устройство"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Зареждане на свързаното устройство"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Използвана памет: Средно <xliff:g id="USED_MEMORY">%1$s</xliff:g> от <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"Влезли сте като <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> е стандартното приложение"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"ВКЛЮЧЕНО"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"ИЗКЛЮЧЕНО"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Включено"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Изключено"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Функцията за резервно копие е деактивирана"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Извършена е актуализация до Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Налице е актуализация"</string>
@@ -3657,9 +3664,10 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"Плочки за бързи настройки за програмисти"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Трасиране на прозореца"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Трасиране на повърхността"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Настройки за служебния потребителски профил"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Търсене на контакт"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Ползване на Bluetooth при шофиране"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Автоматично включване на Bluetooth при шофиране"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Преглед на настройките за батерията под Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-bn/arrays.xml b/res/values-bn/arrays.xml
index ed05f50..472a2a0 100644
--- a/res/values-bn/arrays.xml
+++ b/res/values-bn/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"১ ঘণ্টা"</item>
     <item msgid="5198271470953124739">"কখনই সময় শেষ হবে না"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"১ (ডিফল্ট)"</item>
-    <item msgid="7584056855393485416">"২"</item>
-    <item msgid="844570832050176311">"৩"</item>
-    <item msgid="1896812737336024220">"৪"</item>
-    <item msgid="2664420770707984266">"৫"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"১"</item>
-    <item msgid="2731443086402670729">"২"</item>
-    <item msgid="74627748729027880">"৩"</item>
-    <item msgid="2654447223197666662">"৪"</item>
-    <item msgid="7026157954713482328">"৫"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"নিম্নমানের"</item>
     <item msgid="2042505933058940139">"খারাপ"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"মিটারিং চালু রাখুন"</item>
     <item msgid="2266114985518865625">"মিটারিং এর দরকার নেই"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"অটোমেটিক (দিনের কোনও নির্দিষ্ট সময়ের ভিত্তিতে)"</item>
+    <item msgid="6620560879508595181">"সবসময় চালু"</item>
+    <item msgid="6385301106124765323">"সবসময় বন্ধ"</item>
+  </string-array>
 </resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index e7ab661..293fd08 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"সেটিংস মনে রাখুন"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"ব্লুটুথের মাধ্যমে সংযুক্ত সর্বাধিক অডিও ডিভাইস"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"সর্বাধিক কতগুলি অডিও ডিভাইস ব্লুটুথের মাধ্যমে সংযুক্ত করা যাবে তা নির্দিষ্ট করুন"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"ব্লুটুথ AVDTP বিলম্ব সম্পর্কিত রিপোর্ট চালু করুন"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"ব্লুটুথ AVDTP বিলম্ব সম্পর্কিত রিপোর্ট পাওয়ার অনুমতি দিন"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"কাস্ট করুন"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"ওয়্যারলেস প্রদর্শন সক্ষম করুন"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"কাছাকাছি কোনো ডিভাইস পাওয়া যায়নি।"</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"কাজের প্রোফাইলের জন্য অবস্থান"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"অ্যাপ-স্তরের অনুমতিগুলি"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"সাম্প্রতিক অবস্থান অনুরোধগুলি"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"সম্প্রতি কোনো অ্যাপ্লিকেশান অবস্থানের অনুরোধ করেনি"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"লোকেশন পরিষেবা"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"উচ্চ ব্যাটারির ব্যবহার"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"পরিষেবা ব্যবহার করুন"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"কালার কারেকশন ব্যবহার করুন"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"ক্যাপশন ব্যবহার করুন"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"চালু"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"বন্ধ"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"চালু"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"বন্ধ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"দ্রুত সেটিংসে দেখান"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"সংশোধন মোড"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"আপনি ক্রেডেনশিয়াল স্টোরেজ ব্যবহার করার আগে আপনার ডিভাইসে একটি সুরক্ষিত লক স্ক্রিন থাকতে হবে"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"লক সেট করুন"</string>
     <string name="usage_access_title" msgid="332333405495457839">"ব্যবহারের অ্যাক্সেস যুক্ত অ্যাপ্স"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"জরুরি টোন"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"জরুরি কল স্থাপন করা সময় কি ধরণের কার্যকলাপ করবে তা সেট করুন"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"ব্যাক-আপ"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"ব্যাকআপ ও পুনরুদ্ধার"</string>
@@ -2888,6 +2893,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"সিরিয়াল নম্বর, হার্ডওয়্যার ভার্সন"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"Android নিরাপত্তা প্যাচের স্তর, বেসব্যান্ড ভার্সন, কার্নেল ভার্সন"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"অ্যাম্বিয়েন্ট ডিসপ্লে, লক স্ক্রিন ডিসপ্লে"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"আঙ্গুলের ছাপ"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ওয়াই-ফাই NFC ট্যাগ সেটআপ করুন"</string>
     <string name="write_tag" msgid="8571858602896222537">"লিখুন"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"লিখতে একটি ট্যাগে আলতো চাপুন..."</string>
@@ -2921,9 +2927,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"নীরব"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"সতর্কতা"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ভাইব্রেট"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"ধ্বনিগুলিতে শক্তি"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"কখনও নয়"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"শুধুমাত্র <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> পর্যন্ত অ্যালার্মগুলি পরিবর্তন করুন"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"সর্বদা বাধা দেওয়াতে পরিবর্তন করুন"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"যখন স্ক্রিন চালু থাকে"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"\'বিরক্ত করবেন না\' দ্বারা নীরব করা বিজ্ঞপ্তিগুলিকে স্ক্রিনে প্রদর্শিত হতে দিন"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"\'বিরক্ত করবেন না\' দ্বারা মিউট করা বিজ্ঞপ্তিগুলিকে স্ক্রিনে প্রদর্শিত হতে এবং একটি স্ট্যাটাস বার আইকন দেখাতে দিন"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"যখন স্ক্রিন বন্ধ থাকে"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"\'বিরক্ত করবেন না\' দ্বারা নীরব করা বিজ্ঞপ্তিগুলিকে স্ক্রিন চালু করতে এবং লাইটটি জ্বলাতে ও নেভাতে দিন"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"\'বিরক্ত করবেন না\' দ্বারা নীরব করা বিজ্ঞপ্তিগুলিকে স্ক্রিন চালু করতে দিন"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"MIDI হিসেবে এই ডিভাইসটি ব্যবহার করুন"</string>
     <string name="usb_use" msgid="3372728031108932425">"এর জন্য USB ব্যবহার করুন"</string>
     <string name="usb_use_also" msgid="557340935190819370">"এছাড়া এই সমস্ত কাজেও USB ব্যবহার করুন:"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"ডিফল্ট ইউএসবি কনফিগারেশন"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"যখন অন্য একটি ডিভাইস কানেক্ট হয়ে আছে এবং আপনার ফোন আনলক অবস্থায় থাকে তখন এই সেটিংস প্রয়োগ করা হবে। শুধুমাত্র বিশ্বস্ত ডিভাইসগুলির সাথেই কানেক্ট করুন।"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"এই ডিভাইসটি চার্জ করা হচ্ছে"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"সংযুক্ত ডিভাইসে চার্জ দেওয়া"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> এর মধ্যে <xliff:g id="USED_MEMORY">%1$s</xliff:g> মেমোরি ব্যবহৃত হয়েছে"</string>
     <string name="users_summary" msgid="1674864467098487328">"<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> হল ডিফল্ট"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"চালু"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"বন্ধ"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"চালু"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"বন্ধ"</string>
     <string name="backup_disabled" msgid="485189128759595412">"ব্যাক-আপ নেওয়া অক্ষম করা রয়েছে"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> এ আপডেট করা হয়েছে"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"আপডেট পাওয়া যাচ্ছে"</string>
@@ -3657,9 +3664,10 @@
     <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">"সিস্টেম UI ডেমো মোড"</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="window_trace_quick_settings_title" msgid="3839917000546526898">"উইন্ডো ট্রেস"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"সারফেস ট্রেস"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"উইনস্কোপ ট্রেস"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"কর্মস্থলের প্রোফাইলের সেটিংস"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"পরিচিতির অনুসন্ধান"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"ড্রাইভ করার সময় ব্লুটুথ চালু রাখুন"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"ড্রাইভ করার সময় নিজে থেকে ব্লুটুথ চালু হতে দিন"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 এর ব্যাটারি সেটিংস দেখুন"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml
index 7fea8d8..ccc6a0e 100644
--- a/res/values-bs/arrays.xml
+++ b/res/values-bs/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 sat"</item>
     <item msgid="5198271470953124739">"Ne ističe nikada"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (Zadano)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Loš"</item>
     <item msgid="2042505933058940139">"Loš"</item>
@@ -497,7 +489,9 @@
     <item msgid="8745603368609022803">"Tretiraj kao vezu s ograničenjem"</item>
     <item msgid="2266114985518865625">"Tretiraj kao vezu bez ograničenja"</item>
   </string-array>
-    <!-- no translation found for dark_ui_mode_entries:0 (146804192658443142) -->
-    <!-- no translation found for dark_ui_mode_entries:1 (6620560879508595181) -->
-    <!-- no translation found for dark_ui_mode_entries:2 (6385301106124765323) -->
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automatski (na osnovu doba dana)"</item>
+    <item msgid="6620560879508595181">"Uvijek uključeno"</item>
+    <item msgid="6385301106124765323">"Uvijek isključeno"</item>
+  </string-array>
 </resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 8f62501..3dacc2b 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -718,10 +718,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamti postavke"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maksimalan broj povezanih Bluetooth audio uređaja"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Izaberite maksimalan broj povezanih Bluetooth audio uređaja"</string>
-    <!-- no translation found for bluetooth_enable_avdtp_delay_reports (5101903170688399944) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_avdtp_delay_reports_summary (7052797876020616399) -->
-    <skip />
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Omogući izvještaje o kašnjenju AVDTP-a putem Bluetootha"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Dozvoli prijem izvještaja o kašnjenju AVDTP-a putem Bluetootha"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Emitiranje"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Omogući bežični prikaz"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nije pronađen nijedan uređaj u blizini."</string>
@@ -1458,6 +1456,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Lokacija za profil za Work"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Odobrenja na nivou aplikacija"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nedavni zahtjevi za utvrđivanje lokacije"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Nijedna aplikacija nije zahtijevala utvrđivanje lokacije u posljednje vrijeme"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Usluge lokacije"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Visoka potrošnja baterije"</string>
@@ -1898,10 +1898,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Koristi uslugu"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Koristi ispravku boje"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Koristi natpise"</string>
-    <!-- no translation found for accessibility_summary_state_enabled (7914278500885887763) -->
-    <skip />
-    <!-- no translation found for accessibility_summary_state_disabled (2984230257590246745) -->
-    <skip />
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Uključeno"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Isključeno"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Prikaži u Brzim postavkama"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Način rada za korekciju"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2345,7 +2343,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Prije nego što mognete koristiti pohranu akreditiva, uređaj mora imati sigurno zaključavanje ekrana"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"POSTAVI ZAKLJUČAVANJE"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apl. s pristupom pod. o korišt."</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Ton za hitne pozive"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Sigurnosna kopija i vraćanje"</string>
@@ -2925,8 +2924,7 @@
     <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>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambijentalni prikaz, Prikaz zaključavanja ekrana"</string>
-    <!-- no translation found for keywords_fingerprint_settings (239222512315619538) -->
-    <skip />
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"otisak prsta"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Postavljanje Wi-Fi NFC taga"</string>
     <string name="write_tag" msgid="8571858602896222537">"Pisati"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Dodirnite oznaku da biste pisali..."</string>
@@ -2960,9 +2958,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Zvučnik priključne stanice reprodukuje zvuk"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Svi zvukovi"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Samo zvukovi medijskih sadržaja"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Nečujno"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Upozorenje"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibracija"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Uključivanje zvukova"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Nikada"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3217,8 +3218,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Pređi na postavku Samo alarmi do <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Promijeniti u uvijek prekini"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Kada je ekran uključen"</string>
-    <!-- no translation found for zen_mode_screen_on_summary (2208664848367443505) -->
-    <skip />
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Dopusti da se na ekranu istaknu obavještenja koja su prigušena načinom rada Ne ometaj te da prikažu ikonu na statusnoj traci"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Kada je ekran isključen"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Dopustite da obavještenja koja su utišana načinom rada Ne ometaj uključe ekran i zatrepere svjetlom"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Dopustite da obavještenja koja su utišana načinom rada Ne ometaj uključe ekran"</string>
@@ -3412,10 +3412,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Koristite uređaj u MIDI načinu"</string>
     <string name="usb_use" msgid="3372728031108932425">"Koristite USB za"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Također koristi USB za"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Zadana USB konfiguracija"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Kada se poveže drugi uređaj i vaš telefon je otključan, primijenit će se ove postavke. Povežite se samo s pouzdanim uređajima."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Punjenje ovog uređaja"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Punjenje povezanog uređaja"</string>
@@ -3538,10 +3536,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="USED_MEMORY">%1$s</xliff:g> prosječno od ukupno <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> iskorištene memorije"</string>
     <string name="users_summary" msgid="1674864467098487328">"Prijavljeni ste kao korisnik <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> je zadana aplikacija"</string>
-    <!-- no translation found for location_on_summary (3637699010986988970) -->
-    <skip />
-    <!-- no translation found for location_off_summary (7217264690673949107) -->
-    <skip />
+    <string name="location_on_summary" msgid="3637699010986988970">"Uključeno"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Isključeno"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Izrada sigurnosnih kopija je onemogućena"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Ažurirano na Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Dostupno je ažuriranje"</string>
@@ -3720,13 +3716,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Povezan s uređajem <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Povezan s više uređaja"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Način demonstracije Sistemskog UI-a"</string>
-    <!-- no translation found for dark_ui_mode (2112241426441807273) -->
-    <skip />
-    <!-- no translation found for dark_ui_mode_title (975299966259850992) -->
-    <skip />
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Noćni način rada"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Postavi noćni način rada"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Pločice programera za brze postavke"</string>
-    <!-- no translation found for winscope_trace_quick_settings_title (1294290008255732032) -->
-    <skip />
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope praćenje"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Postavke radnog profila"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Pretraživanje kontakata"</string>
@@ -3932,4 +3925,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Koristite Bluetooth za vrijeme vožnje"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Automatski uključite Bluetooth za vrijeme vožnje"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Pogledajte postavke baterije za Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 0960e6d..1d098c9 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 hora"</item>
     <item msgid="5198271470953124739">"Sempre visible"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (predeterminat)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Dolenta"</item>
     <item msgid="2042505933058940139">"Dolenta"</item>
@@ -497,7 +489,9 @@
     <item msgid="8745603368609022803">"Tracta com a Wi-Fi amb límit de dades"</item>
     <item msgid="2266114985518865625">"Tracta com a Wi-Fi sense límit de dades"</item>
   </string-array>
-    <!-- no translation found for dark_ui_mode_entries:0 (146804192658443142) -->
-    <!-- no translation found for dark_ui_mode_entries:1 (6620560879508595181) -->
-    <!-- no translation found for dark_ui_mode_entries:2 (6385301106124765323) -->
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automàtic (segons l\'hora del dia)"</item>
+    <item msgid="6620560879508595181">"Sempre activat"</item>
+    <item msgid="6385301106124765323">"Sempre desactivat"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index b755982..bf9033e 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -707,10 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Recorda la configuració"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Nombre màxim de dispositius d\'àudio Bluetooth connectats"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Selecciona el nombre màxim de dispositius d\'àudio Bluetooth connectats"</string>
-    <!-- no translation found for bluetooth_enable_avdtp_delay_reports (5101903170688399944) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_avdtp_delay_reports_summary (7052797876020616399) -->
-    <skip />
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Activa els informes de retards d\'AVDTP per Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Permet la recepció d\'informes de retards d\'AVDTP per Bluetooth"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Emet"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activa pantalla sense fil"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No s\'ha trobat cap dispositiu a prop."</string>
@@ -1445,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Ubicació perfil professional"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Permisos al nivell de l\'aplicació"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Sol·licituds d\'ubicació recents"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Cap aplicació no ha sol·licitat la ubicació recentment"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Serveis d\'ubicació"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Consum de bateria elevat"</string>
@@ -1884,10 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Utilitza el servei"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Utilitza la correcció del color"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Utilitza subtítols"</string>
-    <!-- no translation found for accessibility_summary_state_enabled (7914278500885887763) -->
-    <skip />
-    <!-- no translation found for accessibility_summary_state_disabled (2984230257590246745) -->
-    <skip />
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Activat"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Desactivat"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Mostra a configuració ràpida"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Mode de correcció"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2319,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Per poder utilitzar l\'emmagatzematge de credencials, el dispositiu ha de tenir una pantalla de bloqueig segura"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"DEFINEIX EL BLOQUEIG"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps amb accés a dades d\'ús"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"To d\'emergència"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Còpia de seguretat i restauració"</string>
@@ -2894,8 +2893,7 @@
     <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>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Pantalla ambient, pantalla de bloqueig"</string>
-    <!-- no translation found for keywords_fingerprint_settings (239222512315619538) -->
-    <skip />
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"empremta digital"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configura l\'etiqueta d\'NFC per a Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escriu-hi"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Toca una etiqueta per escriure..."</string>
@@ -2929,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Sons de la base d\'altaveu"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Tot l\'àudio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Només àudio multimèdia"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Silenci"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerta"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibració"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Sons d\'inici"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Mai"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3178,8 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Canvia al mode Només alarmes fins a les <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Canvia al mode Interromp sempre"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Quan la pantalla estigui encesa"</string>
-    <!-- no translation found for zen_mode_screen_on_summary (2208664848367443505) -->
-    <skip />
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Permet que les notificacions silenciades pel mode No molestis obrin finestres emergents i mostrin una icona a la barra d\'estat"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Quan la pantalla estigui apagada"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Permet que les notificacions silenciades pel mode No molestis encenguin la pantalla i facin parpellejar el llum"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Permet que les notificacions silenciades pel mode No molestis encenguin la pantalla"</string>
@@ -3367,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"fer servir aquest dispositiu com a MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Funcions de l\'USB"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Utilitza la connexió USB també per al següent:"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Configuració USB predeterminada"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Quan hi ha un altre dispositiu connectat i el telèfon està desbloquejat, s\'aplica aquesta configuració. Connecta\'t només a dispositius de confiança."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"S\'està carregant el dispositiu"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Càrrega de dispositius connectats"</string>
@@ -3491,10 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Memòria utilitzada de mitjana: <xliff:g id="USED_MEMORY">%1$s</xliff:g> de <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"Sessió iniciada com a <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="payment_summary" msgid="3472482669588561110">"Aplicació predeterminada: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for location_on_summary (3637699010986988970) -->
-    <skip />
-    <!-- no translation found for location_off_summary (7217264690673949107) -->
-    <skip />
+    <string name="location_on_summary" msgid="3637699010986988970">"Activada"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Desactivada"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Còpia de seguretat desactivada"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Actualitzat a Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Actualització disponible"</string>
@@ -3668,13 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connectat a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connectat a diversos dispositius"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Mode de demostració de la IU del sistema"</string>
-    <!-- no translation found for dark_ui_mode (2112241426441807273) -->
-    <skip />
-    <!-- no translation found for dark_ui_mode_title (975299966259850992) -->
-    <skip />
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Mode nocturn"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Configura el mode nocturn"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Mosaics de configuració ràpida per a desenvolupadors"</string>
-    <!-- no translation found for winscope_trace_quick_settings_title (1294290008255732032) -->
-    <skip />
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Traça de 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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Configuració del perfil professional"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Cerca de contactes"</string>
@@ -3870,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Utilitza Bluetooth mentre condueixo"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Activa el Bluetooth automàticament mentre condueixo"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Consulta la configuració de la bateria d\'Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 88c07a6..6314774 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 h"</item>
     <item msgid="5198271470953124739">"Bez časového limitu"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (výchozí)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Nízká"</item>
     <item msgid="2042505933058940139">"Slabý"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Považovat za měřenou síť"</item>
     <item msgid="2266114985518865625">"Považovat za neměřenou síť"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automaticky (podle denní doby)"</item>
+    <item msgid="6620560879508595181">"Vždy zapnuto"</item>
+    <item msgid="6385301106124765323">"Vždy vypnuto"</item>
+  </string-array>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index a75bfe3..c014628 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -729,6 +729,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamatovat nastavení"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maximum připojených audiozařízení Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Vyberte maximální počet připojených audiozařízení Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Povolit přehledy prodlevy Bluetooth AVDTP"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Povolit příjem protokolů prodlev Bluetooth AVDTP"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Odeslat"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Povolit bezdrátové zobrazení"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"V okolí nebyla nalezena žádná zařízení."</string>
@@ -1467,6 +1469,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Umístění pracovního profilu"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Oprávnění na úrovni aplikace"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nedávné žádosti o určení polohy"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"V poslední době žádné aplikace o polohu nepožádaly."</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Služby určování polohy"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Vysoké využívání baterie"</string>
@@ -1908,8 +1912,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Používat službu"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Používat korekci barev"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Používat titulky"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ZAPNUTO"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"VYPNUTO"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Zapnuto"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Vypnuto"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Zobrazit v rychlém nastavení"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Režim korekce"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2365,7 +2369,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Abyste mohli použít úložiště pověření, v zařízení musí být bezpečný zámek obrazovky"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"NASTAVIT ZÁMEK"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Přístup k dat. o používání"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Tísňové vyzvánění"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Zálohování a obnovení"</string>
@@ -2950,6 +2955,7 @@
     <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>
     <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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nastavení štítku NFC pro Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapsat"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Klepnutím na štítek zahájíte zápis..."</string>
@@ -2983,9 +2989,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Zvuk reproduktoru doku"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Veškerý zvuk"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Pouze mediální soubory"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Tichý režim"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Upozornění"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrace"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Zvuky při spouštění"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Nikdy"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3248,7 +3257,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Přepnout do režimu Pouze budíky až do <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Přejít do režimu Vždy vyrušit"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Když je obrazovka zapnutá"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Povolit, aby oznámení v režimu Nerušit vyskakovala na obrazovce"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Povolit, aby při doručení oznámení v režimu Nerušit vyskočilo okno na obrazovce a zobrazila se ikona na stavovém řádku"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Když je vypnutá obrazovka"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Povolit, aby se při doručení oznámení v režimu Nerušit zapínala obrazovka nebo blikala kontrolka"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Povolit, aby se při doručení oznámení v režimu Nerušit zapínala obrazovka"</string>
@@ -3448,10 +3457,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Toto zařízení se použije v režimu MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Použití USB:"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Další využití USB:"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Výchozí konfigurace USB"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Tato nastavení se použijí, když bude telefon odemknut a připojí se jiné zařízení. Připojujte pouze důvěryhodná zařízení."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Nabíjení zařízení"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Nabíjení připojeného zařízení"</string>
@@ -3576,8 +3583,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Přibližné využití paměti: <xliff:g id="USED_MEMORY">%1$s</xliff:g> z <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"Jste přihlášeni jako <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> – nastaveno jako výchozí"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"ZAP"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"VYPNUTO"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Zapnuto"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Vypnuto"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Zálohování bylo zakázáno"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Aktualizováno na Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"K dispozici je aktualizace"</string>
@@ -3761,9 +3768,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Připojeno k zařízení <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Připojeno k několika zařízením"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Ukázkový režim uživatelského rozhraní systému"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Noční režim"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Nastavit noční režim"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Dlaždice rychlého nastavení pro vývojáře"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Trasování okna"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Trasování povrchu"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Trasování 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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Nastavení pracovního profilu"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Vyhledávání kontaktů"</string>
@@ -3979,4 +3987,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Při řízení používat Bluetooth"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Při řízení automaticky zapnout Bluetooth"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Zobrazit nastavení baterie na platformě Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 58cb612..3e5514c 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 time"</item>
     <item msgid="5198271470953124739">"Aldrig timeout"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (standard)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Dårlig"</item>
     <item msgid="2042505933058940139">"Dårlig"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Håndter som forbrugsbaseret netværk"</item>
     <item msgid="2266114985518865625">"Håndter som ubegrænset netværk"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automatisk (afhængigt af tidspunktet på dagen)"</item>
+    <item msgid="6620560879508595181">"Altid aktiveret"</item>
+    <item msgid="6385301106124765323">"Altid deaktiveret"</item>
+  </string-array>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 9c40716..d83a9b0 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Husk indstillinger"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maksimalt antal tilsluttede Bluetooth-lydenheder"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Vælg det maksimale antal Bluetooth-lydenheder, der kan tilsluttes"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Aktivér Bluetooth AVDTP-forsinkelsesrapporter"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Tillad modtagelse af Bluetooth AVDTP-forsinkelsesrapporter"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Aktivér trådløs skærm"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Der blev ikke fundet enheder i nærheden."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Placering for arbejdsprofil"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Tilladelser på appniveau"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Seneste placeringsanmodninger"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Ingen apps har anmodet om placering for nylig"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Placeringstjenester"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Højt batteriforbrug"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Brug tjenesten"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Brug farvekorrigering"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Brug tekster"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"TIL"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"FRA"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Til"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Fra"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Vis i Hurtige indstillinger"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Korrektionstilstand"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Din enhed skal have en sikker låseskærm, før du kan bruge lageret til loginoplysninger"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"KONFIGURER LÅSESKÆRM"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps med adgang til forbrug"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Nødtone"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Backup og gendannelse"</string>
@@ -2888,6 +2893,7 @@
     <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>
     <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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Konfigurer NFC-tag for Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tryk på et tag for at skrive..."</string>
@@ -2921,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Dockhøjttaler afspiller"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Al lyd"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Kun medielyd"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Lydløs"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Advarsel"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrer"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Aktivér lyde"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Aldrig"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Skift til Kun alarmer frem til <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Skift til Afbryd altid"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Når skærmen er tændt"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Tillad pop op-visning af underretninger, der gøres lydløse af Forstyr ikke"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Tillad, at underretninger, der gøres lydløse af tilstanden Forstyr ikke, vises på skærmen, og vis et ikon i statusbjælken"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Når skærmen er slukket"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Tillad, at underretninger, der gøres lydløse af Forstyr ikke, tænder skærmen og får lampen til at blinke"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Tillad, at underretninger, der gøres lydløse af Forstyr ikke, tænder skærmen"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Bruge denne enhed som MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Brug USB"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Brug også USB til"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Standardkonfiguration for USB"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Disse indstillinger anvendes, når der er oprettet forbindelse til en anden enhed, og din telefon er ulåst. Opret kun forbindelse til godkendte enheder."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Opladning af denne enhed"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Den tilsluttede enhed oplades"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"I gennemsnit er <xliff:g id="USED_MEMORY">%1$s</xliff:g> ud af <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> hukommelse anvendt"</string>
     <string name="users_summary" msgid="1674864467098487328">"Logget ind som <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> er standard"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"PÅ"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"FRA"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Til"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Fra"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Backup er slået fra"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Opdateret til Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Der er en tilgængelig opdatering"</string>
@@ -3657,9 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Forbundet med <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Forbundet med flere enheder"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Demotilstand for systemets brugerflade"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Natfunktion"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Angiv natfunktion"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Felter for udviklere til Hurtige indstillinger"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Sporing af vindue"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Overfladesporing"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Sporing af 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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Indstillinger for arbejdsprofil"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Søgning efter kontaktpersoner"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Brug Bluetooth, når du kører"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Aktivér Bluetooth automatisk, når du kører"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Se batteriindstillingerne for Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 6c9d91e..9607397 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 Stunde"</item>
     <item msgid="5198271470953124739">"Keine Zeitüberschreitung"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (Standard)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Schwach"</item>
     <item msgid="2042505933058940139">"Schwach"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Als \"kostenpflichtig\" markieren"</item>
     <item msgid="2266114985518865625">"Als \"nicht kostenpflichtig\" markieren"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automatisch (je nach Tageszeit)"</item>
+    <item msgid="6620560879508595181">"Immer an"</item>
+    <item msgid="6385301106124765323">"Immer aus"</item>
+  </string-array>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 2278eaf..87fac32 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -686,7 +686,7 @@
     <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Dein Gerät ist dann nicht mehr mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> gekoppelt"</string>
     <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Gerät entkoppeln"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Verbinden mit..."</string>
-    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird vom Medien-Audiosystem getrennt."</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird vom Medien-Audio getrennt."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird von der Freisprechfunktion getrennt."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird vom Eingabegerät getrennt."</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Der Internetzugriff über <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird deaktiviert."</string>
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Einstellungen speichern"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maximal zulässige Anzahl an verbundenen Bluetooth-Audiogeräten"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Maximal zulässige Anzahl an verbundenen Bluetooth-Audiogeräten auswählen"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Bluetooth-AVDTP-Verzögerungsberichte aktivieren"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Erhalt von Bluetooth-AVDTP-Verzögerungsberichten zulassen"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Streamen"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Kabellose Übertragung aktivieren"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Kein Gerät in der Nähe gefunden."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Standort für Arbeitsprofil"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Berechtigungen auf App-Ebene"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Letzte Standortanfragen"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Keine App hat kürzlich den Standort abgefragt."</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Standortdienste"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Hoher Akkuverbrauch"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Dienst aktivieren"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Farbkorrektur aktivieren"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Untertitel aktivieren"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"AKTIVIERT"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DEAKTIVIERT"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"An"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Aus"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"In Schnelleinstellungen anzeigen"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Korrekturmodus"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Damit du den Anmeldedatenspeicher verwenden kannst, muss auf deinem Gerät ein sicherer Sperrbildschirm eingerichtet sein"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"SPERRE EINRICHTEN"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps mit Nutzungsdatenzugriff"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Notfallsignal"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Sicherung &amp; Wiederherstellung"</string>
@@ -2888,6 +2893,7 @@
     <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>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Inaktivitätsdisplay, Sperrbildschirm"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"Fingerabdruck"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"WLAN-NFC-Tag einrichten"</string>
     <string name="write_tag" msgid="8571858602896222537">"Schreiben"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Zum Schreiben auf ein Tag tippen…"</string>
@@ -2920,10 +2926,13 @@
     <string name="vibrate_on_touch_title" msgid="5388579924689395023">"Bei Berührung vibrieren"</string>
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Dock-Lautsprecherwiedergabe"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Alle Audioquellen"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Nur Audiosysteme von Medien"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Lautlos"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Warnung"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibration"</string>
+    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Nur Medien-Audio"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Töne beim Hochfahren"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Nie"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Bis <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> zur Option \"Nur Wecker\" wechseln"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Zur Option \"Immer unterbrechen\" wechseln"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Wenn der Bildschirm aktiviert ist"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Benachrichtigungen, die durch \"Nicht stören\" stummgeschaltet wurden, auf dem Bildschirm einblenden"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Benachrichtigungen, die durch \"Bitte Nicht stören\" stummgeschaltet wurden, werden auf dem Bildschirm eingeblendet und in der Statusleiste ist ein Symbol für sie zu sehen"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Bei deaktiviertem Bildschirm"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Bei Benachrichtigungen, die durch \"Nicht stören\" stummgeschaltet wurden, Bildschirm aktivieren und LED blinken lassen"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Bei Benachrichtigungen, die durch \"Nicht stören\" stummgeschaltet wurden, Bildschirm aktivieren"</string>
@@ -3267,7 +3276,7 @@
     <string name="app_permissions" msgid="4148222031991883874">"App-Berechtigungen"</string>
     <string name="app_permissions_summary" msgid="5163974162150406324">"Apps, die <xliff:g id="APPS">%1$s</xliff:g> verwenden"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Zum Aktivieren tippen"</string>
-    <string name="tap_to_wake_summary" msgid="4341387904987585616">"Doppeltippe auf den Bildschirm, um das Gerät zu aktivieren."</string>
+    <string name="tap_to_wake_summary" msgid="4341387904987585616">"Tippe doppelt auf den Bildschirm, um das Gerät zu aktivieren."</string>
     <string name="domain_urls_title" msgid="3132983644568821250">"Links öffnen"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"Unterstützte Links nicht öffnen"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"<xliff:g id="DOMAIN">%s</xliff:g> öffnen"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Dieses Gerät als MIDI verwenden"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB verwenden für"</string>
     <string name="usb_use_also" msgid="557340935190819370">"USB auch verwenden für"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Standard-USB-Konfiguration"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Wenn ein anderes Gerät verbunden und dein Smartphone entsperrt ist, werden diese Einstellungen angewendet. Stell nur Verbindungen zu vertrauenswürdigen Geräten her."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Gerät aufladen"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Verbundenes Gerät wird aufgeladen"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Speicher: durchschnittlich <xliff:g id="USED_MEMORY">%1$s</xliff:g> von <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> belegt"</string>
     <string name="users_summary" msgid="1674864467098487328">"Angemeldet als <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="payment_summary" msgid="3472482669588561110">"Standard: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"AKTIVIERT"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"AUS"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"An"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Aus"</string>
     <string name="backup_disabled" msgid="485189128759595412">"\"Sichern\" deaktiviert"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Aktualisiert auf Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Update verfügbar"</string>
@@ -3657,9 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Mit <xliff:g id="ID_1">%1$s</xliff:g> verbunden"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Mit mehreren Geräten verbunden"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Demomodus der System-UI"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Nachtmodus"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Nachtmodus einstellen"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Kacheln für Schnelleinstellungen für Entwickler"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Trace-Fenster"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Oberflächen-Trace"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope Trace"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Einstellungen für Arbeitsprofil"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Suche nach Kontakten"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Im Auto Bluetooth verwenden"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Beim Autofahren automatisch Bluetooth aktivieren"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Akkueinstellungen im Android 8.0-Format anzeigen"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index fb5182e..d42a728 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 ώρα"</item>
     <item msgid="5198271470953124739">"Να μην λήγει ποτέ το χρονικό όριο"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (προεπιλογή)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Κακό"</item>
     <item msgid="2042505933058940139">"Χαμηλό"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Χρήση ως δικτύου με περιορισμούς"</item>
     <item msgid="2266114985518865625">"Χρήση ως δικτύου χωρίς περιορισμούς"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Αυτόματη (ανάλογα με την ώρα της ημέρας)"</item>
+    <item msgid="6620560879508595181">"Πάντα ενεργή"</item>
+    <item msgid="6385301106124765323">"Πάντα ανενεργή"</item>
+  </string-array>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 5669f35..c11dc12 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Διατήρηση ρυθμίσεων"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Μέγιστος αριθμός συνδεδεμένων συσκευών ήχου Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Επιλέξτε τον μέγιστο αριθμό συνδεδεμένων συσκευών ήχου Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Ενεργοποίηση αναφορών καθυστέρησης Bluetooth AVDTP"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Να επιτρέπεται η λήψη αναφορών καθυστέρησης Bluetooth AVDTP"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Μετάδοση"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Ενεργοποίηση ασύρματης οθόνης"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Δεν βρέθηκαν κοντινές συσκευές."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Τοποθεσία για προφίλ εργασίας"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Άδειες επιπέδου εφαρμογών"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Πρόσφατα αιτήματα τοποθεσίας"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Καμία εφαρμογή δεν ζήτησε πρόσφατα την τοποθεσία σας."</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Υπηρεσίες τοποθεσίας"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Υψηλή χρήση μπαταρίας"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Χρήση υπηρεσίας"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Χρήση διόρθωσης χρωμάτων"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Χρήση υποτίτλων"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ΕΝΕΡΓΟΠΟΙΗΣΗ"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ΑΠΕΝΕΡΓΟΠΟΙΗΣΗ"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Ενεργή"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Ανενεργή"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Εμφάνιση στις Γρήγορες ρυθμίσεις"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Λειτουργία διόρθωσης"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Για να αρχίσετε να χρησιμοποιείτε τον αποθηκευτικό χώρο διαπιστευτηρίων, η συσκευή σας θα πρέπει να διαθέτει οθόνη ασφαλούς κλειδώματος"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ΡΥΘΜΙΣΗ ΚΛΕΙΔΩΜΑΤΟΣ"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Εφ/γές με πρόσβ. χρ."</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Τόνος επείγουσας ανάγκης"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"Ορισμός συμπεριφοράς κατά την πραγματοποίηση κλήσης επείγουσας ανάγκης"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Δημιουργία αντιγράφων ασφαλείας"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Δημιουργία αντιγράφου ασφαλείας και επαναφορά"</string>
@@ -2888,6 +2893,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"σειριακός αριθμός, έκδοση εξοπλισμού"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"επίπεδο ενημέρωσης κώδικα ασφαλείας Android, έκδοση βασικού φάσματος, έκδοση πυρήνα"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Οθόνη περιβάλλοντος, Οθόνη κλειδώματος οθόνης"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"δακτυλικό αποτύπωμα"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Ρύθμιση ετικέτας ΕΚΠ Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Εγγραφή"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Αγγίξτε μια ετικέτα για εγγραφή…"</string>
@@ -2921,9 +2927,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Σίγαση"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Προειδοποίηση"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Δόνηση"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Ήχοι ενεργοποίησης"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Ποτέ"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Αλλαγή σε ξυπνητήρια μόνο έως τις <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Αλλαγή σε διακοπές πάντα"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Όταν η οθόνη είναι ενεργή"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Να επιτρέπεται η εμφάνιση στην οθόνη ειδοποιήσεων που έχουν τεθεί σε σίγαση με τη λειτουργία \"Μην ενοχλείτε\""</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Να επιτρέπεται η εμφάνιση ειδοπ. που τέθηκαν σε παύση από τη λειτ. \"Μην ενοχλείτε\" στην οθόνη και ενός εικονιδ. γραμμής κατάστασης"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Όταν η οθόνη είναι απενεργοποιημένη"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Να επιτρέπεται η ενεργ. της οθόνης και το αναβόσβημα του φωτός από ειδοποιήσεις που τέθηκαν σε σίγαση με τη λειτ. \"Μην ενοχλείτε\""</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Να επιτρέπεται η ενεργοποίηση της οθόνης από ειδοποιήσεις που έχουν τεθεί σε σίγαση με τη λειτουργία \"Μην ενοχλείτε\""</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Χρήση αυτής της συσκευής ως MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Χρήση USB για"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Χρησιμοποιήστε επίσης το USB για"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Προεπιλεγμένη διαμόρφωση USB"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Όταν συνδέεται μια άλλη συσκευή και το τηλέφωνό σας ξεκλειδώνει, θα εφαρμοστούν αυτές οι ρυθμίσεις. Να συνδέεστε μόνο σε αξιόπιστες συσκευές."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Φόρτιση αυτής της συσκευής"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Φόρτιση συνδεδεμένης συσκευής"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Χρησιμοποιείται κατά μέσο όρο <xliff:g id="USED_MEMORY">%1$s</xliff:g> από <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> μνήμης"</string>
     <string name="users_summary" msgid="1674864467098487328">"Συνδέθηκε ως <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> είναι επιλεγμένη από προεπιλογή"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"ΕΝΕΡΓΗ"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"ΑΠΕΝΕΡΓΟΠΟΙΗΣΗ"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Ενεργή"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Ανενεργή"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Η δημιουργία αντιγράφων ασφαλείας έχει απενεργοποιηθεί"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Ενημερώθηκε σε Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Διαθέσιμη ενημέρωση"</string>
@@ -3657,9 +3664,10 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"Πλακίδια προγραμματιστή για γρήγορες ρυθμίσεις"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Παρακολούθηση παραθύρου"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Ανίχνευση επιφάνειας"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Ρυθμίσεις προφίλ εργασίας"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Αναζήτηση επαφών"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Χρήση Bluetooth κατά την οδήγηση"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Να ενεργοποιείται αυτόματα το Bluetooth κατά την οδήγηση"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Ανατρέξτε στις ρυθμίσεις μπαταρίας του Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rAU/arrays.xml b/res/values-en-rAU/arrays.xml
index 8b87a4e..9546b09 100644
--- a/res/values-en-rAU/arrays.xml
+++ b/res/values-en-rAU/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 hour"</item>
     <item msgid="5198271470953124739">"Never time out"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (Default)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Poor"</item>
     <item msgid="2042505933058940139">"Poor"</item>
@@ -497,7 +489,9 @@
     <item msgid="8745603368609022803">"Treat as metered"</item>
     <item msgid="2266114985518865625">"Treat as unmetered"</item>
   </string-array>
-    <!-- no translation found for dark_ui_mode_entries:0 (146804192658443142) -->
-    <!-- no translation found for dark_ui_mode_entries:1 (6620560879508595181) -->
-    <!-- no translation found for dark_ui_mode_entries:2 (6385301106124765323) -->
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automatic (based on time of day)"</item>
+    <item msgid="6620560879508595181">"Always on"</item>
+    <item msgid="6385301106124765323">"Always off"</item>
+  </string-array>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index b2fe946..d985bf4 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -707,10 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Remember settings"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maximum connected Bluetooth audio devices"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Select maximum number of connected Bluetooth audio devices"</string>
-    <!-- no translation found for bluetooth_enable_avdtp_delay_reports (5101903170688399944) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_avdtp_delay_reports_summary (7052797876020616399) -->
-    <skip />
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Enable Bluetooth AVDTP delay reports"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Allow receiving Bluetooth AVDTP delay reports"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Enable wireless display"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No nearby devices were found."</string>
@@ -1445,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Location for work profile"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"App-level permissions"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Recent location requests"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"No apps have requested location recently"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Location services"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"High battery use"</string>
@@ -1884,10 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Use service"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Use colour correction"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Use captions"</string>
-    <!-- no translation found for accessibility_summary_state_enabled (7914278500885887763) -->
-    <skip />
-    <!-- no translation found for accessibility_summary_state_disabled (2984230257590246745) -->
-    <skip />
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"On"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Off"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Show in Quick Settings"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Correction mode"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2319,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Before you can use credential storage, your device needs to have a secure lock screen"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"SET LOCK"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps with usage access"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Emergency tone"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Backup &amp; restore"</string>
@@ -2894,8 +2893,7 @@
     <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>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambient display, Lock screen display"</string>
-    <!-- no translation found for keywords_fingerprint_settings (239222512315619538) -->
-    <skip />
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"fingerprint"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Set up Wi-Fi NFC Tag"</string>
     <string name="write_tag" msgid="8571858602896222537">"Write"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tap a tag to write..."</string>
@@ -2929,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Dock speaker plays"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"All audio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Media audio only"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Silent"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alert"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrate"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Power on sounds"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Never"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3178,8 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Change to alarms only until <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Change to always interrupt"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"When the screen is on"</string>
-    <!-- no translation found for zen_mode_screen_on_summary (2208664848367443505) -->
-    <skip />
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Let notifications silenced by Do Not Disturb pop on screen and show a status bar icon"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"When the screen is off"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Let notifications silenced by Do Not Disturb turn on the screen and blink the light"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Let notifications silenced by Do Not Disturb turn on the screen"</string>
@@ -3489,10 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Avg <xliff:g id="USED_MEMORY">%1$s</xliff:g> of <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> memory used"</string>
     <string name="users_summary" msgid="1674864467098487328">"Signed in as <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> is default"</string>
-    <!-- no translation found for location_on_summary (3637699010986988970) -->
-    <skip />
-    <!-- no translation found for location_off_summary (7217264690673949107) -->
-    <skip />
+    <string name="location_on_summary" msgid="3637699010986988970">"On"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Off"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Backup disabled"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Updated to Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Update available"</string>
@@ -3666,13 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connected to <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connected to multiple devices"</string>
     <string name="demo_mode" msgid="2798762752209330277">"System UI demo mode"</string>
-    <!-- no translation found for dark_ui_mode (2112241426441807273) -->
-    <skip />
-    <!-- no translation found for dark_ui_mode_title (975299966259850992) -->
-    <skip />
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Night mode"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Set Night mode"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Quick settings developer tiles"</string>
-    <!-- no translation found for winscope_trace_quick_settings_title (1294290008255732032) -->
-    <skip />
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope Trace"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Work profile settings"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Contact search"</string>
@@ -3868,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Use Bluetooth when driving"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Turn on Bluetooth automatically when driving"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"See Android 8.0 battery settings"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rCA/arrays.xml b/res/values-en-rCA/arrays.xml
index 8b87a4e..9546b09 100644
--- a/res/values-en-rCA/arrays.xml
+++ b/res/values-en-rCA/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 hour"</item>
     <item msgid="5198271470953124739">"Never time out"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (Default)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Poor"</item>
     <item msgid="2042505933058940139">"Poor"</item>
@@ -497,7 +489,9 @@
     <item msgid="8745603368609022803">"Treat as metered"</item>
     <item msgid="2266114985518865625">"Treat as unmetered"</item>
   </string-array>
-    <!-- no translation found for dark_ui_mode_entries:0 (146804192658443142) -->
-    <!-- no translation found for dark_ui_mode_entries:1 (6620560879508595181) -->
-    <!-- no translation found for dark_ui_mode_entries:2 (6385301106124765323) -->
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automatic (based on time of day)"</item>
+    <item msgid="6620560879508595181">"Always on"</item>
+    <item msgid="6385301106124765323">"Always off"</item>
+  </string-array>
 </resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 81d4ca8..aa5af66 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -707,10 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Remember settings"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maximum connected Bluetooth audio devices"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Select maximum number of connected Bluetooth audio devices"</string>
-    <!-- no translation found for bluetooth_enable_avdtp_delay_reports (5101903170688399944) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_avdtp_delay_reports_summary (7052797876020616399) -->
-    <skip />
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Enable Bluetooth AVDTP delay reports"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Allow receiving Bluetooth AVDTP delay reports"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Enable wireless display"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No nearby devices were found."</string>
@@ -1445,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Location for work profile"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"App-level permissions"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Recent location requests"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"No apps have requested location recently"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Location services"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"High battery use"</string>
@@ -1884,10 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Use service"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Use colour correction"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Use captions"</string>
-    <!-- no translation found for accessibility_summary_state_enabled (7914278500885887763) -->
-    <skip />
-    <!-- no translation found for accessibility_summary_state_disabled (2984230257590246745) -->
-    <skip />
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"On"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Off"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Show in Quick Settings"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Correction mode"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2319,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Before you can use credential storage, your device needs to have a secure lock screen"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"SET LOCK"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps with usage access"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Emergency tone"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Backup &amp; restore"</string>
@@ -2894,8 +2893,7 @@
     <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>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambient display, Lock screen display"</string>
-    <!-- no translation found for keywords_fingerprint_settings (239222512315619538) -->
-    <skip />
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"fingerprint"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Set up Wi-Fi NFC Tag"</string>
     <string name="write_tag" msgid="8571858602896222537">"Write"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tap a tag to write..."</string>
@@ -2929,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Dock speaker plays"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"All audio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Media audio only"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Silent"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alert"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrate"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Power on sounds"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Never"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3178,8 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Change to alarms only until <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Change to always interrupt"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"When the screen is on"</string>
-    <!-- no translation found for zen_mode_screen_on_summary (2208664848367443505) -->
-    <skip />
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Let notifications silenced by Do Not Disturb pop on screen and show a status bar icon"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"When the screen is off"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Let notifications silenced by Do Not Disturb turn on the screen and blink the light"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Let notifications silenced by Do Not Disturb turn on the screen"</string>
@@ -3489,10 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Avg <xliff:g id="USED_MEMORY">%1$s</xliff:g> of <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> memory used"</string>
     <string name="users_summary" msgid="1674864467098487328">"Signed in as <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> is default"</string>
-    <!-- no translation found for location_on_summary (3637699010986988970) -->
-    <skip />
-    <!-- no translation found for location_off_summary (7217264690673949107) -->
-    <skip />
+    <string name="location_on_summary" msgid="3637699010986988970">"On"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Off"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Backup disabled"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Updated to Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Update available"</string>
@@ -3666,13 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connected to <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connected to multiple devices"</string>
     <string name="demo_mode" msgid="2798762752209330277">"System UI demo mode"</string>
-    <!-- no translation found for dark_ui_mode (2112241426441807273) -->
-    <skip />
-    <!-- no translation found for dark_ui_mode_title (975299966259850992) -->
-    <skip />
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Night mode"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Set Night mode"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Quick settings developer tiles"</string>
-    <!-- no translation found for winscope_trace_quick_settings_title (1294290008255732032) -->
-    <skip />
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope Trace"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Work profile settings"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Contact search"</string>
@@ -3868,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Use Bluetooth when driving"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Turn on Bluetooth automatically when driving"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"See Android 8.0 battery settings"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 8b87a4e..9546b09 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 hour"</item>
     <item msgid="5198271470953124739">"Never time out"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (Default)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Poor"</item>
     <item msgid="2042505933058940139">"Poor"</item>
@@ -497,7 +489,9 @@
     <item msgid="8745603368609022803">"Treat as metered"</item>
     <item msgid="2266114985518865625">"Treat as unmetered"</item>
   </string-array>
-    <!-- no translation found for dark_ui_mode_entries:0 (146804192658443142) -->
-    <!-- no translation found for dark_ui_mode_entries:1 (6620560879508595181) -->
-    <!-- no translation found for dark_ui_mode_entries:2 (6385301106124765323) -->
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automatic (based on time of day)"</item>
+    <item msgid="6620560879508595181">"Always on"</item>
+    <item msgid="6385301106124765323">"Always off"</item>
+  </string-array>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index b2fe946..d985bf4 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -707,10 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Remember settings"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maximum connected Bluetooth audio devices"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Select maximum number of connected Bluetooth audio devices"</string>
-    <!-- no translation found for bluetooth_enable_avdtp_delay_reports (5101903170688399944) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_avdtp_delay_reports_summary (7052797876020616399) -->
-    <skip />
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Enable Bluetooth AVDTP delay reports"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Allow receiving Bluetooth AVDTP delay reports"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Enable wireless display"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No nearby devices were found."</string>
@@ -1445,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Location for work profile"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"App-level permissions"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Recent location requests"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"No apps have requested location recently"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Location services"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"High battery use"</string>
@@ -1884,10 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Use service"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Use colour correction"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Use captions"</string>
-    <!-- no translation found for accessibility_summary_state_enabled (7914278500885887763) -->
-    <skip />
-    <!-- no translation found for accessibility_summary_state_disabled (2984230257590246745) -->
-    <skip />
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"On"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Off"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Show in Quick Settings"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Correction mode"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2319,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Before you can use credential storage, your device needs to have a secure lock screen"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"SET LOCK"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps with usage access"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Emergency tone"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Backup &amp; restore"</string>
@@ -2894,8 +2893,7 @@
     <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>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambient display, Lock screen display"</string>
-    <!-- no translation found for keywords_fingerprint_settings (239222512315619538) -->
-    <skip />
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"fingerprint"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Set up Wi-Fi NFC Tag"</string>
     <string name="write_tag" msgid="8571858602896222537">"Write"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tap a tag to write..."</string>
@@ -2929,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Dock speaker plays"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"All audio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Media audio only"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Silent"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alert"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrate"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Power on sounds"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Never"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3178,8 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Change to alarms only until <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Change to always interrupt"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"When the screen is on"</string>
-    <!-- no translation found for zen_mode_screen_on_summary (2208664848367443505) -->
-    <skip />
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Let notifications silenced by Do Not Disturb pop on screen and show a status bar icon"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"When the screen is off"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Let notifications silenced by Do Not Disturb turn on the screen and blink the light"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Let notifications silenced by Do Not Disturb turn on the screen"</string>
@@ -3489,10 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Avg <xliff:g id="USED_MEMORY">%1$s</xliff:g> of <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> memory used"</string>
     <string name="users_summary" msgid="1674864467098487328">"Signed in as <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> is default"</string>
-    <!-- no translation found for location_on_summary (3637699010986988970) -->
-    <skip />
-    <!-- no translation found for location_off_summary (7217264690673949107) -->
-    <skip />
+    <string name="location_on_summary" msgid="3637699010986988970">"On"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Off"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Backup disabled"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Updated to Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Update available"</string>
@@ -3666,13 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connected to <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connected to multiple devices"</string>
     <string name="demo_mode" msgid="2798762752209330277">"System UI demo mode"</string>
-    <!-- no translation found for dark_ui_mode (2112241426441807273) -->
-    <skip />
-    <!-- no translation found for dark_ui_mode_title (975299966259850992) -->
-    <skip />
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Night mode"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Set Night mode"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Quick settings developer tiles"</string>
-    <!-- no translation found for winscope_trace_quick_settings_title (1294290008255732032) -->
-    <skip />
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope Trace"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Work profile settings"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Contact search"</string>
@@ -3868,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Use Bluetooth when driving"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Turn on Bluetooth automatically when driving"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"See Android 8.0 battery settings"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml
index 8b87a4e..9546b09 100644
--- a/res/values-en-rIN/arrays.xml
+++ b/res/values-en-rIN/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 hour"</item>
     <item msgid="5198271470953124739">"Never time out"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (Default)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Poor"</item>
     <item msgid="2042505933058940139">"Poor"</item>
@@ -497,7 +489,9 @@
     <item msgid="8745603368609022803">"Treat as metered"</item>
     <item msgid="2266114985518865625">"Treat as unmetered"</item>
   </string-array>
-    <!-- no translation found for dark_ui_mode_entries:0 (146804192658443142) -->
-    <!-- no translation found for dark_ui_mode_entries:1 (6620560879508595181) -->
-    <!-- no translation found for dark_ui_mode_entries:2 (6385301106124765323) -->
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automatic (based on time of day)"</item>
+    <item msgid="6620560879508595181">"Always on"</item>
+    <item msgid="6385301106124765323">"Always off"</item>
+  </string-array>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index b2fe946..d985bf4 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -707,10 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Remember settings"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maximum connected Bluetooth audio devices"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Select maximum number of connected Bluetooth audio devices"</string>
-    <!-- no translation found for bluetooth_enable_avdtp_delay_reports (5101903170688399944) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_avdtp_delay_reports_summary (7052797876020616399) -->
-    <skip />
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Enable Bluetooth AVDTP delay reports"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Allow receiving Bluetooth AVDTP delay reports"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Enable wireless display"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No nearby devices were found."</string>
@@ -1445,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Location for work profile"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"App-level permissions"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Recent location requests"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"No apps have requested location recently"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Location services"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"High battery use"</string>
@@ -1884,10 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Use service"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Use colour correction"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Use captions"</string>
-    <!-- no translation found for accessibility_summary_state_enabled (7914278500885887763) -->
-    <skip />
-    <!-- no translation found for accessibility_summary_state_disabled (2984230257590246745) -->
-    <skip />
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"On"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Off"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Show in Quick Settings"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Correction mode"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2319,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Before you can use credential storage, your device needs to have a secure lock screen"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"SET LOCK"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps with usage access"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Emergency tone"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Backup &amp; restore"</string>
@@ -2894,8 +2893,7 @@
     <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>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambient display, Lock screen display"</string>
-    <!-- no translation found for keywords_fingerprint_settings (239222512315619538) -->
-    <skip />
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"fingerprint"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Set up Wi-Fi NFC Tag"</string>
     <string name="write_tag" msgid="8571858602896222537">"Write"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tap a tag to write..."</string>
@@ -2929,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Dock speaker plays"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"All audio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Media audio only"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Silent"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alert"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrate"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Power on sounds"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Never"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3178,8 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Change to alarms only until <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Change to always interrupt"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"When the screen is on"</string>
-    <!-- no translation found for zen_mode_screen_on_summary (2208664848367443505) -->
-    <skip />
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Let notifications silenced by Do Not Disturb pop on screen and show a status bar icon"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"When the screen is off"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Let notifications silenced by Do Not Disturb turn on the screen and blink the light"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Let notifications silenced by Do Not Disturb turn on the screen"</string>
@@ -3489,10 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Avg <xliff:g id="USED_MEMORY">%1$s</xliff:g> of <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> memory used"</string>
     <string name="users_summary" msgid="1674864467098487328">"Signed in as <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> is default"</string>
-    <!-- no translation found for location_on_summary (3637699010986988970) -->
-    <skip />
-    <!-- no translation found for location_off_summary (7217264690673949107) -->
-    <skip />
+    <string name="location_on_summary" msgid="3637699010986988970">"On"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Off"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Backup disabled"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Updated to Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Update available"</string>
@@ -3666,13 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connected to <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connected to multiple devices"</string>
     <string name="demo_mode" msgid="2798762752209330277">"System UI demo mode"</string>
-    <!-- no translation found for dark_ui_mode (2112241426441807273) -->
-    <skip />
-    <!-- no translation found for dark_ui_mode_title (975299966259850992) -->
-    <skip />
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Night mode"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Set Night mode"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Quick settings developer tiles"</string>
-    <!-- no translation found for winscope_trace_quick_settings_title (1294290008255732032) -->
-    <skip />
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope Trace"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Work profile settings"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Contact search"</string>
@@ -3868,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Use Bluetooth when driving"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Turn on Bluetooth automatically when driving"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"See Android 8.0 battery settings"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rXC/arrays.xml b/res/values-en-rXC/arrays.xml
index e5ab074..a04f1ad 100644
--- a/res/values-en-rXC/arrays.xml
+++ b/res/values-en-rXC/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎‎‎‎‎‎‎‎‏‎‏‎‎‎‏‎‎‏‏‎‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‎1 hour‎‏‎‎‏‎"</item>
     <item msgid="5198271470953124739">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‎‏‏‎‏‎‏‎‏‎‏‎‎‏‏‏‎‎‎‎‎‏‏‎Never time out‎‏‎‎‏‎"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‏‏‎‏‎‎‏‎‏‎‎‏‏‎‏‏‎‏‏‏‎‏‎‎‏‏‏‏‎‎‏‏‎‏‎‎‎‎‏‎‎‏‎‎‏‎1 (Default)‎‏‎‎‏‎"</item>
-    <item msgid="7584056855393485416">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‎‏‎‎‏‏‎‎‎‎‏‏‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎‏‎‎‎‎2‎‏‎‎‏‎"</item>
-    <item msgid="844570832050176311">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‎‎‎‏‎‎‏‎‏‏‎‎‏‎‎‏‏‏‎‎‎‎‎‎‎‎‎‎‎‏‏‏‎‎‎‎‎‏‎‎‏‏‎‏‏‏‎3‎‏‎‎‏‎"</item>
-    <item msgid="1896812737336024220">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‎‎‏‎‏‏‎‏‎‏‎‏‎‎‏‎‎‎‏‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‎‏‏‎‎‏‏‏‎‎‏‎‎‏‏‏‎‎‎4‎‏‎‎‏‎"</item>
-    <item msgid="2664420770707984266">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‏‏‎‎‎‎‎‎‏‎‎‎‏‏‏‎‎‎‏‏‎‎‏‏‏‏‏‎‎‎‏‎‏‎‎5‎‏‎‎‏‎"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‎‏‎‏‏‎‏‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‎‎‏‏‎‏‎‎‏‏‏‏‎‎‏‎‎1‎‏‎‎‏‎"</item>
-    <item msgid="2731443086402670729">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‎‎‎‎‎‎‎‏‎‎‏‎‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‎‏‎‎‏‎‏‎‎‎‎‏‎‎‎‏‎‎‏‎2‎‏‎‎‏‎"</item>
-    <item msgid="74627748729027880">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‎‎‎‏‎‎‏‎‎‏‎‎‎‎‏‏‎‎‎‏‎‏‎‏‏‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‎3‎‏‎‎‏‎"</item>
-    <item msgid="2654447223197666662">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‏‎‏‏‎‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‎‎‎‏‎‏‏‎‏‏‏‎‎‎‎‎‎‎‏‏‎‏‎‏‏‎‎‏‏‎‎4‎‏‎‎‏‎"</item>
-    <item msgid="7026157954713482328">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‏‎‏‏‎‏‏‏‏‎‎‎‎‎‎‏‎‎‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‏‎‏‏‎‎‎‎5‎‏‎‎‏‎"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‎‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‏‎‎‎‎‎‎‏‎‏‎‎‏‏‏‎‏‎Poor‎‏‎‎‏‎"</item>
     <item msgid="2042505933058940139">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‎‎‎‎‏‏‏‎‎‎‎‎‏‎‏‎‎‏‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‏‎‎‏‏‏‎‏‎‏‏‎Poor‎‏‎‎‏‎"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‏‎‏‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‏‎‎‎‏‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‏‎‏‎‎‏‏‎Treat as metered‎‏‎‎‏‎"</item>
     <item msgid="2266114985518865625">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‎‏‏‎‏‏‏‎‎‏‎‎‏‎‏‎‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‎‎‏‏‏‎‎‏‏‎‏‏‎‎‏‎Treat as unmetered‎‏‎‎‏‎"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎‎‎‏‏‎‏‏‎‏‎‎‎‏‎‏‎‏‎‏‎‏‎‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‏‎‎‎‎‏‏‎‎Automatic (based on time of day)‎‏‎‎‏‎"</item>
+    <item msgid="6620560879508595181">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‎‏‏‏‎‏‏‎‎‏‏‏‏‎‏‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‏‎‏‎Always on‎‏‎‎‏‎"</item>
+    <item msgid="6385301106124765323">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‏‎‏‎‎‏‎‎‏‎‏‏‎‎‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎‏‏‎Always off‎‏‎‎‏‎"</item>
+  </string-array>
 </resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 4e33693..0c46a91 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -706,6 +706,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‏‎‏‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‏‏‎‏‏‎‎‎‏‏‏‏‏‎‎‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎Remember settings‎‏‎‎‏‎"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‏‏‎‎‎‏‏‏‎‎‏‎‎‎‏‏‏‎‎‏‎‎‏‏‏‏‏‏‎‎‏‎‎‏‎Maximum connected Bluetooth audio devices‎‏‎‎‏‎"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‏‏‎‏‎‎‎‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‏‎Select maximum number of connected Bluetooth audio devices‎‏‎‎‏‎"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‎‏‏‎‏‏‎‎‏‏‎‎‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‏‏‏‎‏‎‎‏‎‎‏‎‎‎‎Enable Bluetooth AVDTP delay reports‎‏‎‎‏‎"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎‏‎‎‎‎‏‎‎‎‏‏‎‏‎‏‏‎‏‎‎‏‏‏‎‎‏‏‎‎‏‏‏‏‎Allow receiving Bluetooth AVDTP delay reports‎‏‎‎‏‎"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‎‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‏‎‏‎‎‎‎‎‏‏‎‏‎‎‏‏‎‏‎‎‎‏‏‏‎‎‏‎‎‎‎Cast‎‏‎‎‏‎"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‎‏‎‎‎‎‎‎‎‏‏‏‏‏‎‎‏‎‏‎‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‏‏‎‏‎‎Enable wireless display‎‏‎‎‏‎"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‏‎‏‏‏‏‎‎‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‏‏‏‎‎‏‏‎‏‎‏‏‏‏‎‎‎‎‏‏‎‏‏‏‎‏‎No nearby devices were found.‎‏‎‎‏‎"</string>
@@ -1440,6 +1442,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‎‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‎‏‏‎‎‎‎‏‏‎Location for work profile‎‏‎‎‏‎"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‏‎‏‎‏‎‏‏‏‎‎‏‎‏‎‏‏‎‏‎‎‏‎‏‏‎‏‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‏‏‏‏‏‎‏‏‎App-level permissions‎‏‎‎‏‎"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‏‎‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‏‏‎‏‎Recent location requests‎‏‎‎‏‎"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‏‏‎‏‏‎‏‎‎‎‏‎‏‎‏‎‎‏‏‎‎‎‏‏‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎No apps have requested location recently‎‏‎‎‏‎"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‏‏‎‎‎‎‏‎‎‎‏‎‏‎‏‎‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‎Location services‎‏‎‎‏‎"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‏‏‎‏‏‎‏‎‎‏‏‎‏‏‏‎‏‎‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‎‏‎‏‎‏‏‏‏‎‏‎‎‎High battery use‎‏‎‎‏‎"</string>
@@ -1879,8 +1883,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‎‏‎‏‏‏‎‏‏‎‏‎‎‏‎‏‏‎‎‏‏‎‏‎‎‎‎‎‎‎‎‏‏‎‏‎‏‏‎‎‎‏‎‏‏‏‏‏‎Use service‎‏‎‎‏‎"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‎‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‏‎‎‎‏‎‎‎‎‎‎‎‏‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‎‏‎‎Use color correction‎‏‎‎‏‎"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎‎‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‎‎‎‎‏‎‎Use captions‎‏‎‎‏‎"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‏‎‎‎‏‏‎‎‎‎‏‎‏‏‎‏‎‎‏‎‎‎‏‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎ON‎‏‎‎‏‎"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎‎‎‎‎‏‎‏‎‎‏‏‎‏‏‎‏‏‎‏‏‎OFF‎‏‎‎‏‎"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‎‏‎‎‏‎‏‎‏‎‎‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‏‏‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎On‎‏‎‎‏‎"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‎‏‎‏‎‎‎‎‏‏‏‎‏‏‎‎‏‏‎‏‏‏‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‏‏‏‎‏‎‏‎‏‏‎‎‏‎Off‎‏‎‎‏‎"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‏‏‎‎‏‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‎‎‎‏‏‎‎‎‏‎‎‏‎‎‎‎Show in Quick Settings‎‏‎‎‏‎"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‎‏‏‎‎‏‏‏‏‎‎‎‏‎‎‎‏‎‏‎‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎‎‏‎‎‎‏‎‎‏‎‎‎‎‎‎‏‎‎‎‎Correction mode‎‏‎‎‏‎"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2312,7 +2316,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎‏‏‏‎‏‎‎‏‎‏‏‎‎‏‏‎‎‎Before you can use credential storage, your device need to have a secure lock screen‎‏‎‎‏‎"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‎‎‎‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‎‎‏‏‎‎‎‏‎‎‎‏‎‏‏‎‏‎‎‏‏‎‏‎‎‎‎‎‎‎‏‏‎‎‏‎SET LOCK‎‏‎‎‏‎"</string>
     <string name="usage_access_title" msgid="332333405495457839">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‎‏‎‏‏‎‎‎‏‏‎‏‎‏‏‏‏‎‎‎‎‎‏‎‏‏‏‏‎Apps with usage access‎‏‎‎‏‎"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‎‎‏‏‏‏‎‎‎‎‎‎‏‎‎‎‎‏‏‎‎‏‏‏‎‏‎‏‎‎‏‎‎‎‏‎‎‎‎‎‎‎‎‏‏‎‎‏‎‏‎‏‎‎Emergency tone‎‏‎‎‏‎"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‎‎Backup &amp; restore‎‏‎‎‏‎"</string>
@@ -2887,6 +2892,7 @@
     <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>
     <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="setup_wifi_nfc_tag" msgid="9028353016222911016">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‎‎‏‎‎‏‏‏‎‎‏‏‏‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‏‎‎‎‎‏‎‏‎‎‎‏‎‏‎‎‎‎Set up Wi-Fi NFC Tag‎‏‎‎‏‎"</string>
     <string name="write_tag" msgid="8571858602896222537">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‏‎‏‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎‎‎‎‎‎‏‎‏‏‎‏‎‎‏‎‏‎‎‏‎‎‏‎Write‎‏‎‎‏‎"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‏‎‎‎‏‎‏‏‎‎‎‎‎‎‏‏‎‎‎‏‏‎‎‏‏‏‏‎‎‏‎‏‎‏‎‎‏‎Tap a tag to write...‎‏‎‎‏‎"</string>
@@ -2920,9 +2926,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‏‏‎‎‎‎‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‎‏‎‎‎‎‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‎‏‎‎‏‏‏‏‏‎‎‎Dock speaker plays‎‏‎‎‏‎"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‎‎‏‎‎‎‏‎‎‏‎‎‎‏‎‎‎‏‎‏‎‏‏‏‎‎‏‎‏‎‏‎‎‎‏‎‏‎‏‎‎‎‎‎‎All audio‎‏‎‎‏‎"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‎‎‏‎‎‏‎‏‎‏‏‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‎‎‏‎‏‏‎‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‎‎‏‎Media audio only‎‏‎‎‏‎"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‏‎‎‏‏‏‏‎‎‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎Silent‎‏‎‎‏‎"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‎‏‏‎‏‎‎‎‏‎‎‎‏‏‎‏‏‏‎‎‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‏‎Alert‎‏‎‎‏‎"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‎‎‎‏‏‏‏‎‎‎‏‎‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎Vibrate‎‏‎‎‏‎"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‏‎‏‏‎‏‎‏‎‎‏‏‎‏‏‎‎‎‎‎‎‏‏‏‎‏‎Power on sounds‎‏‎‎‏‎"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‏‏‎‎‎‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎Never‎‏‎‎‏‎"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3169,7 +3178,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‎‏‏‏‏‎‏‎‏‏‏‎‎‏‎‎‎‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‎‏‎‎‏‏‎Change to alarms only until ‎‏‎‎‏‏‎<xliff:g id="FORMATTEDTIME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‎‏‎‏‏‎‏‏‎‎‏‎‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‎‏‎‎‎‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‏‎Change to always interrupt‎‏‎‎‏‎"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎‏‎‏‎‏‏‏‏‏‎‎‎‏‏‎‏‏‏‎‎‏‏‎‎‎‏‎‏‎‎‎‎‎‎‏‎‎‏‏‏‏‎‎When the screen is on‎‏‎‎‏‎"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‏‎‎‏‎‏‏‏‎‏‏‎‏‎‎‎‏‎‏‏‎‎‏‎‎‎‏‎‎‎‎‎‏‎‎‎‎‎‎‏‏‎Let notifications silenced by Do Not Disturb pop on screen‎‏‎‎‏‎"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‎‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‏‎‏‎‏‎‏‎‏‏‏‏‎‎‎‏‏‎‎‎‏‎Let notifications silenced by Do Not Disturb pop on screen and show a status bar icon‎‏‎‎‏‎"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‎‎‎‏‏‎‏‎‏‎‎‎‏‏‎‏‎‏‏‎‎‎‏‎‎‎‎‎‏‏‎‎‎‎‏‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‏‎When the screen is off‎‏‎‎‏‎"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‏‏‏‎‎‏‏‎‎‏‎‎‏‎‎‎‏‏‏‏‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‏‎‎Let notifications silenced by Do Not Disturb turn on the screen and blink the light‎‏‎‎‏‎"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‏‏‎‎‎‎‏‏‎‎‏‏‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‎‎‎‎‎‎‏‏‎‎‎‎‏‎Let notifications silenced by Do Not Disturb turn on the screen‎‏‎‎‏‎"</string>
@@ -3357,10 +3366,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‎‏‏‏‏‎‎‎‏‏‎‎‏‎‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎‎‎‎‏‏‎‏‎‏‎‏‎‏‏‎‏‏‏‎Use this device as MIDI‎‏‎‎‏‎"</string>
     <string name="usb_use" msgid="3372728031108932425">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‏‏‎‎‏‎‏‎‏‏‎‎‏‎‎‎‏‏‎‎‏‎‏‏‎‏‎‎‏‎‎‎‎‎‎‎‎‏‎‎‎‏‏‎‏‎‎‏‎‎‏‎Use USB for‎‏‎‎‏‎"</string>
     <string name="usb_use_also" msgid="557340935190819370">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‏‎‎‏‎‏‎‏‎‎‎‎‎‏‎‏‎‏‏‎‎‏‏‎‏‎‏‎‏‎‎‏‏‎‎‏‎‎‎‏‎‏‎‏‎‎Also use USB for‎‏‎‎‏‎"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‎‏‏‎‎‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎‎‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎‏‏‎‎Default USB Configuration‎‏‎‎‏‎"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‏‎‎‏‎‏‎‎‎‎‎‎‎‎‏‎‏‏‎‎‎‏‎‎‏‏‎‎‎‏‎‏‎‏‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎When another device is connected and your phone is unlocked, these settings will be applied. Only connect to trusted devices.‎‏‎‎‏‎"</string>
     <string name="usb_pref" msgid="1400617804525116158">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‎‏‏‏‏‎‎‎‎‏‏‎‎‏‏‏‎‏‎‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎USB‎‏‎‎‏‎"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‎‏‎‏‏‎‏‎‏‎‏‎‏‏‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‎‏‎‎‏‎‎‏‏‏‎‎‏‏‏‎‎‏‏‏‎Charging this device‎‏‎‎‏‎"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‏‎‏‎‎‏‎‎‏‏‎‏‏‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‏‏‎‎Charging connected device‎‏‎‎‏‎"</string>
@@ -3481,8 +3488,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‏‏‎‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎‏‎‎‎‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‎‎‏‎‎‎‎‎Avg ‎‏‎‎‏‏‎<xliff:g id="USED_MEMORY">%1$s</xliff:g>‎‏‎‎‏‏‏‎ of ‎‏‎‎‏‏‎<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>‎‏‎‎‏‏‏‎ memory used‎‏‎‎‏‎"</string>
     <string name="users_summary" msgid="1674864467098487328">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‏‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‏‎‎‎‏‎‎‏‎‏‎‎‎‏‎‎‎‎‎‎Signed in as ‎‏‎‎‏‏‎<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>‎‏‎‎‏‏‏‎ is default‎‏‎‎‏‎"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‎‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‏‎‏‏‏‎‏‎‎‏‏‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‏‎‏‏‏‎ON‎‏‎‎‏‎"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‏‏‎‎‎‏‎‎‏‎‎‎‏‎‎‎‎‏‎‏‏‏‎‏‎‎‎‎‏‎‎‎‏‏‎‎‏‏‎‏‎‏‎OFF‎‏‎‎‏‎"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‏‎‏‏‎‏‎‏‎‏‎‏‏‎‏‎‏‎‏‎‎On‎‏‎‎‏‎"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‏‏‎‎‏‏‎‏‏‎‎‏‏‎Off‎‏‎‎‏‎"</string>
     <string name="backup_disabled" msgid="485189128759595412">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‏‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‎‏‏‎‏‎‎‎‏‏‎‎‏‎‏‎‎‎Back up disabled‎‏‎‎‏‎"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‎‎‏‎‏‏‎‏‎‎‎‎‎‎‏‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‏‏‏‎‎Updated to Android ‎‏‎‎‏‏‎<xliff:g id="VERSION">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‎‎‎‎‎‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‎‏‎‏‎‎‏‎‎Update available‎‏‎‎‏‎"</string>
@@ -3656,9 +3663,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‎‏‎‏‏‎‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎Connected to ‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‎‎‎Connected to multiple devices‎‏‎‎‏‎"</string>
     <string name="demo_mode" msgid="2798762752209330277">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‏‎‏‏‏‎‎‏‏‎‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‎‏‎‎‎‎‎‏‎‎‎‎‎‎‏‏‎‎‏‎‏‎System UI demo mode‎‏‎‎‏‎"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‏‎‏‎‎‎‎‎‎‏‏‎‎‎‎‎‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‏‎‎‏‎‏‏‎‏‎‏‎‎‏‎Night mode‎‏‎‎‏‎"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‎‎‎‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‏‎‎‎‎‎Set Night mode‎‏‎‎‏‎"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‎‏‎‏‏‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‎‎‏‎‏‏‎‎‎‎‏‎‏‎‏‏‏‏‎‎‏‎‏‏‏‎‏‎‎‎‎‎Quick settings developer tiles‎‏‎‎‏‎"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‎‏‎‎‎‏‎‎‎‎‎‎‎‏‎‏‎‏‎‏‏‎‏‎‎‎‎‏‎‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‎‏‏‎‎‏‎‎Window Trace‎‏‎‎‏‎"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‏‎‎‎‎‎‎‏‎‏‎‎‏‎‏‏‏‎‏‎‎‏‎‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‎‎‎‎‎‎‎‎‎‏‎‎Surface Trace‎‏‎‎‏‎"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎‏‎‏‏‏‎‎‏‏‎‎‏‎‏‎‎‎‎‎‎‎Winscope Trace‎‏‎‎‏‎"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‎‎‏‎‎‎‏‎‎‎‏‎‏‎‏‏‏‎‎‎‎‏‎‏‏‎‏‎‏‎‏‎‎‎‎‎‎‏‏‎‎‎‏‏‏‏‏‏‏‏‎‎Work profile settings‎‏‎‎‏‎"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‏‎‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‏‎‎‏‏‏‎‏‎Contact search‎‏‎‎‏‎"</string>
@@ -3854,4 +3862,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‎‎‏‏‎‏‎‏‎‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‎‏‎‎‎‏‎‎Use Bluetooth when driving‎‏‎‎‏‎"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎‏‎‎‎‏‎‎‏‎‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‎‏‏‎‏‏‎‏‏‏‎‏‏‎‏‎Turn on Bluetooth automatically when driving‎‏‎‎‏‎"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‏‏‎‏‎‏‎‎‏‎‏‏‎‏‏‎‎‏‎‎‏‎‏‎‏‏‏‎‎‏‎‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‎‎See Android 8.0 battery settings‎‏‎‎‏‎"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 7807657..b1e1497 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 hora"</item>
     <item msgid="5198271470953124739">"Siempre visible"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (predeterminado)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Baja calidad"</item>
     <item msgid="2042505933058940139">"Baja"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Tratar como red con tarifa plana"</item>
     <item msgid="2266114985518865625">"Tratar como red sin tarifa plana"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automático (según la hora del día)"</item>
+    <item msgid="6620560879508595181">"Siempre activado"</item>
+    <item msgid="6385301106124765323">"Siempre desactivado"</item>
+  </string-array>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 951ecff..f0b5fa4 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Recordar la configuración"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Máximo de dispositivos de audio Bluetooth conectados"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Selecciona una cantidad máxima de dispositivos de audio Bluetooth conectados"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Habilitar informes de retrasos de AVDTP por Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Habilitar la recepción de informes de retrasos de AVDTP por Bluetooth"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Transmitir"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Habilitar pantalla inalámbrica"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No se encontraron dispositivos cercanos."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Ubicación de perfil de trabajo"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Permisos en las apps"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Solicitudes de ubicaciones recientes"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Ninguna aplicación solicitó la ubicación recientemente."</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Servicios de ubicación"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Uso de batería alto"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Usar el servicio"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Usar la corrección de color"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Usar subtítulos"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ACTIVADO"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESACTIVADO"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Activado"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Desactivado"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar en Configuración rápida"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Modo de corrección"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Para poder usar el almacenamiento de claves, debes configurar una pantalla bloqueada segura en tu dispositivo"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"CONFIGURAR BLOQUEO"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Acceso a datos de uso"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Tono de emergencia"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Crear copia de seguridad y Restablecer"</string>
@@ -2709,10 +2714,10 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicaciones y contenido"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicaciones con restricciones"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expandir config. a aplicación"</string>
-    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Presionar y pagar"</string>
+    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Toca y paga"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"Cómo funciona"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"Paga en las tiendas con tu teléfono"</string>
-    <string name="nfc_payment_default" msgid="8648420259219150395">"Aplicación de pago predeterminada"</string>
+    <string name="nfc_payment_default" msgid="8648420259219150395">"App de pago predeterminada"</string>
     <string name="nfc_payment_default_not_set" msgid="7485060884228447765">"Sin establecer"</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">"Utilizar la aplicación predeterminada"</string>
@@ -2888,6 +2893,7 @@
     <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>
     <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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escribir"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Presiona una etiqueta para editarla…"</string>
@@ -2921,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Reprod. parlantes conector"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Todo el audio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Solo audio multimedia"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Silencio"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerta"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrar"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Activar los sonidos"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Nunca"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3168,7 +3177,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Cambiar a solo alarmas hasta la(s) <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Cambiar a interrumpir siempre"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Cuando se enciende la pantalla"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Permitir que las notificaciones silenciadas por el modo \"No interrumpir\" aparezcan en la pantalla"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Permite que las notificaciones silenciadas por No interrumpir aparezcan en la pantalla y muestren un ícono en la barra de estado"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Cuando se apaga la pantalla"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Permitir que las notificaciones silenciadas por el modo \"No interrumpir\" activen la pantalla y hagan parpadear la luz"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Permitir que las notificaciones silenciadas por el modo \"No interrumpir\" activen la pantalla"</string>
@@ -3356,10 +3365,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Usar este dispositivo como MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Utilizar USB para lo siguiente:"</string>
     <string name="usb_use_also" msgid="557340935190819370">"También usar USB para"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Configuración predeterminada de USB"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Si conectas otro dispositivo cuando tu teléfono está desbloqueado, se aplicará esta configuración. Solo debes conectar dispositivos de confianza."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Cargar este dispositivo"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Cargando dispositivo conectado"</string>
@@ -3480,8 +3487,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Se usó un promedio de <xliff:g id="USED_MEMORY">%1$s</xliff:g> de <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> memoria"</string>
     <string name="users_summary" msgid="1674864467098487328">"Accediste como <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="payment_summary" msgid="3472482669588561110">"App predeterminada: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"ACTIVADA"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"DESACTIVADA"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Activada"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Desactivada"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Copia de seguridad inhabilitada"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Se actualizó a Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Actualización disponible"</string>
@@ -3655,9 +3662,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Conectado a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Conectado a varios dispositivos"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Modo demostración de la IU del sistema"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Modo nocturno"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Configurar modo nocturno"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Mosaicos de configuración rápida para programadores"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Seguimiento de ventana"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Seguimiento de superficie"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Seguimiento de 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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Configuración del perfil de trabajo"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Búsqueda de contactos"</string>
@@ -3853,4 +3861,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Usar Bluetooth mientras conduces"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Activar Bluetooth automáticamente mientras conduces"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Ver la configuración de la batería de Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 7f34311..4250cf6 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 hora"</item>
     <item msgid="5198271470953124739">"Siempre visible"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (predeterminado)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Mala"</item>
     <item msgid="2042505933058940139">"Mala"</item>
@@ -497,7 +489,9 @@
     <item msgid="8745603368609022803">"Tratar como red de uso no medido"</item>
     <item msgid="2266114985518865625">"Tratar como red de uso medido"</item>
   </string-array>
-    <!-- no translation found for dark_ui_mode_entries:0 (146804192658443142) -->
-    <!-- no translation found for dark_ui_mode_entries:1 (6620560879508595181) -->
-    <!-- no translation found for dark_ui_mode_entries:2 (6385301106124765323) -->
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automático (en función de la hora del día)"</item>
+    <item msgid="6620560879508595181">"Siempre activado"</item>
+    <item msgid="6385301106124765323">"Siempre desactivado"</item>
+  </string-array>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 84b1201..2a596e8 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -707,10 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ajustes de recordatorio"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Máximo de dispositivos de audio conectados por Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Selecciona el número máximo de dispositivos de audio conectados por Bluetooth"</string>
-    <!-- no translation found for bluetooth_enable_avdtp_delay_reports (5101903170688399944) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_avdtp_delay_reports_summary (7052797876020616399) -->
-    <skip />
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Habilitar informes de retrasos de AVDTP por Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Permitir la recepción de informes de retrasos de AVDTP por Bluetooth"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Enviar pantalla"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Habilitar pantalla inalámbrica"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No hay dispositivos cercanos."</string>
@@ -1445,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Ubicación para el perfil de trabajo"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Permisos de las aplicaciones"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Solicitudes de ubicación recientes"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Ninguna aplicación ha solicitado la ubicación recientemente"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Servicios de ubicación"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Uso de batería elevado"</string>
@@ -1884,10 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Utilizar el servicio"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Utilizar la corrección de color"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Utilizar subtítulos"</string>
-    <!-- no translation found for accessibility_summary_state_enabled (7914278500885887763) -->
-    <skip />
-    <!-- no translation found for accessibility_summary_state_disabled (2984230257590246745) -->
-    <skip />
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Activado"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Desactivado"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar en ajustes rápidos"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Modo de corrección"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2319,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Para poder utilizar el almacenamiento de credenciales, tu dispositivo debe tener una pantalla de bloqueo segura"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ESTABLECER BLOQUEO"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps con acceso de uso"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Tono de emergencia"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Copia de seguridad"</string>
@@ -2894,8 +2893,7 @@
     <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>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Pantalla ambiente, pantalla de bloqueo"</string>
-    <!-- no translation found for keywords_fingerprint_settings (239222512315619538) -->
-    <skip />
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"huella digital"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Editar"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Toca una etiqueta para editarla..."</string>
@@ -2929,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Reproducciones altavoz base"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Todo el audio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Solo audio multimedia"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Silencio"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerta"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrar"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Sonidos de encendido"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Nunca"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3178,8 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Cambiar a Solo alarmas hasta las <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Cambiar a interrumpir siempre"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Cuando la pantalla esté encendida"</string>
-    <!-- no translation found for zen_mode_screen_on_summary (2208664848367443505) -->
-    <skip />
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Permitir que las notificaciones silenciadas por el modo No molestar aparezcan en la pantalla con un icono en la barra de estado"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Cuando la pantalla esté apagada"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Permitir que las notificaciones silenciadas por el modo No molestar activen la pantalla y hagan parpadear la luz"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Permitir que las notificaciones silenciadas por el modo No molestar activen la pantalla"</string>
@@ -3489,10 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Se está usando una media de <xliff:g id="USED_MEMORY">%1$s</xliff:g> de <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> de memoria"</string>
     <string name="users_summary" msgid="1674864467098487328">"Has iniciado sesión como <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="payment_summary" msgid="3472482669588561110">"Aplicación predeterminada: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for location_on_summary (3637699010986988970) -->
-    <skip />
-    <!-- no translation found for location_off_summary (7217264690673949107) -->
-    <skip />
+    <string name="location_on_summary" msgid="3637699010986988970">"Activada"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Desactivada"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Copia de seguridad inhabilitada"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Actualizado a Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Actualización disponible"</string>
@@ -3666,13 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Conectado a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Conectado a varios dispositivos"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Modo de demostración de IU del sistema"</string>
-    <!-- no translation found for dark_ui_mode (2112241426441807273) -->
-    <skip />
-    <!-- no translation found for dark_ui_mode_title (975299966259850992) -->
-    <skip />
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Modo nocturno"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Definir modo nocturno"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Ajustes rápidos de mosaicos de desarrolladores"</string>
-    <!-- no translation found for winscope_trace_quick_settings_title (1294290008255732032) -->
-    <skip />
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Rastro de 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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Ajustes de perfil de trabajo"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Búsqueda de contactos"</string>
@@ -3868,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Usar Bluetooth al conducir"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Activar el Bluetooth automáticamente al conducir"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Ver los ajustes de la batería de Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index d5b0d62..0dc21a6 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 tund"</item>
     <item msgid="5198271470953124739">"Kunagi ei võta aega maha"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"Üks (vaikeseade)"</item>
-    <item msgid="7584056855393485416">"Kaks"</item>
-    <item msgid="844570832050176311">"Kolm"</item>
-    <item msgid="1896812737336024220">"Neli"</item>
-    <item msgid="2664420770707984266">"Viis"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"Üks"</item>
-    <item msgid="2731443086402670729">"Kaks"</item>
-    <item msgid="74627748729027880">"Kolm"</item>
-    <item msgid="2654447223197666662">"Neli"</item>
-    <item msgid="7026157954713482328">"Viis"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Kehv"</item>
     <item msgid="2042505933058940139">"Kehv"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Käsitle mahupõhisena"</item>
     <item msgid="2266114985518865625">"Käsitle mittemahupõhisena"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automaatne (kellaaja põhjal)"</item>
+    <item msgid="6620560879508595181">"Alati sees"</item>
+    <item msgid="6385301106124765323">"Alati väljas"</item>
+  </string-array>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 12488ae..31381b0 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Jäta seaded meelde"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maksimaalne arv ühendatud Bluetoothi heliseadmeid"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Maksimaalse arvu ühendatud Bluetoothi heliseadmete valimine"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Luba Bluetoothi AVDTP viivituse aruanded"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Lubage Bluetoothi AVDTP viivituse aruannete vastuvõtmine"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Ülekandmine"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Luba juhtmeta ekraaniühendus"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Läheduses olevaid seadmeid ei leitud."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Tööprofiili asukoht"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Rakendusetasemel load"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Hiljutised asukohapäringud"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Ükski rakendus pole hiljuti asukohateavet küsinud"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Asukohateenused"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Suur akukasutus"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Kasuta teenust"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Kasuta värviparandust"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Kasuta subtiitreid"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"SEES"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"VÄLJAS"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Sees"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Väljas"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Kuva kiirseadetes"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Korrigeerimise režiim"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Enne kui saab kasutada mandaatide salvestusruumi, peab teie seadmel olema turvaline lukustuskuva"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"LUKU MÄÄRAMINE"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Kasutusjuurdepääsuga rakend."</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Hädaabitoon"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Varundamine ja taastamine"</string>
@@ -2888,6 +2893,7 @@
     <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>
     <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>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"WiFi NFC-kiibi seadistamine"</string>
     <string name="write_tag" msgid="8571858602896222537">"Kirjuta"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Kirjutamiseks puudutage kiipi ..."</string>
@@ -2921,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Kõlari dokkimise heli"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Kogu heli"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Ainult meedia heli"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Hääletu"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Märguanne"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibreerimine"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Sisselülitamise helid"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Mitte kunagi"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Muudetakse valikule Ainult alarmid kuni kella <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Muudetakse valikule Katkesta alati"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Kui ekraan on sees"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Luba märguannetel, mille funktsioon Mitte segada on vaigistanud, ekraanil ilmuda"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Lubatakse märguannetel, mille funktsioon Mitte segada on vaigistanud, ekraanil hüpikaknaid näidata ja olekuriba ikoon kuvada"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Kui ekraan on väljas"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Luba märguannetel, mille funktsioon Mitte segada on vaigistanud, ekraan sisse lülitada ja valgust vilgutada"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Luba märguannetel, mille funktsioon Mitte segada on vaigistanud, ekraan sisse lülitada"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Kasutage seda seadet MIDI-na"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB kasutusviis"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Kasutage USB-d ka järgmiseks:"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"USB-vaikeseadistus"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Kui teine seade on ühendatud ja teie telefon avatakse, rakendatakse need seaded. Looge ühendus ainult usaldusväärsete seadmetega."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Seadme laadimine"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Ühendatud seadme laadimine"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Keskmiselt on kasutusel <xliff:g id="USED_MEMORY">%1$s</xliff:g> mälu <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>-st"</string>
     <string name="users_summary" msgid="1674864467098487328">"Sisse logitud kasutajana <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="payment_summary" msgid="3472482669588561110">"Rakendus <xliff:g id="APP_NAME">%1$s</xliff:g> on vaikevalik"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"SEES"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"VÄLJAS"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Sees"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Väljas"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Varundamine on keelatud"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android värskendati versioonile <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Värskendus on saadaval"</string>
@@ -3657,9 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Ühendatud seadmega <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Ühendatud mitme seadmega"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Süsteemi kasutajaliidese demorežiim"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Öörežiim"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Öörežiimi määramine"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Arendaja kiirseadete paanid"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Akna jälg"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Pinna jälg"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope Trace"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Tööprofiili seaded"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontaktiotsing"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Bluetoothi kasutamine sõidu ajal"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Bluetoothi automaatne sisselülitamine sõidu ajal"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Vaadake Android 8.0 akuseadeid"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml
index 638b1e5..db4ea8e 100644
--- a/res/values-eu/arrays.xml
+++ b/res/values-eu/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 ordu"</item>
     <item msgid="5198271470953124739">"Ez gainditu inoiz denbora-muga"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (lehenetsia)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Eskasa"</item>
     <item msgid="2042505933058940139">"Txarra"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Tratatu sare mugatu gisa"</item>
     <item msgid="2266114985518865625">"Tratatu mugatu gabeko sare gisa"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automatikoa (orduaren arabera)"</item>
+    <item msgid="6620560879508595181">"Beti aktibatuta"</item>
+    <item msgid="6385301106124765323">"Beti desaktibatuta"</item>
+  </string-array>
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 10c8d31..5d56e01 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Gogoratu ezarpenak"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Gehienez ere konekta daitezkeen Bluetooth audio-gailuak"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Hautatu gehienez ere konekta daitezkeen Bluetooth audio-gailuak"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Gaitu Bluetooth AVDTP protokoloaren atzerapen-txostenak"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Onartu Bluetooth AVDTP protokoloaren atzerapen-txostenak jasotzeko aukera"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Igorpena"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Gaitu hari gabeko bistaratzea"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Ez da gailurik aurkitu inguruan."</string>
@@ -774,7 +776,7 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Murriztu bateriaren erabilera Wi-Fi konexioa aktibatuta dagoenean"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Mugatu Wi‑Fi bidezko bateria-kontsumoa"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="8593144541347373394">"Aldatu datu-konexiora Wi-Fi sareak Interneteko konexioa galtzen badu."</string>
-    <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"Aldatu sare mugikorrera automatikoki"</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"Aldatu datu-konexiora automatikoki"</string>
     <string name="wifi_cellular_data_fallback_summary" msgid="1403505355490119307">"Wi-Fi bidez ezin denean, erabili datu-konexioa Internetera konektatzeko. Agian datuen erabilera ordaindu beharko duzu."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Gehitu sarea"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"Wi‑Fi hobespenak"</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Laneko profilaren kokapena"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Aplikazio-mailako baimenak"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Azken kokapen-eskaerak"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Ez dago kokapena duela gutxi eskatu duen aplikaziorik"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Kokapen-zerbitzuak"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Bateria-erabilera handia"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Erabili zerbitzua"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Erabili koloreen zuzenketa"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Erabili azpitituluak"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"AKTIBATUTA"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESAKTIBATUTA"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Aktibatuta"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Desaktibatuta"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Erakutsi Ezarpen bizkorretan"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Zuzenketa modua"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Zuk kredentzialen biltegia erabili ahal izateko, gailuak pantaila blokeatzeko modu seguru bat izan behar du"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"EZARRI BLOKEOA"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Erabilera-baimena dutenak"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Larrialdi-tonua"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Babeskopiak eta leheneratzea"</string>
@@ -2489,7 +2494,7 @@
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
     <string name="data_usage_list_mobile" msgid="5588685410495019866">"Datu-konexioa"</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"Bat ere ez"</string>
-    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Datu mugikorrak"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Datu-konexioa"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G datuak"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G datuak"</string>
     <string name="data_roaming_enable_mobile" msgid="1523331545457578362">"Ibiltaritza"</string>
@@ -2888,6 +2893,7 @@
     <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>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Giroaren araberako bistaratzea, pantaila blokeatuaren bistaratzea"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"hatz-marka"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Konfiguratu Wi-Fi NFC etiketa"</string>
     <string name="write_tag" msgid="8571858602896222537">"Idatzi"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Ukitu etiketa bat bertan idazteko…"</string>
@@ -2921,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Oinarrian erreproduzitzen dena"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Audio guztia"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Multimedia-edukiaren audioa bakarrik"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Isilik"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerta"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Dar-dar"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Pizteko soinuak"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Inoiz ez"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Aldatu \"Alarmak soilik\" modura <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> arte"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Aldatu \"Eten beti\" modura"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Pantaila piztuta dagoenean"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Baimendu \"Ez molestatu\" moduan ezkutatu beharreko jakinarazpenak pantailan agertzea"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Baimendu \"Ez molestatu\" moduan ezkutatutako jakinarazpenek pantailan agertzea, eta erakutsi ikono bat egoera-barran"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Pantaila itzalita dagoenean"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Baimendu \"Ez molestatu\" moduan ezkutatu beharreko jakinarazpenek pantaila edo jakinarazpen-argia piztea"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Baimendu \"Ez molestatu\" moduan ezkutatu beharreko jakinarazpenek pantaila piztea"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Erabili gailua MIDI gisa"</string>
     <string name="usb_use" msgid="3372728031108932425">"Erabili USBa honetarako:"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Erabili USB konexioa hauetarako ere:"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"USB konfigurazio lehenetsia"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Beste gailu bat konektatuta eta zure telefonoa desblokeatuta dagoenean aplikatuko dira ezarpen hauek. Konektatu gailu fidagarrietara bakarrik."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Gailua kargatzeko"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Konektatutako gailua kargatzea"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="USED_MEMORY">%1$s</xliff:g> / <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> erabili dira batez beste"</string>
     <string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> gisa hasi duzu saioa"</string>
     <string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> da aplikazio lehenetsia"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"AKTIBATUTA"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"DESAKTIBATUTA"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Aktibatuta"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Desaktibatuta"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Desgaituta dago babeskopiak egiteko aukera"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> bertsiora eguneratuta"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Eguneratu egin daiteke"</string>
@@ -3657,9 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> gailura konektatuta"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Gailu batera baino gehiagotara konektatuta"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Sistemaren erabiltzaile-interfazearen demo modua"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Gau modua"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Ezarri gau modua"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Ezarpen bizkorretako garatzaileentzako lauzak"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Leihoen arrastoa"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Azalerako arrastoa"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope arrastoa"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Laneko profilaren ezarpenak"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontaktu-bilaketak"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Erabili Bluetooth konexioa gidatu bitartean"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Aktibatu automatikoki Bluetooth konexioa gidatu bitartean"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Ikusi Android 8.0 sistema eragilearen bateriaren ezarpenak"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index fdf6458..e3f85eb 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"۱ ساعت"</item>
     <item msgid="5198271470953124739">"بدون مهلت زمانی"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"۱ (پیش‌فرض)"</item>
-    <item msgid="7584056855393485416">"۲"</item>
-    <item msgid="844570832050176311">"۳"</item>
-    <item msgid="1896812737336024220">"۴"</item>
-    <item msgid="2664420770707984266">"۵"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"۱"</item>
-    <item msgid="2731443086402670729">"۲"</item>
-    <item msgid="74627748729027880">"۳"</item>
-    <item msgid="2654447223197666662">"۴"</item>
-    <item msgid="7026157954713482328">"۵"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"ضعیف"</item>
     <item msgid="2042505933058940139">"ضعیف"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"به‌عنوان محدود در نظر شود"</item>
     <item msgid="2266114985518865625">"به‌عنوان نامحدود در نظر شود"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"خودکار (براساس اینکه چه ساعتی از روز باشد)"</item>
+    <item msgid="6620560879508595181">"همیشه روشن"</item>
+    <item msgid="6385301106124765323">"همیشه خاموش"</item>
+  </string-array>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 40af8f4..3a8bb2f 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"به خاطر سپردن تنظیمات"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"حداکثر تعداد دستگاه‌های صوتی بلوتوث متصل"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"حداکثر تعداد دستگاه‌های صوتی بلوتوث متصل را انتخاب کنید"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"‏فعال کردن دریافت گزارش‌های تأخیر AVDTP ازطریق بلوتوث"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"‏مجاز کردن دریافت گزارش‌های تأخیر AVDTP ازطریق بلوتوث"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"فرستادن"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"فعال کردن نمایش بی‌سیم"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"هیچ دستگاهی در اطراف پیدا نشد."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"محل نمایه کارتان"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"مجوزهای سطح برنامه"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"درخواست‌های اخیر موقعیت مکانی"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"به تازگی هیچ برنامه‌ای موقعیت مکانی را درخواست نکرده است"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"خدمات موقعیت مکانی"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"استفاده زیاد از باتری"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"استفاده از سرویس"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"استفاده از تصحیح رنگ"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"استفاده از زیرنویس"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"روشن"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"خاموش"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"روشن"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"خاموش"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"نمایش در تنظیمات سریع"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"حالت تصحیح"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"قبل از اینکه بتوانید از حافظه اطلاعات کاربری استفاده کنید، دستگاهتان باید قفل صفحه ایمنی داشته باشد."</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"تنظیم قفل"</string>
     <string name="usage_access_title" msgid="332333405495457839">"برنامه‌های مجاز به دسترسی"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"آهنگ اضطراری"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"واکنش موجود در هنگام برقراری تماس اضطراری را تنظیم کنید"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"پشتیبان‌گیری"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"تهیهٔ نسخهٔ پشتیبان و بازیابی"</string>
@@ -2888,6 +2893,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"شماره سریال، نسخه سخت‌افزار"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"‏سطح وصله امنیتی android، نسخه باند پایه، نسخه اصلی"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"نمایشگر محیطی. نمایشگر صفحه در حالت قفل"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"اثر انگشت"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏تنظیم برچسب NFC برای Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"نوشتن"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ضربه زدن روی یک برچسب برای نوشتن..."</string>
@@ -2921,9 +2927,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"بی‌صدا"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"هشدار"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"لرزش"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"صدای راه‌اندازی"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"هرگز"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"تغییر به «فقط هشدارها» تا <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"تغییر در «همیشه وقفه»"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"وقتی صفحه‌نمایش روشن است"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"با «مزاحم نشوید»‌ که در صفحه‌نمایش ظاهر می‌شود، اعلان‌ها را بی‌صدا کنید"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"اجازه دهید با پنجره بازشو «مزاحم نشوید»‌ در صفحه‌نمایش و نمایش نماد نوار وضعیت، اعلان‌ها بی‌صدا شوند"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"وقتی صفحه‌نمایش خاموش است"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"با «مزاحم نشوید»‌ که باعث روشن شدن صفحه‌نمایش و چشمک‌زدن چراغ می‌شود، اعلان‌ها را بی‌صدا کنید"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"با «مزاحم نشوید»‌ که باعث روشن شدن صفحه‌نمایش می‌شود، اعلان‌ها را بی‌صدا کنید"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"‏استفاده از این دستگاه به‌عنوان MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"‏استفاده از USB برای"</string>
     <string name="usb_use_also" msgid="557340935190819370">"‏همچنین، استفاده از USB برای"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"‏پیکربندی USB پیش‌فرض"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"وقتی دستگاه دیگری متصل باشد و قفل تلفن شما باز باشد، این تنظیمات اعمال می‌شوند. فقط به دستگاه‌های مورداعتماد متصل شوید."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"شارژ کردن این دستگاه"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"شارژ دستگاه متصل‌‌شده"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"به‌طور متوسط <xliff:g id="USED_MEMORY">%1$s</xliff:g> از <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> حافظه استفاده شده است"</string>
     <string name="users_summary" msgid="1674864467098487328">"واردشده به سیستم با <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>"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"روشن"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"خاموش"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"روشن"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"خاموش"</string>
     <string name="backup_disabled" msgid="485189128759595412">"پشتیبان‌گیری غیرفعال است"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"‏به‌روزرسانی‌شده به Android نسخه <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"به‌روزرسانی در دسترس است"</string>
@@ -3650,16 +3657,17 @@
     <string name="page_tab_title_summary" msgid="4070309266374993258">"همه"</string>
     <string name="page_tab_title_support" msgid="8483187649355540109">"پشتیبانی و نکته‌ها"</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>
-    <string name="premium_sms_access" msgid="4660047004791638305">"دسترسی پیامک ویژه"</string>
+    <string name="premium_sms_none" msgid="8268105565738040566">"هیچ برنامه نصب‌شده‌ای دسترسی به پیامک ممتاز را درخواست نکرده است"</string>
+    <string name="premium_sms_warning" msgid="9086859595338944882">"ممکن است استفاده از «پیامک ممتاز» برای شما هزینه داشته باشد و مبلغ صورت‌حساب‌های شرکت مخابراتی‌تان را افزایش دهد. اگر مجوز را برای برنامه‌ای فعال کنید، می‌توانید با استفاده از آن برنامه پیامک ممتاز ارسال کنید."</string>
+    <string name="premium_sms_access" msgid="4660047004791638305">"دسترسی پیامک ممتاز"</string>
     <string name="bluetooth_disabled" msgid="6244000672828617410">"خاموش"</string>
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"کاشی‌های برنامه‌نویسی تنظیمات سریع"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"ردیابی پنجره‌ای"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"ردیابی سطح"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"تنظیمات نمایه کاری"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"جستجوی مخاطب"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"استفاده از بلوتوث هنگام رانندگی"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"روشن شدن خودکار بلوتوث هنگام رانندگی"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"‏تنظیمات باتری Android نسخه ۸.۰ را ببینید"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index d0f645c..b2411c6 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 tunti"</item>
     <item msgid="5198271470953124739">"Ei aikakatkaisua"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (oletusarvo)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Huono"</item>
     <item msgid="2042505933058940139">"Heikko"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Merkitse maksulliseksi"</item>
     <item msgid="2266114985518865625">"Merkitse maksuttomaksi"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automaattinen (perustuu kellonaikaan)"</item>
+    <item msgid="6620560879508595181">"Aina käytössä"</item>
+    <item msgid="6385301106124765323">"Aina pois"</item>
+  </string-array>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index bdf0096..dda898b 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Muista asetukset"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Liitettyjen Bluetooth-äänilaitteiden enimmäismäärä"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Valitse liitettyjen Bluetooth-äänilaitteiden enimmäismäärä"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Ota käyttöön Bluetoothin AVDTP-viiveraportit"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Salli Bluetoothin AVDTP-viiveraporttien vastaanottaminen"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Lähetä"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Ota langaton näyttö käyttöön"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Bluetooth-laitteita ei löydy lähistöltä."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Työprofiilin sijainti"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Sovellustason käyttöoikeudet"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Viimeisimmät sijaintipyynnöt"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Mikään sovellus ei ole pyytänyt sijaintia äskettäin"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Sijaintipalvelut"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Suuri akun kulutus"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Käytä palvelua"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Käytä värinkorjausta"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Käytä tekstityksiä"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"KÄYTÖSSÄ"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"POIS KÄYTÖSTÄ"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Käytössä"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Pois käytöstä"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Näytä pika-asetuksissa"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Korjaustila"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Näytön lukitustapa täytyy määrittää, ennen kuin voit käyttää kirjautumistietojen tallennustilaa."</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ASETA LUKITUS"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Sovellukset, joilla käyttölupa"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Hätäpuhelun ääni"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Varmuuskopiointi &amp; palautus"</string>
@@ -2888,6 +2893,7 @@
     <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>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Lepotilanäyttö, lukitusnäyttö"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"sormenjälki"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Määritä Wi-Fi ja NFC-tagi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Kirjoita"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Kirjoita napauttamalla tagia…"</string>
@@ -2921,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Telineen kaiutin"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Kaikki äänet"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Vain median ääni"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Äänetön"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Ilmoitus"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Värinä"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Käynnistysäänet"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Ei koskaan"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Ota vain herätykset käyttöön kello <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> asti."</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Salli keskeytykset aina."</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Kun näyttö on päällä"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Anna Älä häiritse ‑tilan hiljentämien ilmoitusten tulla näkyviin näytölle"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Anna Älä häiritse ‑tilan hiljentämien ilmoitusten tulla näkyviin näytölle ja näyttää tilapalkin kuvake"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Kun näyttö on pois päältä"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Anna Älä häiritse ‑tilan hiljentämien ilmoitusten käynnistää näyttö ja vilkuttaa ilmoitusvaloa"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Anna Älä häiritse ‑tilan hiljentämien ilmoitusten käynnistää näyttö"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Käytä tätä laitetta MIDI-tilassa."</string>
     <string name="usb_use" msgid="3372728031108932425">"Käytä USB:tä:"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Käytä USB:ta myös seuraaviin:"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"USB-oletusmääritys"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Nämä asetukset otetaan käyttöön, kun puhelimeesi yhdistetään toinen laite sen lukituksen ollessa avoinna. Yhdistä puhelimeesi vain luotettuja laitteita."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Laitteen lataaminen"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Yhdistetyn laitteen lataaminen"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Muistia käytetty keskimäärin <xliff:g id="USED_MEMORY">%1$s</xliff:g>/<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"Kirjautunut sisään käyttäjänä <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> on oletus."</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"PÄÄLLÄ"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"POIS KÄYTÖSTÄ"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Käytössä"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Pois käytöstä"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Varmuuskopiointi poistettu käytöstä"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Päivitetty Android-versioon <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Päivitys saatavilla"</string>
@@ -3657,9 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Yhdistetty laitteeseen <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Yhdistetty useisiin laitteisiin"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Käyttöliittymän esittelytila"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Yötila"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Aseta yötila"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Pika-asetusosiot kehittäjille"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Ikkunan jäljitys"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Pinnan jäljitys"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope-jäljitys"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Työprofiilin asetukset"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Yhteystietohaku"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Käytä Bluetoothia ajon aikana"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Ota Bluetooth automaattisesti käyttöön ajon aikana"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Katso Android 8.0:n akkuasetukset"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index bf49b06..a6eb533 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 heure"</item>
     <item msgid="5198271470953124739">"Aucun délai"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (par défaut)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Faible"</item>
     <item msgid="2042505933058940139">"Faible"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Traiter comme mesuré"</item>
     <item msgid="2266114985518865625">"Traiter comme non mesuré"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automatique (en fonction de l\'heure de la journée)"</item>
+    <item msgid="6620560879508595181">"Toujours activé"</item>
+    <item msgid="6385301106124765323">"Toujours désactivé"</item>
+  </string-array>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index b8982d3..0a434fc 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Mémoriser ces paramètres"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maximum d\'appareils audio Bluetooth connectés"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Sélectionnez le nombre maximal d\'appareils Bluetooth connectés"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Activer les rapports de délai Bluetooth AVDTP"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Autoriser la réception de rapports de délai Bluetooth AVDTP"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activer l\'affichage sans fil"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Aucun appareil détecté à proximité."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Position pour profil profess."</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Autor. à l\'échelle des applis"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Demandes localisation récentes"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Aucune application n\'a récemment demandé l\'accès à votre position"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Services de localisation"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Forte utilisation de la pile"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Utiliser le service"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Utiliser la correction des couleurs"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Utiliser les légendes"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ACTIVÉ"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DÉSACTIVÉ"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Activé"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Désactivé"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Afficher dans la fenêtre de configuration rapide"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Mode de correction"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Avant de pouvoir utiliser le stockage des authentifiants, votre appareil doit avoir un verrouillage d\'écran sécuritaire"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"DÉFINIR VERR D\'ÉCRAN"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Applis avec accès données"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Sonnerie d\'urgence"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Sauvegarde et restauration"</string>
@@ -2888,6 +2893,7 @@
     <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>
     <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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Créer une balise NFC par Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Écrire"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Touchez une balise pour pour écrire..."</string>
@@ -2921,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Lecture : station d\'accueil"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Tout l\'audio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Audio des médias seulement"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Mode silencieux"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerte"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibreur"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Activation par les sons"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Jamais"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Ne recevoir que les alarmes jusqu\'à <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Activer le mode Toujours interrompre"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Lorsque l\'écran est activé"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Autoriser les notifications désactivées par le mode Ne pas déranger de s\'afficher à l\'écran"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Autoriser les notif. désactivées par le mode Ne pas déranger à s\'afficher à l\'écran et à présenter une icône dans la barre d\'état"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Lorsque l\'écran est éteint"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Autoriser les notifications désactivées par le mode Ne pas déranger d\'activer l\'écran et de faire clignoter le voyant"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Autoriser les notifications désactivées par le mode Ne pas déranger d\'activer l\'écran"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Utiliser cet appareil en tant que MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Utiliser la connexion USB pour :"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Aussi utiliser la connexion USB pour"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Configuration USB par défaut"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Lorsqu\'un autre appareil sera connecté et que votre téléphone sera déverrouillé, ces paramètres seront appliqués. Connectez-vous uniquement aux appareils fiables."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Chargement de l\'appareil"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Chargement de l\'appareil connecté"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Mémoire utilisée en moyenne : <xliff:g id="USED_MEMORY">%1$s</xliff:g> sur <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"Connecté en tant que <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> est l\'application par défaut"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"ACTIVÉ"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"DÉSACTIVÉ"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Activée"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Désactivée"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Sauvegardes désactivées"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Mis à jour vers Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Mise à jour disponible"</string>
@@ -3657,9 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connecté à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connecté à plusieurs appareils"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Mode de démonstration de l\'interface système"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Mode Nuit"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Activer le mode Nuit"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Paramètres rapides, tuiles de concepteur"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Trace de fenêtre"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Trace de surface"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Traçage 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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Paramètres du profil professionnel"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Recherche de contacts"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Utiliser le Bluetooth lors de la conduite"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Activer automatiquement le Bluetooth lorsque vous conduisez"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Voir les paramètres de pile d\'Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 3bcefe3..ca1ae44 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"Une heure"</item>
     <item msgid="5198271470953124739">"Aucun délai"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (Valeur par défaut)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Faible"</item>
     <item msgid="2042505933058940139">"Faible"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Considérer comme facturé à l\'usage"</item>
     <item msgid="2266114985518865625">"Considérer comme non facturé à l\'usage"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automatique (en fonction de l\'heure de la journée)"</item>
+    <item msgid="6620560879508595181">"Toujours activé"</item>
+    <item msgid="6385301106124765323">"Toujours désactivé"</item>
+  </string-array>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 93b14fa..0bf750e 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Mémoriser ces paramètres"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Nombre maximal d\'appareils audio Bluetooth connectés"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Sélectionner le nombre maximal d\'appareils audio Bluetooth connectés"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Activer les rapports de retard Bluetooth AVDTP"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Autoriser la réception de rapports de retard Bluetooth AVDTP"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activer l\'affichage sans fil"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Aucun appareil détecté à proximité."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Emplacement du profil pro"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Autorisations au niveau applis"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Demandes de localisation récentes"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Aucune demande d\'accès à votre position n\'a récemment été envoyée pour une application."</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Services de localisation"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Forte utilisation de la batterie"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Utiliser le service"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Corriger les couleurs"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Utiliser les sous-titres"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ACTIVÉ"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DÉSACTIVÉ"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Activé"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Désactivé"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Afficher dans la fenêtre de configuration rapide"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Mode de correction"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Avant de pouvoir utiliser le stockage des identifiants, vous devez définir un écran de verrouillage sécurisé sur votre appareil"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"DÉFINIR VERROUILLAGE"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Applis accédant aux infos utilisation"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Sonnerie d\'urgence"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Sauvegarde et restauration"</string>
@@ -2888,6 +2893,7 @@
     <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>
     <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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Créer un tag NFC pour Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Modifier"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Appuyer sur un tag pour le modifier…"</string>
@@ -2921,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Sons haut-parleurs sta. accueil"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Tout l\'audio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Audio des contenus multimédias seulement"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Mode silencieux"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerte"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibreur"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Sons de mise en route"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Jamais"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Ne recevoir que les alarmes jusqu\'à <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Toujours interrompre"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Lorsque l\'écran est allumé"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Autoriser les notifications désactivées par le mode Ne pas déranger à s\'afficher à l\'écran"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Autoriser notifications désactivées par le mode Ne pas déranger à s\'afficher à l\'écran et sous forme d\'icône dans la barre d\'état"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Lorsque l\'écran est éteint"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Autoriser les notifications désactivées par le mode Ne pas déranger à allumer l\'écran et à faire clignoter le voyant"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Autoriser les notifications désactivées par le mode Ne pas déranger à allumer l\'écran"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Utiliser cet appareil en tant que MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Utiliser la connexion USB pour"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Également utiliser la connexion USB pour"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Configuration USB par défaut"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Ces paramètres sont appliqués lorsqu\'un autre appareil est connecté et que votre téléphone est déverrouillé. Connectez-vous uniquement à des appareils vérifiés."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Rechargement de l\'appareil"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Rechargement de l\'appareil connecté"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="USED_MEMORY">%1$s</xliff:g> sur <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> de mémoire utilisée en moyenne"</string>
     <string name="users_summary" msgid="1674864467098487328">"Connecté en tant que \"<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> est l\'application par défaut."</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"SUR"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"DÉSACTIVÉ"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Activé"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Désactivé"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Sauvegarde désactivée"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Mis à jour vers Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Mise à jour disponible"</string>
@@ -3657,9 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connecté à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connecté à plusieurs appareils"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Mode de démonstration de l\'interface du système"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Mode Nuit"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Activer le mode Nuit"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Tuiles de configuration rapide pour les développeurs"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Trace de la fenêtre"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Trace de la surface"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Trace 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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Paramètres du profil professionnel"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Recherche de contacts"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Utiliser le Bluetooth en conduisant"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Activer automatiquement le Bluetooth lorsque vous conduisez"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Afficher les paramètres de batterie d\'Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml
index 1907e41..e14c77b 100644
--- a/res/values-gl/arrays.xml
+++ b/res/values-gl/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 hora"</item>
     <item msgid="5198271470953124739">"Sen tempo de espera"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (predeterminado)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Baixa"</item>
     <item msgid="2042505933058940139">"Baixa"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Tratar como rede de pago por consumo"</item>
     <item msgid="2266114985518865625">"Tratar como rede sen límite de datos"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automático (en función da hora do día)"</item>
+    <item msgid="6620560879508595181">"Sempre activado"</item>
+    <item msgid="6385301106124765323">"Sempre desactivado"</item>
+  </string-array>
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index fa94c9a..e5c4570 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Lembrar configuración"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Número máximo de dispositivos de audio Bluetooth conectados"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Selecciona o número máximo de dispositivos de audio Bluetooth conectados"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Activar informes de atraso do protocolo AVDTP por Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Permitir recibir informes de atraso do protocolo AVDTP por Bluetooth"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Emisión"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activar visualización sen fíos"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Non hai dispositivos cerca."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Localización perfil traballo"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Permisos de nivel aplicación"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Solicitudes de localización recentes"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Ningunha aplicación solicitou a túa localización recentemente"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Servizos de localización"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Uso da batería elevado"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Usar servizo"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Usar corrección da cor"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Usar subtítulos"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ACTIVADO"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESACTIVADO"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Activado"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Desactivado"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar en Configuración rápida"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Modo de corrección"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Para poder usar as credenciais de almacenamento, o dispositivo debe ter unha pantalla de bloqueo segura"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ESTABLECER BLOQUEO"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps con acceso de uso"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Ton de urxencia"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Copia de seguranza e restauración"</string>
@@ -2888,6 +2893,7 @@
     <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>
     <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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC wifi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escribir"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Toca unha etiqueta para escribir..."</string>
@@ -2921,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Pezas de altofalante do peirao"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Todo o audio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Unicamente audio multimedia"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Silencio"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerta"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrar"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Sons de acendido"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Nunca"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Cambiar ao modo Só alarmas ata as <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Cambia a interromper sempre"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Cando a pantalla está acendida"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Permite que as notificacións silenciadas pola función Non molestar se mostren na pantalla"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Permite que as notificacións silenciadas polo modo Non molestar aparezan na pantalla cunha icona na barra de estado"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Cando a pantalla está apagada"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Permite que as notificacións silenciadas pola función Non molestar acendan a pantalla e activen unha luz intermitente"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Permite que as notificacións silenciadas pola función Non molestar acendan a pantalla"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Utiliza este dispositivo como MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Usar USB para"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Usar tamén o USB para"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Configuración USB predeterminada"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Cando se conecte outro dispositivo e se desbloquee o teu teléfono, aplicarase esta configuración. Conéctate tan só a dispositivos de confianza."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Cargar este dispositivo"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Cargando o dispositivo conectado"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Uso medio da memoria: <xliff:g id="USED_MEMORY">%1$s</xliff:g> de <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"Iniciaches sesión como <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="payment_summary" msgid="3472482669588561110">"Aplicación predeterminada: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"ACTIVADO"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"DESACTIVADA"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Activado"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Desactivado"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Desactivouse a función de copia de seguranza"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Actualizouse a Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Hai dispoñible unha actualización"</string>
@@ -3657,9 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Conectado a: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Conectado a varios dispositivos"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Modo de demostración da IU do sistema"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Modo nocturno"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Establecer modo nocturno"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Mosaicos para programadores de configuración rápida"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Seguimento de ventás"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Seguimento de superficie"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Seguimento de 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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Configuración do perfil de traballo"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Busca de contactos"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Usar o Bluetooth ao conducir"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Activa automaticamente o Bluetooth mentres conduces"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Ver a configuración da batería de Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml
index 2594b0a..dab9795 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 કલાક"</item>
     <item msgid="5198271470953124739">"ક્યારેય સમયસમાપ્તિ નહીં"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (ડિફૉલ્ટ)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"નબળું"</item>
     <item msgid="2042505933058940139">"નબળી"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"મીટર કરેલ તરીકે ગણો"</item>
     <item msgid="2266114985518865625">"મીટર ન કરેલ તરીકે ગણો"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"આપમેળે (દિવસના સમયના આધારે)"</item>
+    <item msgid="6620560879508595181">"હંમેશા ચાલુ"</item>
+    <item msgid="6385301106124765323">"હંમેશા બંધ"</item>
+  </string-array>
 </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 6abb94a..f2665aa 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"સેટિંગ્સ યાદ રાખો"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"મહત્તમ સંખ્યામાં કનેક્ટ થયેલા બ્લૂટૂથ ઑડિઓ ઉપકરણો"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"મહત્તમ સંખ્યામાં કનેક્ટ થયેલા બ્લૂટૂથ ઑડિઓ ઉપકરણો પસંદ કરો"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"બ્લૂટૂથ AVDTP વિલંબના રિપોર્ટ ચાલુ કરો"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"બ્લૂટૂથ AVDTP વિલંબના રિપોર્ટ પ્રાપ્ત કરવાની મંજૂરી આપો"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"કાસ્ટ કરો"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"વાયરલેસ ડિસ્પ્લે સક્ષમ કરો"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"કોઇ નજીકના ઉપકરણો મળ્યાં નથી"</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"કાર્યાલયની પ્રોફાઇલ માટે સ્થાન"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"ઍપ્લિકેશન સ્તરની મંજૂરી"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"તાજેતરની સ્થાન વિનંતિ"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"હાલમાં કોઈ એપ્લિકેશને સ્થાન વિનંતી કરી નથી"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"સ્થાન સેવાઓ"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"વધુ બૅટરી ઉપયોગ"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"સેવાનો ઉપયોગ કરો"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"રંગ સુધારણાનો ઉપયોગ કરો"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"કૅપ્શનનો ઉપયોગ કરો"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ચાલુ"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"બંધ"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"ચાલુ"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"બંધ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"ઝડપી સેટિંગ્સમાં બતાવો"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"સુધારણા મોડ"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"તમે ક્રિડેન્શ્યલ સ્ટોરેજનો ઉપયોગ કરી શકો તે પહેલા, તમારા ઉપકરણમાં એક સુરક્ષિત લૉક સ્ક્રીન હોવું જરૂરી છે"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"લૉક સેટ કરો"</string>
     <string name="usage_access_title" msgid="332333405495457839">"વપરાશ ઍક્સેસ સાથેની ઍપ"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"કટોકટી ટોન"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"જ્યારે કટોકટીનો કૉલ કરવામાં આવે ત્યારે વર્તન સેટ કરો"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"બૅકઅપ"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"બેકઅપ અને પુનર્સ્થાપન"</string>
@@ -2888,6 +2893,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"અનુક્રમ નંબર, હાર્ડવેર વર્ઝન"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"Android સુરક્ષા પૅચ સ્તર, બેઝબૅન્ડ વર્ઝન, કર્નેલ વર્ઝન"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"વ્યાપક ડિસ્પ્લે, લૉક સ્ક્રીન ડિસ્પ્લે"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"ફિંગરપ્રિન્ટની સેટિંગ"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"વાઇ-ફાઇ NFC ટૅગ સેટ કરો"</string>
     <string name="write_tag" msgid="8571858602896222537">"લખો"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"લખવા માટે ટેગ પર ટેપ કરો..."</string>
@@ -2921,9 +2927,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"શાંત"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"ચેતવણી"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"વાઇબ્રેટ"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"ચાલુ થવા પર વાગનાર ધ્વનિ"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"ક્યારેય નહીં"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"એલાર્મ્સ પર ફક્ત <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> સુધી બદલો"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"હંમેશાં ખલેલ પાડો પર બદલો"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"જ્યારે સ્ક્રીન ચાલુ હોય ત્યારે"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"ખલેલ પાડશો નહીં દ્વારા શાંત કરેલ નોટિફિકેશનોને સ્ક્રીન પર હાઇલાઇટ થવા દો"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"ખલેલ પાડશો નહીં દ્વારા શાંત કરેલ નોટિફિકેશનને સ્ક્રીન પર પૉપઅપ થઈને સ્ટેટસ બાર પર આઇકન બતાવવા દો"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"જ્યારે સ્ક્રીન બંધ હોય ત્યારે"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"ખલેલ પાડશો નહીં દ્વારા શાંત કરેલ નોટિફિકેશનોને સ્કીન ચાલુ કરવા દો અને લાઇટ ઝબકાવવા દો"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"ખલેલ પાડશો નહીં દ્વારા શાંત કરેલ નોટિફિકેશનોને સ્ક્રીન ચાલુ કરવા દો"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"MIDI તરીકે આ ઉપકરણનો ઉપયોગ કરો"</string>
     <string name="usb_use" msgid="3372728031108932425">"આ માટે USB નો ઉપયોગ કરો"</string>
     <string name="usb_use_also" msgid="557340935190819370">"USBનો ઉપયોગ આના માટે પણ કરો"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"ડિફૉલ્ટ USB ગોઠવણી"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"જ્યારે અન્ય ઉપકરણ કનેક્ટ કરેલ હોય અને તમારો ફોન અનલૉક હોય, તો આ સેટિંગ લાગુ થશે. માત્ર વિશ્વસનીય ઉપકરણો સાથે કનેક્ટ કરો."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"આ ઉપકરણને ચાર્જ કરવું"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"કનેક્ટેડ ઉપકરણ ચાર્જ કરી રહ્યાં છીએ"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> માંથી સરેરાશ <xliff:g id="USED_MEMORY">%1$s</xliff:g> મેમરીનો ઉપયોગ કર્યો"</string>
     <string name="users_summary" msgid="1674864467098487328">"<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> ડિફોલ્ટ છે"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"ચાલુ"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"બંધ"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"ચાલુ"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"બંધ"</string>
     <string name="backup_disabled" msgid="485189128759595412">"બેક અપ અક્ષમ કર્યું"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> પર અપડેટ કરેલ"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"અપડેટ ઉપલબ્ધ છે"</string>
@@ -3657,9 +3664,10 @@
     <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">"સિસ્ટમ UI ડેમો મોડ"</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="window_trace_quick_settings_title" msgid="3839917000546526898">"વિંડો ટ્રેસ"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"સપાટી ટ્રેસ"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"કાર્યાલયની પ્રોફાઇલની સેટિંગ્સ"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"સંપર્ક શોધ"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"ડ્રાઇવિંગ વખતે બ્લૂટૂથનો ઉપયોગ કરો"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"ડ્રાઇવિંગ કરતી વખતે આપમેળે બ્લૂટૂથ ચાલુ કરો"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 બૅટરી સેટિંગ જુઓ"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 3ca644d..94d02ea 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 घंटा"</item>
     <item msgid="5198271470953124739">"कभी टाइम आउट नहीं होगा"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (डिफ़ॉल्ट)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"कमज़ोर"</item>
     <item msgid="2042505933058940139">"कमज़ोर"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"इस कनेक्शन में डेटा से जुड़ी पाबंदी है"</item>
     <item msgid="2266114985518865625">"इस कनेक्शन में डेटा से जुड़ी पाबंदी नहीं है"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"गहरे रंग वाली थीम अपने अाप चुनना (समय के हिसाब से)"</item>
+    <item msgid="6620560879508595181">"हमेशा चालू"</item>
+    <item msgid="6385301106124765323">"हमेशा बंद"</item>
+  </string-array>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 833d1b1..a917db8 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"सेटिंग याद रखें"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"ब्लूटूथ के ज़रिए ज़्यादा से ज़्यादा कितने ऑडियो डिवाइस जुड़ सकते हैं"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"यह चुनें कि ब्लूटूथ के ज़रिए ज़्यादा से ज़्यादा कितने ऑडियो डिवाइस जुड़ सकते हैं"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"ब्लूटूथ एवीडीटीपी की देरी से जुड़ी रिपाेर्ट पाने की सुविधा चालू करें"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"ब्लूटूथ एवीडीटीपी की देरी से जुड़ी रिपाेर्ट पाने की मंज़ूरी दें"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"कास्ट करें"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"बिना वायर के स्क्रीन दिखाना (वायरलेस डिसप्ले) चालू करें"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"आस-पास कोई भी डिवाइस नहीं मिला."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"वर्क प्रोफ़ाइल की जगह"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"ऐप्लिकेशन-स्तरीय अनुमतियां"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"हाल में किये गए जगह (लोकेशन) के अनुरोध"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"किसी भी ऐप ने हाल में जगह का अनुरोध नहीं किया है"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"जगह की जानकारी"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"अधिक बैटरी उपयोग"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"सेवा इस्तेमाल करें"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"रंग में सुधार करने की सुविधा इस्तेमाल करें"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"कैप्शन इस्तेमाल करें"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"चालू"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"बंद"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"चालू है"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"बंद है"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"त्वरित सेटिंग में दिखाएं"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"सुधार मोड"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"क्रेडेंशियल स्टोरेज का इस्तेमाल करने से पहले, आपके डिवाइस पर सुरक्षित लॉक स्क्रीन होना ज़रूरी है"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"लॉक सेट करें"</string>
     <string name="usage_access_title" msgid="332333405495457839">"उपयोग एक्सेस वाले ऐप"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"आपातकालीन टोन"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"आपातकालीन कॉल करने के दौरान व्‍यवहार सेट करें"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"बैकअप लें"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"सुरक्षित करें और पुनर्स्‍थापित करें"</string>
@@ -2888,6 +2893,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"सीरियल नंबर, हार्डवेयर वर्शन"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"Android सुरक्षा पैच लेवल, मोबाइल रेडियो (बेसबैंड वर्शन), kernel वर्शन"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"हमेशा चालू स्क्रीन, लॉक स्क्रीन डिसप्ले"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"फ़िंगरप्रिंट"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"वाई-फ़ाई  NFC टैग सेट करें"</string>
     <string name="write_tag" msgid="8571858602896222537">"लिखें"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"लिखने के लिए टैग टैप करें..."</string>
@@ -2921,9 +2927,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"मौन"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"अलर्ट"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"कंपन (वाइब्रेशन)"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"चालू होने की ध्वनि"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"कभी नहीं"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"केवल <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> तक के लिए अलार्म को बदलें"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"हमेशा बाधित करें में बदलें"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"जब स्क्रीन चालू हो"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"\'परेशान न करें\' के ज़रिये म्यूट हुई सूचनाओं को स्क्रीन पर दिखने दें"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"परेशान न करें सुविधा के ज़रिए म्यूट हुई सूचनाओं को स्क्रीन पर दिखाएं अाैर एक स्टेटस बार आइकॉन दिखाएं"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"जब स्क्रीन बंद हो"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"\'परेशान न करें\' के ज़रिए म्यूट हुई सूचनाओं को स्क्रीन चालू करने दें और लाइट चालू/बंद करने दें"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"\'परेशान न करें\' के ज़रिये म्यूट हुई सूचनाओं को स्क्रीन चालू करने दें"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"इस डिवाइस का उपयोग MIDI के रूप में करें"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB का उपयोग इसके लिए करें"</string>
     <string name="usb_use_also" msgid="557340935190819370">"यूएसबी का इस्तेमाल इन कामों के लिए भी करें"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"यूएसबी का डिफ़ॉल्ट कॉन्फ़िगरेशन"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"जब आपका फ़ोन किसी दूसरे डिवाइस से जुड़ा हो और वह अनलॉक हो तो, ये सेटिंग लागू होंगी. अपना फ़ोन सिर्फ़ भरोसेमंद डिवाइस से ही जोड़ें."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"इस डिवाइस को चार्ज करना"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"जोड़े गए डिवाइस को चार्ज करना"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"औसतन <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> में से <xliff:g id="USED_MEMORY">%1$s</xliff:g> मेमोरी उपयोग की गई"</string>
     <string name="users_summary" msgid="1674864467098487328">"<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> डिफ़ॉल्ट है"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"चालू है"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"बंद"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"चालू है"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"बंद है"</string>
     <string name="backup_disabled" msgid="485189128759595412">"बैक अप बंद किया गया"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> में अपडेट किया गया"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"अपडेट उपलब्ध है"</string>
@@ -3657,9 +3664,10 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"त्वरित सेटिंग डेवलपर टाइल"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"विंडो ट्रेस"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"सर्फ़ेस ट्रेस"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"कार्य प्रोफ़ाइल सेटिंग"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"संपर्क सर्च"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"गाड़ी चलाते समय ब्लूटूथ इस्तेमाल करें"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"गाड़ी चलाते समय अपने आप ब्लूटूथ चालू करें"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 की बैटरी सेटिंग देखें"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 8548926..82ae96e 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 sat"</item>
     <item msgid="5198271470953124739">"Nikada ne istječe"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (zadano)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Loše"</item>
     <item msgid="2042505933058940139">"Loša"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Mreža s ograničenim prometom"</item>
     <item msgid="2266114985518865625">"Mreža bez ograničenja prometa"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automatski (na temelju doba dana)"</item>
+    <item msgid="6620560879508595181">"Uvijek uključeno"</item>
+    <item msgid="6385301106124765323">"Uvijek isključeno"</item>
+  </string-array>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 6d3ccf2..c96a0d0 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -718,6 +718,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamti postavke"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maksimalan broj povezanih Bluetooth audiouređaja"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Odaberite maksimalan broj povezanih Bluetooth audiouređaja"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Omogući izvješća o kašnjenju AVDTP-a za Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Omogućuje primanje izvješća o kašnjenju AVDTP-a za Bluetooth"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Emitiranje"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Omogući bežični prikaz"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"U blizini nema uređaja."</string>
@@ -1454,6 +1456,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Lokacija za radni profil"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Dopuštenja za aplikaciju"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nedavni zahtjevi za lokaciju"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Nijedna aplikacija nije nedavno zatražila lokaciju"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Usluge lociranja"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Visoka potrošnja baterije"</string>
@@ -1894,8 +1898,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Upotreba usluge"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Upotreba korekcije boje"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Upotreba titlova"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"UKLJUČENO"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ISKLJUČENO"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Uključeno"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Isključeno"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Prikaži u Brzim postavkama"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Način korekcije"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2339,7 +2343,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Prije nego što možete koristiti pohranu vjerodajnica, vaš uređaj mora imati siguran zaključan zaslon"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"POSTAVI ZAKLJUČAV."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apl. s pristupom pod. o upot."</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Ton hitnog poziva"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Sigurnosna kopija i vraćanje"</string>
@@ -2919,6 +2924,7 @@
     <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>
     <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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Postavite oznaku NFC za Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Piši"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Dodirnite oznaku da biste zapisali podatke..."</string>
@@ -2952,9 +2958,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Priključna stanica reproducira"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Sve zvukove"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Samo medijske zvukove"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Bešumno"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Upozorenje"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibriranje"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Uključi zvukove"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Nikada"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3209,7 +3218,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Promijeni na \"Samo alarmi\" do <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Promijeni na \"Uvijek prekidaj\""</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Kada je zaslon uključen"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Obavijesti utišane opcijom Ne ometaj pojavit će se na zaslonu"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Obavijesti utišane opcijom Ne uznemiravaj pojavit će se na zaslonu i prikazati ikonu trake statusa"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Kada je zaslon isključen"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Obavijesti utišane opcijom Ne ometaj uključit će zaslon i aktivirati svjetlosni signal"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Obavijesti utišane opcijom Ne ometaj uključit će zaslon"</string>
@@ -3403,10 +3412,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Upotrebljavajte uređaj kao MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Svrha upotrebe USB-a"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Upotrebljavajte USB i za"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Zadana USB konfiguracija"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Te će se postavke primjenjivati kada je povezan drugi uređaj, a vaš je telefon otključan. Povežite se samo s pouzdanim uređajima."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Punjenje ovog uređaja"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Punjenje povezanog uređaja"</string>
@@ -3529,8 +3536,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Iskorišteno je prosječno <xliff:g id="USED_MEMORY">%1$s</xliff:g> od <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"Prijavljeni ste kao <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="payment_summary" msgid="3472482669588561110">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> je zadana"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"UKLJUČENO"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"ISKLJUČENO"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Uključeno"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Isključeno"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Sigurnosno kopiranje onemogućeno"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Ažuriran na Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Dostupno je ažuriranje"</string>
@@ -3709,9 +3716,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Povezano s uređajem <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Povezano s više uređaja"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Demo način korisničkog sučelja sustava"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Noćni način rada"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Postavi noćni način rada"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Pločice brzih postavki za razvojne programere"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Iscrtavanje prozora"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Površinsko iscrtavanje"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope praćenje"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Postavke radnog profila"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Pretraživanje kontakata"</string>
@@ -3917,4 +3925,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Upotreba Bluetootha tijekom vožnje"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Automatsko uključivanje Bluetootha tijekom vožnje"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Pogledajte postavke za bateriju Androida 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index 91f8193..ce09d13 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 óra"</item>
     <item msgid="5198271470953124739">"Soha ne legyen időtúllépés"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (alapértelmezett)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Gyenge"</item>
     <item msgid="2042505933058940139">"Gyenge"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Kezelje forgalomkorlátosként"</item>
     <item msgid="2266114985518865625">"Kezelje nem forgalomkorlátosként"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automatikus (aktuális napszak alapján)"</item>
+    <item msgid="6620560879508595181">"Mindig bekapcsolva"</item>
+    <item msgid="6385301106124765323">"Mindig kikapcsolva"</item>
+  </string-array>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 4cb4719..37b79a0 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Beállítások megjegyzése"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Csatlakoztatott Bluetooth-audioeszközök maximális száma"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Válassza ki a csatlakoztatott Bluetooth-audioeszközök maximális számát"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Bluetooth AVDTP késleltetési jelentések engedélyezése"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Bluetooth AVDTP késleltetési jelentések fogadásának engedélyezése"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Tartalomátküldés"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Vezeték nélküli kijelző engedélyezése"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nem található a közelben más eszköz."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"A munkahelyi profil helye"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Alkalmazásszintű engedélyek"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Legutóbbi helylekérdezések"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Az utóbbi időben egy alkalmazás sem kért le helyadatokat."</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Helyszolgáltatások"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Magas akkumulátorhasználat"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Szolgáltatás használata"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Színkorrekció használata"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Feliratok használata"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"BE"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"KI"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Be"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Ki"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Megjelenítés a Gyorsbeállítások között"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Javítási mód"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2315,7 +2319,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"A hitelesítésiadat-tároló használatba vétele előtt az eszköznek biztonságos lezárási képernyővel kell rendelkeznie."</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"KÉPERNYŐZÁR-BEÁLLÍTÁS"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Alkalmazások hozzáféréssel"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Segélyhívás hangja"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Biztonsági mentés és visszaállítás"</string>
@@ -2890,6 +2895,7 @@
     <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>
     <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>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC-címke beállítása"</string>
     <string name="write_tag" msgid="8571858602896222537">"Írás"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Az íráshoz érintsen meg egy címkét…"</string>
@@ -2923,9 +2929,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Dokkoláskor hangszórón szól"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Minden hang"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Kizárólag médiahang"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Néma"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Figyelmeztetés"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Rezgés"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Indítási hangok"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Soha"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3172,7 +3181,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Váltás „Csak ébresztésekre” eddig: <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Módosítás a bármikor történő megszakításra"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Ha a képernyő be van kapcsolva"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"A Ne zavarjanak funkcióval elnémított értesítések felugorhatnak a képernyőn"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Engedélyezi, hogy a Ne zavarjanak funkcióval lenémított értesítések felugorjanak a képernyőn, és állapotsorikont jelenítsenek meg"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Ha a képernyő ki van kapcsolva"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"A Ne zavarjanak funkcióval elnémított értesítésekre bekapcsolhat a képernyő, és villoghat a fényjelzés"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"A Ne zavarjanak funkcióval elnémított értesítésekre bekapcsolhat a képernyő"</string>
@@ -3360,10 +3369,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"A készülék használata MIDI-eszközként"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB használata a következő célra:"</string>
     <string name="usb_use_also" msgid="557340935190819370">"USB használata a következőhöz is:"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Alapértelmezett USB-beállítás"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Ha egy másik eszközt csatlakoztatott, és a telefonja fel van oldva, akkor ezek a beállítások lesznek érvényesek. Csak megbízható eszközökhöz kapcsolódjon."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Az eszköz töltése"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Folyamatban van a csatlakoztatott eszköz töltése"</string>
@@ -3484,8 +3491,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Átlagosan <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>/<xliff:g id="USED_MEMORY">%1$s</xliff:g> memória használatban"</string>
     <string name="users_summary" msgid="1674864467098487328">"Bejelentkezve mint <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="payment_summary" msgid="3472482669588561110">"Alapértelmezett: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"BE"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"KI"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Be"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Ki"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Biztonsági mentés kikapcsolva"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"A következőre frissítve: Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Rendelkezésre áll frissítés"</string>
@@ -3659,9 +3666,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"A(z) <xliff:g id="ID_1">%1$s</xliff:g> eszközhöz csatlakozik"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Több eszközhöz csatlakozik"</string>
     <string name="demo_mode" msgid="2798762752209330277">"A rendszer kezelőfelületének demómódja"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Éjszakai mód"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Éjszakai mód beállítása"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Fejlesztői gyorsbeállítások csempék"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Ablakkövetés"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Felületkövetés"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope Trace"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Munkaprofil beállításai"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Névjegykeresés"</string>
@@ -3857,4 +3865,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Bluetooth használata vezetés közben"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Bluetooth automatikus bekapcsolása vezetés közben"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Az Android 8.0 akkumulátorbeállításainak megjelenítése"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml
index 93db277..ea28dba 100644
--- a/res/values-hy/arrays.xml
+++ b/res/values-hy/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 ժամ"</item>
     <item msgid="5198271470953124739">"Ժամանակի սպառումը բացառել"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (կանխադրված)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Թույլ"</item>
     <item msgid="2042505933058940139">"Թույլ"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Սահմանափակ"</item>
     <item msgid="2266114985518865625">"Անսահմանափակ"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Ավտոմատ (ըստ օրվա ժամի)"</item>
+    <item msgid="6620560879508595181">"Միշտ միացված է"</item>
+    <item msgid="6385301106124765323">"Միշտ անջատած է"</item>
+  </string-array>
 </resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 1c65d2e..585a168 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Հիշել կարգավորումները"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Թույլատրելի առավելագույն թվով միացված Bluetooth աուդիո սարքեր"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Նշեք միացված Bluetooth աուդիո սարքերի թույլատրելի առավելագույն թիվը"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Միացնել Bluetooth AVDTP-ի ուշացման մասին հաշվետվությունները"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Թույլատրել Bluetooth AVDTP-ի ուշացման մասին հաշվետվությունների փոխանցումը"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Հեռարձակում"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Միացնել անլար էկրանը"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Մոտակայքում սարքեր չեն գտնվել:"</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Տեղ աշխատանքային պրոֆիլի համար"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Հավելվածների թույլտվություններ"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Տեղորոշման վերջին հարցումները"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Որևէ ծրագիր տեղադրության հարցում չի կատարել վերջերս"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Տեղորոշման ծառայություններ"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Մարտկոցի շատ օգտագործում"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Օգտագործել ծառայությունը"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Օգտագործել գունաշտկումը"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Օգտագործել ենթագրերը"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ՄԻԱՑՎԱԾ"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ԱՆՋԱՏՎԱԾ"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Միացված է"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Անջատած է"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Ցույց տալ Արագ կարգավորումներում"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Շտկման ռեժիմը"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Որպեսզի կարողանաք օգտագործել մուտքի տվյալների պահեստը, ձեր սարքը պետք է ապահով կողպէկրան ունենա"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ԿԱՐԳԱՎՈՐԵԼ ԿՈՂՊՈՒՄԸ"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Թույլատրված հավելվածներ"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Շտապ կանչի ազդանշանը"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"Կարգավորել աշխատանքի ռեժիմը շտապ կանչի դեպքում"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Պահուստավորում"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Պահուստավորել և վերականգնել"</string>
@@ -2888,6 +2893,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"սերիական համար, սարքակազմի տարբերակ"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"Android-ի խոցելիության շտկման մակարդակ, Baseband-ի տարբերակ, միջուկի տարբերակ"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Անգործուն ռեժիմի էկրան, կողպված էկրան"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"մատնահետք"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Կարգավորել Wi-Fi NFC պիտակը"</string>
     <string name="write_tag" msgid="8571858602896222537">"Գրել"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Հպեք պիտակի վրա՝ գրելու համար..."</string>
@@ -2921,9 +2927,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Անձայն"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Զգուշացում"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Թրթռալ"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Միացման ձայներ"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Երբեք"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Ակտիվացնել «Միայն զարթուցիչը» ռեժիմը մինչև <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>-ը"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Ակտիվացնել «Միշտ ընդհատել» ռեժիմը"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Երբ էկրանը միացված է"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"«Չանհանգստացնել» գործառույթի միջոցով լռեցված ծանուցումներին թույլատրել ցուցադրել էկրանին"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Թույլատրել, որ «Չանհանգստացնել» ռեժիմում արգելափակված ծանուցումները հայտնվեն էկրանին, և ցուցադրել կարգավիճակի գոտու պատկերակը"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Երբ էկրանն անջատված է"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"«Չանհանգստացնել» գործառույթի միջոցով լռեցված ծանուցումներին թույլատրել միացնել էկրանն ու լուսաթարթել"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"«Չանհանգստացնել» գործառույթի միջոցով լռեցված ծանուցումներին թույլատրել միացնել էկրանը"</string>
@@ -3252,7 +3261,7 @@
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Թույլտվություններ չեն հայցվել"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Բոլոր հավելվածները"</string>
     <string name="filter_enabled_apps" msgid="5395727306799456250">"Տեղադրված հավելվածներ"</string>
-    <string name="filter_instant_apps" msgid="574277769963965565">"Ակնթարթորեն գործարկվող հավելվածները"</string>
+    <string name="filter_instant_apps" msgid="574277769963965565">"Ակնթարթային հավելվածները"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Անձնական"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Աշխատանքային"</string>
     <string name="filter_notif_all_apps" msgid="2299049859443680242">"Հավելվածներ՝ բոլորը"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Այս սարքի օգտագործում որպես MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Օգտագործել հետևյալ USB կապակցումը՝"</string>
     <string name="usb_use_also" msgid="557340935190819370">"USB-ի այլ կիրառումներ"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"USB-ի կանխադրված կարգավորում"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Այս կարգավորումները կկիրառվեն, երբ դուք միանաք այլ սարքի և ապակողպեք ձեր հեռախոսը: Միացեք միայն վստահելի սարքերի:"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Այս սարքի լիցքավորում"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Միացված սարքի լիցքավորում"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>-ից օգտագործվել է <xliff:g id="USED_MEMORY">%1$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"Մուտք եք գործել որպես <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>-ը կանխադրված հավելվածն է"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"ՄԻԱՑՎԱԾ Է"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"ԱՆՋԱՏԱԾ"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Միացված է"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Անջատած է"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Պահուստավորումն անջատված է"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Տեղադրվել է Android <xliff:g id="VERSION">%1$s</xliff:g> տարբերակը"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Հասանելի է նոր տարբերակը"</string>
@@ -3657,9 +3664,10 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"Մշակողի արագ կարգավորման սալիկներ"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Պատուհանների հետագծում"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Մակերեսի հետագծում"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Աշխատանքային պրոֆիլի կարգավորումներ"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Կոնտակտների որոնում"</string>
@@ -3718,10 +3726,10 @@
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Անհասանելի է օպերատորի կողմից կողպված սարքերում"</string>
     <string name="oem_lock_info_message" msgid="9218313722236417510">"Վերագործարկեք սարքը՝ դրա պաշտպանական գործառույթն ակտիվացնելու համար:"</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"Ընդհանուր առմամբ ազատվել է <xliff:g id="SIZE">%1$s</xliff:g> տարածք\n\nՎերջին գործարկումը՝ <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="web_action_enable_title" msgid="4051513950976670853">"Ակնթարթորեն գործարկվող հավելվածներ"</string>
+    <string name="web_action_enable_title" msgid="4051513950976670853">"Ակնթարթային հավելվածներ"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"Բացել հղումները հավելվածներում՝ նույնիսկ եթե դրանք տեղադրված չեն"</string>
-    <string name="web_action_section_title" msgid="7364647086538399136">"Ակնթարթորեն գործարկվող հավելվածներ"</string>
-    <string name="instant_apps_settings" msgid="8827777916518348213">"Ակնթարթորեն գործարկվող հավելվածների կարգավորումներ"</string>
+    <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="account_for_section_header" msgid="5356566418548737121">"Հաշիվներ <xliff:g id="USER_NAME">%1$s</xliff:g> օգտատիրոջ համար"</string>
@@ -3813,7 +3821,7 @@
     <string name="storage_volume_total" msgid="3499221850532701342">"Օգտագործված է <xliff:g id="TOTAL">%1$s</xliff:g>-ից"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"զբաղված է"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"Մաքրել հավելվածի տվյալները"</string>
-    <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Հեռացնե՞լ այս ակնթարթորեն գործարկվող հավելվածը։"</string>
+    <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Հեռացնե՞լ այս ակնթարթային հավելվածը։"</string>
     <string name="launch_instant_app" msgid="391581144859010499">"Բացել"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Խաղեր"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Աուդիո ֆայլեր"</string>
@@ -3830,7 +3838,7 @@
     <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="install_type_instant" msgid="3174425974536078647">"Ակնթարթային հավելված"</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>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Վարելիս օգտագործել Bluetooth-ը"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Վարելիս ավտոմատ միացնել Bluetooth-ը"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 մարտկոցի կարգավորումներ"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 564eaa9..cc91695 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 jam"</item>
     <item msgid="5198271470953124739">"Tanpa waktu tunggu"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (Default)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Buruk"</item>
     <item msgid="2042505933058940139">"Buruk"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Perlakukan sebagai terukur"</item>
     <item msgid="2266114985518865625">"Perlakukan sebagai belum terukur"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Otomatis (berdasarkan waktu)"</item>
+    <item msgid="6620560879508595181">"Selalu aktif"</item>
+    <item msgid="6385301106124765323">"Selalu nonaktif"</item>
+  </string-array>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 53088a9..a0ec7e9 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ingat setelan"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Perangkat audio Bluetooth maksimum yang terhubung"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Pilih jumlah maksimum perangkat audio Bluetooth yang terhubung"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Aktifkan laporan penundaan AVDTP Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Izinkan menerima laporan penundaan AVDTP Bluetooth"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Transmisi"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Aktifkan layar nirkabel"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Tidak ditemukan perangkat terdekat."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Lokasi untuk profil kerja"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Izin tingkat aplikasi"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Permintaan lokasi terbaru"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Tidak ada aplikasi yang meminta lokasi baru-baru ini"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Layanan lokasi"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Penggunaan baterai tinggi"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Gunakan layanan"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Gunakan koreksi warna"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Gunakan teks"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"AKTIF"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"NONAKTIF"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Aktif"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Nonaktif"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Tampilkan di Setelan Cepat"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Mode koreksi"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Agar dapat menggunakan penyimpanan kredensial, perangkat harus memiliki layar kunci yang aman"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"SETEL KUNCI"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Aplikasi dengan akses penggunaan"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Nada darurat"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Mencadangkan &amp; memulihkan"</string>
@@ -2888,6 +2893,7 @@
     <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>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Tampilan standby, tampilan Layar kunci"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"sidik jari"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Siapkan Tag NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Tulis"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Ketuk tag untuk menulis..."</string>
@@ -2921,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Dok pemutaran speaker"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Semua audio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Hanya audio media"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Senyap"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Suara peringatan"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Getar"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Aktifkan suara"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Tidak pernah"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Ubah ke mode hanya alarm hingga <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Ubah ke mode selalu ganggu"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Ketika layar menyala"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Mematikan suara notifikasi dengan Jangan Ganggu akan menghidupkan layar sekejap"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Nonaktifkan suara notifikasi dengan Jangan Ganggu muncul di layar dan menampilkan ikon status bar"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Ketika layar mati"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Mematikan suara notifikasi dengan Jangan Ganggu akan menyalakan layar dan mengedipkan lampu"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Mematikan suara notifikasi dengan Jangan Ganggu akan menyalakan layar"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Menggunakan perangkat ini sebagai MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Gunakan USB untuk"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Gunakan juga USB untuk"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Konfigurasi USB Default"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Ketika perangkat lain terhubung dan ponsel Anda terbuka kuncinya, setelan ini akan berlaku. Hanya hubungkan ke perangkat yang dipercaya."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Mengisi baterai perangkat ini"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Mengisi daya perangkat yang terhubung"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Rata-rata <xliff:g id="USED_MEMORY">%1$s</xliff:g> dari <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> memori digunakan"</string>
     <string name="users_summary" msgid="1674864467098487328">"Login sebagai <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> default"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"AKTIF"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"NONAKTIF"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Aktif"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Nonaktif"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Cadangan dinonaktifkan"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Diupdate ke Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Ada update"</string>
@@ -3657,9 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Terhubung ke <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Terhubung ke beberapa perangkat"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Mode demo UI sistem"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Mode malam"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Setel Mode malam"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Ubin developer setelan cepat"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Jejak Jendela"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Pelacakan Permukaan"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Pelacakan 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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Setelan profil kerja"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Penelusuran kontak"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Gunakan Bluetooth saat berkendara"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Aktifkan Bluetooth secara otomatis saat mengemudi"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Lihat setelan baterai Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-is/arrays.xml b/res/values-is/arrays.xml
index 0743856..b07e2bd 100644
--- a/res/values-is/arrays.xml
+++ b/res/values-is/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 klukkustund"</item>
     <item msgid="5198271470953124739">"Renna aldrei út á tíma"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (sjálfgefið)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Lélegt"</item>
     <item msgid="2042505933058940139">"Lélegt"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Meðhöndla sem mælt"</item>
     <item msgid="2266114985518865625">"Meðhöndla sem ótakmarkað"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Sjálfvirkt (fer eftir tíma dags)"</item>
+    <item msgid="6620560879508595181">"Alltaf kveikt"</item>
+    <item msgid="6385301106124765323">"Alltaf slökkt"</item>
+  </string-array>
 </resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 7a064e5..66b9b56 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Muna stillingar"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Hámarksfjöldi tengdra Bluetooth-hljómtækja"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Velja hámarksfjölda tengdra Bluetooth-hljómtækja"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Kveikja á Bluetooth AVDTP-seinkunarskýrslum"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Leyfa móttöku Bluetooth AVDTP-seinkunarskýrslna"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Útsending"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Leyfa þráðlausan skjá"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Engin nálæg tæki fundust."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Staðsetning vinnusniðs"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Forritaheimildir"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nýlegar staðsetningarbeiðnir"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Engin forrit hafa óskað eftir staðsetningu nýlega"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Staðsetningarþjónustur"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Mikil rafhlöðunotkun"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Nota þjónustu"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Nota litaleiðréttingu"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Nota skjátexta"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"KVEIKT"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"SLÖKKT"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Kveikt"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Slökkt"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Sýna í flýtistillingum"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Leiðréttingastilling"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Áður en þú getur notað skilríkjageymslu þarf tækið þitt að vera með öruggan skjálás"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"STILLA LÁS"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Forrit með notkunaraðgang"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Neyðartónn"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Afritun og endurheimt"</string>
@@ -2888,6 +2893,7 @@
     <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>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Umhverfisskjár, Lásskjár"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"fingrafar"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Setja upp Wi-Fi NFC-merki"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skrifa"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Snertu merki til að skrifa..."</string>
@@ -2921,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Dokkuhátalari spilar"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Allt hljóð"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Aðeins hljóð efnis"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Hljóðlaust"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Viðvörun"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Titringur"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Ræsingarhljóð"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Aldrei"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Breyta í vekjara eingöngu til <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Breyta í truflanir alltaf"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Þegar kveikt er á skjánum"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Láta tilkynningar sem þaggaðar eru með „Ónáðið ekki“ birtast á skjánum"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Láta tilkynningar sem eru þaggaðar með „Ónáðið ekki“ birtast stutt á skjánum og sýna tákn á stöðustiku"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Þegar slökkt er á skjánum"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Láta kvikna á skjánum eða ljós blikka þegar tilkynningar eru þaggaðar með „Ónáðið ekki“"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Láta tilkynningar sem þaggaðar eru með „Ónáðið ekki“ kveikja á skjánum"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Nota þetta tæki sem MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Nota USB fyrir"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Nota USB einnig fyrir"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Sjálfgefin USB-stilling"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Þegar annað tæki er tengt og síminn er ekki læstur verða þessar stillingar notaðar. Aðeins tengjast við traust tæki."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Hleður þetta tæki"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Hlaða tengt tæki"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Að meðaltali <xliff:g id="USED_MEMORY">%1$s</xliff:g> af <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> minni í notkun"</string>
     <string name="users_summary" msgid="1674864467098487328">"Skráð(ur) inn sem <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> er sjálfgefið"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"KVEIKT"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"SLÖKKT"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Kveikt"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Slökkt"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Slökkt á afritun"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Uppfært í Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Uppfærsla í boði"</string>
@@ -3657,9 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Tengt við <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Tengt við mörg tæki"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Prufustilling kerfisviðmóts"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Næturstilling"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Velja næturstillingu"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Reitir fyrir flýtistillingar forritara"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Gluggaslóð"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Rakning á yfirborði"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope-rakning"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Stillingar vinnusniðs"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Tengiliðaleit"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Nota Bluetooth við akstur"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Kveikja sjálfkrafa á Bluetooth við akstur"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Sjá rafhlöðustillingar Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index ea9a82d..67dc3d0 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 ora"</item>
     <item msgid="5198271470953124739">"Mai in timeout"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (predefinito)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Scadente"</item>
     <item msgid="2042505933058940139">"Scarsa"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Considera misurata"</item>
     <item msgid="2266114985518865625">"Considera non misurata"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automatica (in base all\'ora del giorno)"</item>
+    <item msgid="6620560879508595181">"Sempre attiva"</item>
+    <item msgid="6385301106124765323">"Sempre disattivata"</item>
+  </string-array>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 28da700..5b5fbae 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ricorda impostazioni"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Numero massimo di dispositivi audio Bluetooth connessi"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Seleziona il numero massimo di dispositivi audio Bluetooth connessi"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Attiva rapporti su ritardi AVDTP Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Consenti di ricevere rapporti sui ritardi AVDTP Bluetooth"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Trasmetti"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Attiva display wireless"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nessun dispositivo vicino."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Posizione per profilo di lavoro"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Autorizz. a livello di app"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Richieste di posizione recenti"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Nessuna applicazione ha richiesto la posizione di recente"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Servizi di geolocalizzazione"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Elevato utilizzo della batteria"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Utilizza servizio"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Utilizza correzione colore"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Utilizza sottotitoli"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ATTIVO"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DISATTIVATO"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"On"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Off"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Mostra in Impostazioni rapide"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Modalità di correzione"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Per poter utilizzare l\'archivio credenziali, sul tuo dispositivo deve essere impostata una schermata di blocco sicura."</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"IMPOSTA BLOCCO"</string>
     <string name="usage_access_title" msgid="332333405495457839">"App con accesso a dati utilizzo"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Tono chiamate emergenza"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Backup e ripristino"</string>
@@ -2888,6 +2893,7 @@
     <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>
     <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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configura tag NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Modifica"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tocca un tag per impostarlo..."</string>
@@ -2921,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Riproduzioni con altoparlanti dock"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Tutti i dispositivi audio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Dispositivi di solo audio"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Silenzioso"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Avviso acustico"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrazione"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Attiva suoni"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Mai"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Cambia su Solo sveglie fino alle <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Cambia su Interrompi sempre"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Quando lo schermo è acceso"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Attiva visualizzazione sullo schermo di notifiche in modalità \"Non disturbare\""</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Attiva visualizzazione sullo schermo di notifiche in modalità \"Non disturbare\" e mostra un\'icona nella barra di stato"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Quando lo schermo è spento"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Attiva lo schermo e la luce intermittente per le notifiche in modalità \"Non disturbare\""</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Attiva lo schermo per le notifiche in modalità \"Non disturbare\""</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Utilizzare questo dispositivo per la modalità MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Utilizza connessione USB per"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Usa USB anche per"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Configurazione USB predefinita"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Quando è connesso un altro dispositivo e il telefono è sbloccato, verranno applicate queste impostazioni. Collegati solo a dispositivi attendibili."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Ricarica del dispositivo"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Ricarica del dispositivo collegato"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Utilizzo medio di <xliff:g id="USED_MEMORY">%1$s</xliff:g> di memoria su <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"Accesso eseguito come <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> è l\'app predefinita"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"ON"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"OFF"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"On"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Off"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Backup disattivato"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Aggiornato ad Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Aggiornamento disponibile"</string>
@@ -3657,9 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connesso a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connesso a più dispositivi"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Modalità demo dell\'interfaccia utente di sistema"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Modalità notturna"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Imposta la modalità notturna"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Riquadri sviluppatore per impostazioni rapide"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Traccia finestra"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Acquisizione dati superficie"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Traccia 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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Impostazioni profilo di lavoro"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Ricerca di contatti"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Utilizza il Bluetooth alla guida"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Attiva il Bluetooth automaticamente durante la guida"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Accedi alle impostazioni della batteria di Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 1c1927c..0e61248 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"שעה אחת"</item>
     <item msgid="5198271470953124739">"ללא זמן קצוב לתפוגה"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (ברירת מחדל)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"חלש"</item>
     <item msgid="2042505933058940139">"חלשה"</item>
@@ -497,7 +489,9 @@
     <item msgid="8745603368609022803">"יש להתייחס כרשת נמדדת"</item>
     <item msgid="2266114985518865625">"יש להתייחס כרשת לא נמדדת"</item>
   </string-array>
-    <!-- no translation found for dark_ui_mode_entries:0 (146804192658443142) -->
-    <!-- no translation found for dark_ui_mode_entries:1 (6620560879508595181) -->
-    <!-- no translation found for dark_ui_mode_entries:2 (6385301106124765323) -->
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"אוטומטי (מבוסס על השעה ביום)"</item>
+    <item msgid="6620560879508595181">"פועל תמיד"</item>
+    <item msgid="6385301106124765323">"כבוי תמיד"</item>
+  </string-array>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 1093e1f..bfb8213 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -729,10 +729,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"זכור הגדרות"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"‏מקסימום התקני אודיו המחוברים באמצעות Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"‏בחירת מספר מקסימלי של התקני אודיו המחוברים באמצעות Bluetooth"</string>
-    <!-- no translation found for bluetooth_enable_avdtp_delay_reports (5101903170688399944) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_avdtp_delay_reports_summary (7052797876020616399) -->
-    <skip />
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"‏הפעלה של דוחות השהיה של AVDTP באמצעות ה-Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"‏מתן אישור לקבלת דוחות השהיה של AVDTP באמצעות ה-Bluetooth"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"‏הפעל תצוגת WiFi"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"לא נמצאו מכשירים בקרבת מקום."</string>
@@ -1471,6 +1469,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"מיקום עבור פרופיל עבודה"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"הרשאות ברמת אפליקציה"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"בקשות של מיקומים אחרונים"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"אין אפליקציות שביקשו מיקום לאחרונה"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"שירותי מיקום"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"שימוש בסוללה מלאה"</string>
@@ -1912,10 +1912,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"שימוש בשירות"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"שימוש בתיקון צבע"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"שימוש בכתוביות"</string>
-    <!-- no translation found for accessibility_summary_state_enabled (7914278500885887763) -->
-    <skip />
-    <!-- no translation found for accessibility_summary_state_disabled (2984230257590246745) -->
-    <skip />
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"פועל"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"כבוי"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"הצג בהגדרות מהירות"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"מצב תיקון"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2371,7 +2369,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"כדי להשתמש באחסון פרטי כניסה, עליך להגדיר מסך נעילה מאובטח במכשיר"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"הגדרת נעילה"</string>
     <string name="usage_access_title" msgid="332333405495457839">"גישה לנתוני שימוש"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"צליל חירום"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"הגדר אופן פעולה בעת ביצוע שיחת חירום"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"גיבוי"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"גיבוי ושחזור"</string>
@@ -2958,8 +2957,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"מספר סידורי, גרסת חומרה"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"‏רמת תיקון האבטחה ב-Android, גרסת פס בסיס, גרסת ליבה"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"תצוגה רגישה לסביבה, תצוגה של מסך נעילה"</string>
-    <!-- no translation found for keywords_fingerprint_settings (239222512315619538) -->
-    <skip />
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"טביעת אצבע"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏הגדר תג NFC של Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"כתוב"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"הקש על תג כדי לכתוב..."</string>
@@ -2993,9 +2991,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"מצב שקט"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"התרעה"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"רטט"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"הפעלת צלילים"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"אף פעם"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3258,8 +3259,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"עבור למצב \'התראות בלבד\' עד <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"שנה ל\'הפרעות בכל מצב\'"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"כאשר המסך מופעל"</string>
-    <!-- no translation found for zen_mode_screen_on_summary (2208664848367443505) -->
-    <skip />
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"הודעות שהושתקו במצב \'נא לא להפריע\' יופיעו במסך ויציגו סמל של שורת סטטוס"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"כאשר המסך כבוי"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"הודעות שהושתקו במצב \'נא לא להפריע\' יפעילו את המסך ואת האור המהבהב"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"הודעות שהושתקו במצב \'נא לא להפריע\' יפעילו את המסך"</string>
@@ -3585,10 +3585,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"ממוצע של <xliff:g id="USED_MEMORY">%1$s</xliff:g> מתוך <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> זיכרון בשימוש"</string>
     <string name="users_summary" msgid="1674864467098487328">"מחובר בתור <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>"</string>
-    <!-- no translation found for location_on_summary (3637699010986988970) -->
-    <skip />
-    <!-- no translation found for location_off_summary (7217264690673949107) -->
-    <skip />
+    <string name="location_on_summary" msgid="3637699010986988970">"פועל"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"כבוי"</string>
     <string name="backup_disabled" msgid="485189128759595412">"הגיבוי מושבת"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"‏עודכן ל-Android גרסה ‏<xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"יש עדכון זמין"</string>
@@ -3772,13 +3770,10 @@
     <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>
-    <!-- no translation found for dark_ui_mode (2112241426441807273) -->
-    <skip />
-    <!-- no translation found for dark_ui_mode_title (975299966259850992) -->
-    <skip />
+    <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>
-    <!-- no translation found for winscope_trace_quick_settings_title (1294290008255732032) -->
-    <skip />
+    <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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"הגדרות של פרופיל עבודה"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"חיפוש אנשי קשר"</string>
@@ -3994,4 +3989,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"‏שימוש ב-Bluetooth במהלך נהיגה"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"‏להפעלה אוטומטית של Bluetooth בזמן נהיגה"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"‏הצגת הגדרות הסוללה של Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 76285c0..c73dc79 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1時間"</item>
     <item msgid="5198271470953124739">"タイムアウトしない"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1（デフォルト）"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"弱"</item>
     <item msgid="2042505933058940139">"弱"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"従量制として処理"</item>
     <item msgid="2266114985518865625">"定額制として処理"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"自動（時間帯に基づく）"</item>
+    <item msgid="6620560879508595181">"常に ON"</item>
+    <item msgid="6385301106124765323">"常に OFF"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 03b63e7..f856edc 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"設定を保存"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"接続できる Bluetooth オーディオ デバイスの上限"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"接続できる Bluetooth オーディオ デバイス数の上限の選択"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Bluetooth AVDTP 遅延レポートを有効にする"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Bluetooth AVDTP 遅延レポートの受け取りを許可する"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"キャスト"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"ワイヤレスディスプレイの有効化"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"周辺にデバイスが見つかりません"</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"仕事用プロファイルの場所"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"アプリレベルの権限"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"最近の位置情報リクエスト"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"位置情報を最近リクエストしたアプリはありません"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"位置情報サービス"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"電池使用量: 高"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"サービスの使用"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"色補正の使用"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"字幕の使用"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ON"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"OFF"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"ON"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"OFF"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"クイック設定に表示"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"補正モード"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2317,7 +2321,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"認証情報ストレージを使用するには、端末を画面ロックで保護しておく必要があります"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ロックを設定"</string>
     <string name="usage_access_title" msgid="332333405495457839">"使用履歴にアクセスできるアプリ"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"緊急時の音"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"緊急通報時の動作を設定します"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"バックアップ"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"バックアップと復元"</string>
@@ -2892,6 +2897,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"シリアル番号, ハードウェア バージョン"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"Android セキュリティ パッチ レベル, ベースバンド バージョン, カーネル バージョン"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"アンビエント表示, ロック画面表示"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"指紋"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFCタグのセットアップ"</string>
     <string name="write_tag" msgid="8571858602896222537">"書き込む"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"書き込むにはタグをタップしてください..."</string>
@@ -2925,9 +2931,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"マナーモード"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"アラート"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"バイブレーション"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"電源オンの音"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"なし"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3174,7 +3183,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g>までアラームのみに変更します"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"常に割り込みに変更します"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"画面が ON のとき"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"マナーモードでサイレントに設定した通知を受信したときに、画面にポップアップ表示されます"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"マナーモードでサイレントに設定した通知を受信したときに、画面上にポップアップ表示され、ステータスバーにアイコンが表示されます"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"画面が OFF のとき"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"マナーモードでサイレントに設定した通知を受信したときに、画面が ON になり、光が点滅します"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"マナーモードでサイレントに設定した通知を受信したときに、画面が ON になります"</string>
@@ -3362,10 +3371,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"この端末を MIDI として利用する際に使用します"</string>
     <string name="usb_use" msgid="3372728031108932425">"USBの使用"</string>
     <string name="usb_use_also" msgid="557340935190819370">"USB の他の用途"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"デフォルトの USB 設定"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"別の端末が接続されてスマートフォンのロックが解除されると、この設定が適用されます。信頼できる端末にのみ接続してください。"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"この端末を充電する"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"接続端末の充電"</string>
@@ -3486,8 +3493,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"平均で<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>のうち<xliff:g id="USED_MEMORY">%1$s</xliff:g>を使用しています"</string>
     <string name="users_summary" msgid="1674864467098487328">"ログイン名: <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>がデフォルトで設定されています"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"ON"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"OFF"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"ON"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"OFF"</string>
     <string name="backup_disabled" msgid="485189128759595412">"バックアップは無効です"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> に更新済み"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"アップデートを利用できます"</string>
@@ -3661,9 +3668,10 @@
     <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">"システム UI デモモード"</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="window_trace_quick_settings_title" msgid="3839917000546526898">"ウィンドウ トレース"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"サーフェス トレース"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"ウィンスコープ トレース"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"仕事用プロファイルの設定"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"連絡先の検索"</string>
@@ -3859,4 +3867,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"運転時に Bluetooth を使用"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"運転時に自動的に Bluetooth を ON にする"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 の電池設定を確認"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-ka/arrays.xml b/res/values-ka/arrays.xml
index f039282..05883aa 100644
--- a/res/values-ka/arrays.xml
+++ b/res/values-ka/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 საათი"</item>
     <item msgid="5198271470953124739">"დროის ლიმიტის გარეშე"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (ნაგულისხმევი)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"სუსტი"</item>
     <item msgid="2042505933058940139">"ცუდი"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"ლიმიტირებულად ჩათვლა"</item>
     <item msgid="2266114985518865625">"არალიმიტირებულად ჩათვლა"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"ავტომატური (დღის მონაკვეთის მიხედვით)"</item>
+    <item msgid="6620560879508595181">"ყოველთვის ჩართული"</item>
+    <item msgid="6385301106124765323">"ყოველთვის გამორთული"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 0a1dae7..9f56a2a 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"პარამეტრების დამახსოვრება"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"დაკავშირებულ Bluetooth აუდიო-მოწყობილობათა მაქსიმალური რიცხვი"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"აირჩიეთ დაკავშირებულ Bluetooth აუდიო-მოწყობილობათა მაქსიმალური რიცხვი"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Bluetooth AVDTP შეყოვნების ანგარიშების ჩართვა"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Bluetooth AVDTP შეყოვნების ანგარიშების მიღების დაშვება"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"ტრანსლირება"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"უსადენო ეკრანის ჩართვა"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"ახლომახლო მოწყობილობების მოძიება ვერ მოხერხდა."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ადგილმდებარეობა სამუშაო პროფილისათვის"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"ნებართვები აპის დონეზე"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"მდებარეობის ბოლო მოთხოვნები"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"ბოლო დროს აპებს მდებარეობის ინფორმაცია არ მოუთხოვია"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"მდებარეობის სერვისები"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"მძლავრი ბატარეა"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"სერვისის გამოყენება"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"ფერის კორექციის გამოყენება"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"სუბტიტრების გამოყენება"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ჩართული"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"გამორთული"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"ჩართული"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"გამორთული"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"სწრაფ პარამეტრებში ჩვენება"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"შესწორების რეჟიმი"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"სამომხმარებლო მონაცემების საცავის გამოყენებამდე თქვენს მოწყობილობას უნდა ჰქონდეს ეკრანის ჩაკეტვის უსაფრთხო მეთოდი"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"საკეტის დაყენება"</string>
     <string name="usage_access_title" msgid="332333405495457839">"აპები გამოყ. წვდომით"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"საგანგებო ზარის ტონალური სიგნალი"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"ქცევის დაყენება, როცა განხორციელებულია გადაუდებელი ზარი"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"სარეზერვო კოპირება"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"სარეზერვო კოპირება და აღდგენა"</string>
@@ -2888,6 +2893,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"სერიული ნომერი, აპარატურის ვერსია"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"Android-ის უსაფრთხოების ჩასწორების დონე, baseband-ის ვერსია, kernel-ის ვერსია"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"ემბიენტური ეკრანი, ჩაკეტილი ეკრანი"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"თითის ანაბეჭდი"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC თეგის დაყენება"</string>
     <string name="write_tag" msgid="8571858602896222537">"ჩაწერა"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"შეეხეთ თეგს დასაწერად..."</string>
@@ -2921,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Dock სპიკერები უკრავს"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"ყველა აუდიო"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"მხოლოდ მედიას აუდიო"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"დადუმებული"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"გაფრთხილება"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ვიბრაცია"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"ჩართვის ხმები"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"არასოდეს"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"მაღვიძარებზე მხოლოდ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>-მდე გადაყვანა"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"„მუდმივად შეწყვეტის“ რეჟიმზე გადაყვანა"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"როცა ეკრანი ჩართულია"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"„არ შემაწუხოთ“ რეჟიმის მეშვეობით დადუმებული შეტყობინებების ეკრანზე გამოჩენის დაშვება"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"„არ შემაწუხოთ“ რეჟიმის მეშვეობით დადუმებული შეტყობინებების მიერ ეკრანზე გამოჩენის და სტატუსის ზოლის ხატულის გამოჩენის დაშვება"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"როცა ეკრანი გამორთულია"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"„არ შემაწუხოთ“ რეჟიმის მეშვეობით დადუმებული შეტყობინებების მიერ ეკრანის ჩართვის და სინათლის ინდიკატორის გამოყენების დაშვება"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"„არ შემაწუხოთ“ რეჟიმის მეშვეობით დადუმებული შეტყობინებების მიერ ეკრანის ჩართვის დაშვება"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"ამ მოწყობილობის MIDI-ს სახით გამოყენება"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB-ს გამოყენება"</string>
     <string name="usb_use_also" msgid="557340935190819370">"USB-ს აგრეთვე გამოყენება"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"ნაგულისხმევი USB კონფიგურაცია"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"მოცემული პარამეტრები იმოქმედებს, როცა დაკავშირებულია სხვა მოწყობილობა, თქვენი ტელეფონი კი განბლოკილია. დაუკავშირდით მხოლოდ სანდო მოწყობილობებს."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"ამ მოწყობილობის დატენვა"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"დაკავშირებული მოწყობილობის დატენვა"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"გამოყენებულია საშ. <xliff:g id="USED_MEMORY">%1$s</xliff:g> / <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>დან"</string>
     <string name="users_summary" msgid="1674864467098487328">"შესული ხართ, როგორც <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> ნაგულისხმევია"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"ჩართული"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"გამორთულია"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"ჩართული"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"გამორთული"</string>
     <string name="backup_disabled" msgid="485189128759595412">"სარეზერვო ასლების შექმნა გათიშულია"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"განახლდა Android <xliff:g id="VERSION">%1$s</xliff:g>-ზე"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"განახლება ხელმისაწვდომია"</string>
@@ -3657,9 +3664,10 @@
     <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">"სისტემის UI-ს დემო-რეჟიმი"</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="window_trace_quick_settings_title" msgid="3839917000546526898">"ფანჯრის კვალი"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"ზედაპირის კვალი"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"სამსახურის პროფილის პარამეტრები"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"კონტაქტების ძიება"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Bluetooth-ის მანქანის მართვისას გამოყენება"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Bluetooth-ის ავტომატურად ჩართვა ავტომობილის მართვისას"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0-ის ბატარეის პარამეტრების ნახვა"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-kk/arrays.xml b/res/values-kk/arrays.xml
index 069e988..89b1b3a 100644
--- a/res/values-kk/arrays.xml
+++ b/res/values-kk/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 сағат"</item>
     <item msgid="5198271470953124739">"Ешқашан"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (әдепкі)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Нашар"</item>
     <item msgid="2042505933058940139">"Нашар"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Шектеулі"</item>
     <item msgid="2266114985518865625">"Шектеусіз"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Автоматты (тәулік уақыты негізінде)"</item>
+    <item msgid="6620560879508595181">"Үнемі қосулы"</item>
+    <item msgid="6385301106124765323">"Үнемі өшірулі"</item>
+  </string-array>
 </resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 4adf855..e92a3d9 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Параметрлерді есте сақтау"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Байланыстырылған Bluetooth аудиоқұрылғылардың максималды саны"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Байланыстырылған Bluetooth аудиоқұрылғылардың максималды санын таңдау"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Bluetooth AVDTP кідіру есептерін қосу"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Bluetooth AVDTP кідіру есептерін алуға рұқсат ету"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Трансляция"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Сымсыз дисплейді қосу"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Маңайдан құрылғылар табылмады"</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Жұмыс профилінің орны"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Қолданба деңгейіндегі рұқсаттар"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Соңғы аймақ өтініштері"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Жуықта ешқандай қолданба аймақ туралы өтініш жасамаған"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Орын қызметтері"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Жоғары деңгейде батарея қолдану"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Қызметті пайдалану"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Түс жөндеуді пайдалану"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Субтитрлер пайдалану"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ҚОСУЛЫ"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ӨШІРУЛІ"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Қосу"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Өшіру"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Жылдам параметрлер арқылы көрсету"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Түзету режимі"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Маңызды деректер жадын пайдаланбас бұрын құрылғыда қауіпсіз құлып экраны болуы керек."</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ҚҰЛЫПТАУДЫ РЕТТЕУ"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Деректерге рұқсаты бар қолданбалар"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Төтенше қоңырау әуені"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"Төтенше қоңырау шалу әрекетін орнату"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Сақтық көшірме"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Сақтық көшірме жасау және қалпына келтіру"</string>
@@ -2888,6 +2893,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"сериялық нөмір, жабдық нұсқасы"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android қауіпсіздік түзетуінің деңгейі, тікелей тарату нұсқасы, ядро нұсқасы"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Қосулы экран, құлып экраны"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"саусақ ізі"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC белгісін реттеу"</string>
     <string name="write_tag" msgid="8571858602896222537">"Жазу"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Жазу үшін белгіні түртіңіз…"</string>
@@ -2921,9 +2927,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Үнсіз"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Дабыл"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Дірілдеу"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Дыбыстарды қосу"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Ешқашан"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> дейін \"дабылдар ғана\" режиміне өзгерту"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Әрқашан тоқтатуға өзгерту"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Экран қосулы болғанда"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"\"Мазаламау\" режимі арқылы хабарландырулардың дыбысы шықпайтындай, экранда қалқымалы терезе шығатындай ету"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"\"Мазаламау\" режиміне орнатылған хабарландыруларға экранға шығып, күй жолағына белгіше шығаруға рұқсат ету"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Экран өшірулі болғанда"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"\"Мазаламау\" режимі арқылы хабарландырулардың дыбысы шықпайтындай, экран қосылып, шам жыпылықтайтындай ету"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"\"Мазаламау\" режимі арқылы хабарландырулардың дыбысы шықпайтындай, экран қосылатындай ету"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Осы құрылғыны MIDI ретінде пайдалану"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB пайдалану мақсаты"</string>
     <string name="usb_use_also" msgid="557340935190819370">"USB байланысын келесілер үшін де пайдалану:"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Әдепкі USB конфигурациясы"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Басқа құрылғымен байланыс орнатылып, телефоныңыздың құлпы ашық болса, осы параметрлер қолданылады. Тек сенімді құрылғылармен байланыс орнатқан жөн."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Осы құрылғыны зарядтауда"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Жалғанған құрылғыны зарядтау"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Орташа алғанда <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> ішінен <xliff:g id="USED_MEMORY">%1$s</xliff:g> жад пайдаланылған"</string>
     <string name="users_summary" msgid="1674864467098487328">"<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> әдепкі болып табылады"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"ҚОСУЛЫ"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"ӨШІРУЛІ"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Қосу"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Өшіру"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Сақтық көшірме жасау өшірілген"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> нұсқасына жаңартылды"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Жаңартылған нұсқа қолжетімді"</string>
@@ -3657,9 +3664,10 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"Әзірлеуші блоктарының жылдам параметрлері"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Терезе трассасы"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Бетті трассирлеу"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Жұмыс профилінің параметрлері"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Контакт іздеу"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Көлік жүргізуде Bluetooth пайдалану"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Көлік жүргізгенде Bluetooth функциясын автоматты түрде қосу"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 батарея параметрлеріне өту"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-km/arrays.xml b/res/values-km/arrays.xml
index 65a50a4..7c270b2 100644
--- a/res/values-km/arrays.xml
+++ b/res/values-km/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"១ ម៉ោង"</item>
     <item msgid="5198271470953124739">"កុំ​អស់​ពេល"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (លំនាំដើម)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"ខ្សោយ"</item>
     <item msgid="2042505933058940139">"ខ្សោយ​"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"ចាត់​ទុកថាមានការកំណត់"</item>
     <item msgid="2266114985518865625">"​ចាត់​ទុកថាមិនមាន​ការកំណត់ទេ"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"ស្វ័យ​ប្រវត្តិ (ផ្អែកលើពេលវេលា)"</item>
+    <item msgid="6620560879508595181">"បើក​ជានិច្ច"</item>
+    <item msgid="6385301106124765323">"បិទជានិច្ច"</item>
+  </string-array>
 </resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 64514aa..52a5e0b 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -482,8 +482,7 @@
     <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>
-    <!-- no translation found for lock_settings_picker_fingerprint_added_security_message (5008939545428518367) -->
-    <skip />
+    <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>
@@ -708,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ចងចាំ​ការ​កំណត់"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"ចំនួនអតិបរមា​នៃ​ឧបករណ៍​សំឡេង​ដែលភ្ជាប់​ប៊្លូធូស​"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"ជ្រើសរើស​ចំនួនអតិបរមា​នៃ​ឧបករណ៍​សំឡេង​ដែលភ្ជាប់​ប៊្លូធូស"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"បើក​របាយការណ៍អំពីការ​ពន្យារ​ពេល AVDTP របស់ប៊្លូធូស"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"អនុញ្ញាត​ឱ្យទទួល​របាយការណ៍​អំពីការ​ពន្យារ​ពេល AVDTP របស់ប៊្លូធូស"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"ភ្ជាប់"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"បើក​ការ​បង្ហាញ​ឥត​ខ្សែ"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"រក​មិន​ឃើញ​ឧបករណ៍​ដែល​នៅ​ជិត។"</string>
@@ -924,8 +925,7 @@
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"រៀបចំ​ហតស្ប៉តវ៉ាយហ្វាយ"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"ហតស្ប៉ត AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
-    <!-- no translation found for wifi_tether_disabled_by_airplane (414480185654767932) -->
-    <skip />
+    <string name="wifi_tether_disabled_by_airplane" msgid="414480185654767932">"មិន​អាច​ប្រើ​បាន​ទេ ដោយសារ​មុខងារ​ពេល​ជិះ​យន្តហោះ​បើក"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"ការហៅតាម Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="7766895085362824508">"ពង្រីក​ដែន​សេវា​នៃការ​ហៅ​តាម Wi‑Fi"</string>
     <string name="wifi_calling_suggestion_summary" msgid="6460250990899143406">"បើក​ការ​ហៅ​តាម Wi‑Fi"</string>
@@ -1443,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ទីតាំងសម្រាប់ប្រវត្តិរូបការងាររបស់អ្នក"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"ការ​អនុញ្ញាត​កម្រិត​កម្មវិធី"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"សំណើ​ទីតាំង​ថ្មី"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"បច្ចុប្បន្ន​គ្មាន​កម្មវិធី​បាន​ស្នើ​ទីតាំង"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"សេវាកម្ម​ទីតាំង"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"ប្រើ​ថ្ម​ច្រើន"</string>
@@ -1491,17 +1493,13 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"ព័ត៌មាន​សុវត្ថិភាព"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="142307697309858185">"អ្នក​មិន​មាន​ការ​ភ្ជាប់​ទិន្នន័យទេ។ ឥឡូវនេះ ដើម្បី​មើល​ព័ត៌មាន​នេះ​ សូមចូល​ទៅ %s ពី​កុំព្យូទ័រណា​មួយ​ដែល​បាន​ភ្ជាប់​អ៊ីនធឺណិត​។"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"កំពុង​ផ្ទុក..."</string>
-    <!-- no translation found for lockpassword_choose_your_screen_lock_header (2942199737559900752) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_password_message (5377842480961577542) -->
-    <skip />
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="2942199737559900752">"កំណត់ការចាក់សោអេក្រង់"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="5377842480961577542">"ដើម្បី​សុវត្ថិភាព សូម​កំណត់​ពាក្យសម្ងាត់"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ដើម្បី​ប្រើប្រាស់​ស្នាម​ម្រាមដៃ សូម​កំណត់​ពាក្យសម្ងាត់"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ដើម្បី​ប្រើស្នាម​ម្រាមដៃ សូម​កំណត់​លំនាំ"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_message (6658264750811929338) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_message" msgid="6658264750811929338">"ដើម្បី​សុវត្ថិភាព សូម​កំណត់​កូដ PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"ដើម្បី​ប្រើប្រាស់​ស្នាម​ម្រាមដៃ សូម​កំណត់​កូដ PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pattern_message (8631545254345759087) -->
-    <skip />
+    <string name="lockpassword_choose_your_pattern_message" msgid="8631545254345759087">"ដើម្បី​សុវត្ថិភាព សូម​កំណត់​លំនាំ"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"បញ្ចូល​ពាក្យ​សម្ងាត់​របស់​អ្នក​ម្តងទៀត"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"បញ្ជាក់​លំនាំដើម​របស់​អ្នក"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"បញ្ចូល​កូដ PIN របស់អ្នក​ម្តងទៀត"</string>
@@ -1886,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"ប្រើ​សេវាកម្ម"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"ប្រើ​ការ​កែតម្រូវពណ៌"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"ប្រើ​អក្សររត់"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"បើក"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"បិទ"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"បើក"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"បិទ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"បង្ហាញ​នៅ​ក្នុង​ការ​កំណត់​​រហ័ស"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"របៀប​កែ"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2319,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"មុនពេលដែលអ្នកអាចប្រើកន្លែងផ្ទុកព័ត៌មានសម្ងាត់ ឧបករណ៍របស់អ្នកត្រូវតែមានអេក្រង់ចាក់សោដែលមានសុវត្ថិភាព"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"កំណត់​ការ​ចាក់​សោ"</string>
     <string name="usage_access_title" msgid="332333405495457839">"កម្មវិធី​មាន​សិទ្ធិ​ប្រើប្រាស់"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"សំឡេង​ពេលអាសន្ន"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"កំណត់​ឥរិយាបថ​ពេល​ហៅ​ពេល​មាន​អាសន្ន"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"បម្រុង​ទុក"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"បម្រុងទុក &amp; ស្ដារ​ឡើងវិញ"</string>
@@ -2894,6 +2893,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"លេខស៊េរី កំណែផ្នែក​រឹង"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"កម្រិតផេឆសុវត្ថិភាព android, កំណែ​មូលដ្ឋាន, កំណែ​ខឺណែល"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"មុខងារ​អេក្រង់​សម្ងំ មុខងារ​អេក្រង់​ចាក់សោ"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"ស្នាមម្រាមដៃ"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"រៀបចំ​ស្លាក​អិនអេហ្វ​ស៊ី​វ៉ាយហ្វាយ"</string>
     <string name="write_tag" msgid="8571858602896222537">"សរសេរ"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ប៉ះ​ស្លាក​ដើម្បី​សរសេរ..."</string>
@@ -2927,9 +2927,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"ស្ងាត់"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"ជូន​ដំណឹង"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ញ័រ"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"បើកសំឡេង"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"កុំឱ្យសោះ"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3176,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"ប្តូរទៅម៉ោងរោទិ៍រហូតទាល់តែដល់ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> ប៉ុណ្ណោះ"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"ប្តូរទៅរំខានជានិច្ច"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"នៅ​ពេល​អេកេ្រង់​បើក"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"អនុញ្ញាតឱ្យការជូនដំណឹង​ដែល​បិទសំឡេងដោយ​មុខងារ​កុំរំខាន ​លោត​ឡើង​នៅលើអេក្រង់"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"អនុញ្ញាតឱ្យការជូនដំណឹង​ដែល​បិទសំឡេងដោយ​មុខងារ​កុំរំខាន ​លោត​ឡើង​នៅលើ​អេក្រង់ និងបង្ហាញ​រូបតំណាង​របារស្ថានភាព"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"នៅពេល​អេក្រង់​បិទ"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"អនុញ្ញាតឱ្យការជូនដំណឹង​ដែល​បិទសំឡេងដោយ​មុខងារ​កុំរំខាន​ បើ​ក​អេក្រង់ និង​បញ្ចេញ​ពន្លឺភ្លឹបភ្លែត"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"អនុញ្ញាតឱ្យការជូនដំណឹង​ដែល​បិទសំឡេងដោយ​មុខងារ​កុំរំខាន ​បើក​អេក្រង់"</string>
@@ -3364,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"ប្រើឧបករណ៍នេះជាមីឌី"</string>
     <string name="usb_use" msgid="3372728031108932425">"ប្រើ USB ដើម្បី"</string>
     <string name="usb_use_also" msgid="557340935190819370">"ក៏ប្រើប្រាស់​ USB ​សម្រាប់"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"ការកំណត់​រចនាសម្ព័ន្ធ USB លំនាំ​ដើម"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"ការកំណត់​ទាំងនេះ​នឹងអនុវត្ត នៅពេល​ដែល​ទូរសព្ទ​របស់អ្នក​ដោះសោ ហើយឧបករណ៍​ផ្សេងទៀត​ត្រូវបានភ្ជាប់​។ សូម​ភ្ជាប់​ជាមួយឧបករណ៍​ដែលទុកចិត្ត​តែប៉ុណ្ណោះ។"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"សាកថ្ម​ឧបករណ៍​នេះ"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"សាកថ្ម​ឧបករណ៍​ដែលបាន​ភ្ជាប់"</string>
@@ -3488,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"អង្គចងចាំត្រូវបានប្រើអស់ជាមធ្យម <xliff:g id="USED_MEMORY">%1$s</xliff:g> នៃ <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"ចូលជា <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> ជាកម្មវិធីលំនាំដើម"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"បើក"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"បិទ"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"បើក"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"បិទ"</string>
     <string name="backup_disabled" msgid="485189128759595412">"បានបិទដំណើរការការបម្រុងទុក"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"បានដំឡើង​ជំនាន់ទៅ Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"មាន​កំណែថ្មី"</string>
@@ -3663,9 +3664,10 @@
     <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">"មុខងារ​សាកល្បង​ UI ​ប្រព័ន្ធ"</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="window_trace_quick_settings_title" msgid="3839917000546526898">"ដាន​វិនដូ"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"ដាន​ផ្ទៃ"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope Trace"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"ការកំណត់ប្រវត្តិរូបការងារ"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"ការស្វែងរកទំនាក់ទំនង"</string>
@@ -3861,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"ប្រើ​ប៊្លូធូស​នៅ​ពេល​បើកបរ"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"​បើក​ប៊្លូធូស​ដោយ​ស្វ័យប្រវត្តិ នៅពេល​បើកបរ"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"មើល​ការកំណត់​ថ្ម​របស់ Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml
index ede6bee..44a5300 100644
--- a/res/values-kn/arrays.xml
+++ b/res/values-kn/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 ಗಂಟೆ"</item>
     <item msgid="5198271470953124739">"ಎಂದಿಗೂ ಅವಧಿ ಮೀರದಿರಲಿ"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (ಡಿಫಾಲ್ಟ್‌)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"ಕಳಪೆ"</item>
     <item msgid="2042505933058940139">"ಕಳಪೆ"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"ಮೀಟರ್ ಮಾಡಿದೆ ಎಂದು ಪರಿಗಣಿಸಿ"</item>
     <item msgid="2266114985518865625">"ಮೀಟರ್ ಮಾಡಲಾಗಿಲ್ಲ ಎಂದು ಪರಿಗಣಿಸಿ"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"ಸ್ವಯಂಚಾಲಿತ (ದಿನದ ಸಮಯದ ಆಧಾರದ ಮೇಲೆ)"</item>
+    <item msgid="6620560879508595181">"ಯಾವಾಗಲೂ ಆನ್"</item>
+    <item msgid="6385301106124765323">"ಯಾವಾಗಲೂ ಆಫ್"</item>
+  </string-array>
 </resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 1315347..49bdd58 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ನೆನಪಿನಲ್ಲಿಡು"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"ಗರಿಷ್ಠ ಸಂಪರ್ಕಿತ ಬ್ಲೂಟೂತ್ ಆಡಿಯೋ ಸಾಧನಗಳು"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"ಸಂಪರ್ಕಿತ ಬ್ಲೂಟೂತ್ ಆಡಿಯೋ ಸಾಧನಗಳ ಗರಿಷ್ಠ ಸಂಖ್ಯೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"ಬ್ಲೂಟೂತ್ AVDTP ವಿಳಂಬ ವರದಿಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"ಬ್ಲೂಟೂತ್ AVDTP ವಿಳಂಬ ವರದಿಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಅನುಮತಿಸಿ"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"ಬಿತ್ತರಿಸುವಿಕೆ"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"ವೈರ್‌ಲೆಸ್ ಪ್ರದರ್ಶನ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"ಯಾವುದೇ ಹತ್ತಿರದ ಸಾಧನಗಳು ಕಂಡುಬಂದಿಲ್ಲ."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್‌ನ ಸ್ಥಳ"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"ಅಪ್ಲಿಕೇಶನ್‌ ಹಂತದ ಅನುಮತಿಗಳು"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"ಇತ್ತೀಚಿನ ಸ್ಥಳ ವಿನಂತಿಗಳು"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"ಇತ್ತೀಚೆಗೆ ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್‌‌ಗಳು ಸ್ಥಳವನ್ನು ವಿನಂತಿಸಿಲ್ಲ"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"ಸ್ಥಳ ಸೇವೆಗಳು"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"ಹೆಚ್ಚು ಬ್ಯಾಟರಿಯ ಬಳಕೆ"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"ಸೇವೆಯನ್ನು ಬಳಸಿ"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"ಬಣ್ಣ ತಿದ್ದುಪಡಿಯನ್ನು ಬಳಸಿ"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"ಶೀರ್ಷಿಕೆಗಳನ್ನು ಬಳಸಿ"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ಆನ್"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ಆಫ್"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"ಆನ್ ಮಾಡಿ"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"ಆಫ್ ಮಾಡಿ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"ತ್ವರಿತ ಸೆಟ್ಟಿಂಗ್‌‌ಗಳಲ್ಲಿ ತೋರಿಸು"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"ತಿದ್ದುಪಡಿಯ ಮೋಡ್"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"ನೀವು ರುಜುವಾತು ಸಂಗ್ರಹಣೆಯನ್ನು ಬಳಸುವ ಮೊದಲು, ನಿಮ್ಮ ಸಾಧನವು ಸುರಕ್ಷಿತ ಲಾಕ್ ಸ್ಕ್ರೀನ್ ಅನ್ನು ಹೊಂದುವುದು ಅಗತ್ಯವಿದೆ"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ಲಾಕ್ ಸೆಟ್‌"</string>
     <string name="usage_access_title" msgid="332333405495457839">"ಬಳಕೆಯ ಪ್ರವೇಶದ ಆಪ್‌‌"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"ತುರ್ತು ಟೋನ್"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"ತುರ್ತು ಕರೆ ಮಾಡಿದಾಗ ಕಾರ್ಯ ರೀತಿಯನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"ಬ್ಯಾಕಪ್"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"ಬ್ಯಾಕಪ್ &amp; ಮರುಸ್ಥಾಪನೆ"</string>
@@ -2888,6 +2893,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"ಕ್ರಮ ಸಂಖ್ಯೆ, ಹಾರ್ಡ್‌ವೇರ್ ಆವೃತ್ತಿ"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android ಭದ್ರತೆ ಪ್ಯಾಚ್ ಮಟ್ಟ, ಬೇಸ್‌ಬ್ಯಾಂಡ್ ಆವೃತ್ತಿ, ಕೆರ್ನಲ್ ಆವೃತ್ತಿ"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"ಆಂಬಿಯೆಂಟ್ ಡಿಸ್‌ಪ್ಲೇ, ಲಾಕ್ ಸ್ಕ್ರೀನ್ ಡಿಸ್‌ಪ್ಲೇ"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"ಫಿಂಗರ್‌ ಪ್ರಿಂಟ್"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ವೈ-ಫೈ NFC ಟ್ಯಾಗ್‌ ಹೊಂದಿಸಿ"</string>
     <string name="write_tag" msgid="8571858602896222537">"ಬರೆಯಿರಿ"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ಬರೆಯಲು ಟ್ಯಾಗ್‌ ಅನ್ನು ಟ್ಯಾಪ್‌ ಮಾಡಿ..."</string>
@@ -2921,9 +2927,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"ಶಾಂತ"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"ಎಚ್ಚರಿಕೆ"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ವೈಬ್ರೇಟ್‌‌"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"ಧ್ವನಿಗಳನ್ನು ಪವರ್ ಆನ್ ಮಾಡಿ"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"ಎಂದೂ ಇಲ್ಲ"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> ವರೆಗೆ ಮಾತ್ರ ಅಲಾರಮ್‌ಗಳಲ್ಲಿ ಬದಲಾವಣೆ"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"ಯಾವಾಗಲೂ ಅಡಚಣೆಗೆ ಬದಲಾಯಿಸಿ"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"ಪರದೆಯು ಆನ್ ಆಗಿರುವಾಗ"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"ಪರದೆ ಮೇಲೆ ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಪಾಪ್ ಅಪ್ ಮೂಲಕ ಅಧಿಸೂಚನೆಗಳನ್ನು ನಿಶ್ಯಬ್ದವಾಗಿರಿಸಿಕೊಳ್ಳಿ"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"ಸ್ಕ್ರೀನ್ ಮೇಲೆ ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಪಾಪ್ ಅಪ್ ಮೂಲಕ ಅಧಿಸೂಚನೆಗಳನ್ನು ನಿಶ್ಯಬ್ಧವಾಗಿರಿಸಿಕೊಳ್ಳಿ ಮತ್ತು ಸ್ಥಿತಿ ಪಟ್ಟಿ ಐಕಾನ್ ಅನ್ನು ತೋರಿಸಿ"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"ಪರದೆಯು ಆಫ್ ಆಗಿರುವಾಗ"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"\'ಅಡಚಣೆ ಮಾಡಬೇಡಿ\' ಮೂಲಕ ಪರದೆ ಮತ್ತು ಮಿನುಗುವ ಬೆಳಕನ್ನು ಆನ್ ಮಾಡುವುದರಿಂದ ಅಧಿಸೂಚನೆಗಳನ್ನು ನಿಶ್ಯಬ್ದವಾಗಿರಿಸಿ"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಆನ್‌ ಮಾಡುವ ಮೂಲಕ ಪರದೆಯ ಮೇಲೆ ಅಧಿಸೂಚನೆಗಳನ್ನು ನಿಶ್ಯಬ್ದವಾಗಿರಿಸಿಕೊಳ್ಳಿ"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"ಈ ಸಾಧನವನ್ನು MIDI ಎಂದು ಬಳಸಿ"</string>
     <string name="usb_use" msgid="3372728031108932425">"ಇದಕ್ಕಾಗಿ USB ಬಳಸಿ"</string>
     <string name="usb_use_also" msgid="557340935190819370">"ಇದಕ್ಕಾಗಿ USB ಅನ್ನು ಬಳಸಿ"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"ಡಿಫಾಲ್ಟ್‌‌ USB ಕಾನ್ಫಿಗರೇಶನ್"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"ಮತ್ತೊಂದು ಸಾಧನವನ್ನು ಸಂಪರ್ಕಿಸಿದಾಗ ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಆಗಿರುವಾಗ, ಈ ಸೆಟ್ಟಿಂಗ್‍ಗಳನ್ನು ಅನ್ವಯಿಸಲಾಗುತ್ತದೆ. ವಿಶ್ವಾಸಾರ್ಹ ಸಾಧನಗಳನ್ನು ಮಾತ್ರ ಸಂಪರ್ಕಿಸಿ."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"ಈ ಸಾಧನವನ್ನು ಚಾರ್ಜ್ ಮಾಡುವುದು"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"ಸಂಪರ್ಕಗೊಂಡಿರುವ ಸಾಧನವನ್ನು ಚಾರ್ಜ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> ಯಲ್ಲಿ ಸರಾಸರಿ <xliff:g id="USED_MEMORY">%1$s</xliff:g> ಮೆಮೊರಿ ಬಳಸಲಾಗಿದೆ"</string>
     <string name="users_summary" msgid="1674864467098487328">"<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> ಡಿಫಾಲ್ಟ್‌ ಆಗಿದೆ"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"ಆನ್"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"ಆಫ್"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"ಆನ್ ಮಾಡಿ"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"ಆಫ್ ಮಾಡಿ"</string>
     <string name="backup_disabled" msgid="485189128759595412">"ಬ್ಯಾಕ್‌ಅಪ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> ಗೆ ಅಪ್‌ಡೇಟ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"ಅಪ್‌ಡೇಟ್‌‌ ಲಭ್ಯವಿದೆ"</string>
@@ -3657,9 +3664,10 @@
     <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">"ಸಿಸ್ಟಂ UI ಡೆಮೋ ಮೋಡ್"</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="window_trace_quick_settings_title" msgid="3839917000546526898">"ವಿಂಡೋ ಟ್ರೇಸ್"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"ಮೇಲ್ಮೈ ಟ್ರೇಸ್ ಮಾಡಿ"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"ವಿನ್ಸ್‌ಕೋಪ್‌ ಟ್ರೇಸ್"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"ಸಂಪರ್ಕ ಹುಡುಕಿ"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"ಚಾಲನೆ ಮಾಡುವಾಗ ಬ್ಲೂಟೂತ್‌ ಬಳಸಿ"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"ಚಾಲನೆ ಮಾಡುವಾಗ ಬ್ಲೂಟೂತ್ ಅನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಮಾಡಿ"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 ಬ್ಯಾಟರಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ನೋಡಿ"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 5b63d6b..99000fc 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1시간"</item>
     <item msgid="5198271470953124739">"제한 시간 없음"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1(기본값)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"나쁨"</item>
     <item msgid="2042505933058940139">"매우 약함"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"전송량 제한이 있는 Wi-Fi로 취급"</item>
     <item msgid="2266114985518865625">"전송량 제한이 없는 Wi-Fi로 취급"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"자동(시간 기준)"</item>
+    <item msgid="6620560879508595181">"항상 사용"</item>
+    <item msgid="6385301106124765323">"항상 사용 안함"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 94da39f..b9b7735 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"설정 기억"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"연결된 블루투스 오디오 기기의 최대 개수"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"연결된 블루투스 오디오 기기의 최대 개수 선택"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"블루투스 AVDTP 지연 보고서 사용"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"블루투스 AVDTP 지연 보고서 수신 허용"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"전송"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"무선 디스플레이 사용"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"근처에 기기가 없습니다."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"직장 프로필 위치"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"앱 수준 권한"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"최근 위치 요청"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"최근에 위치 정보를 요청한 앱이 없습니다."</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"위치 서비스"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"배터리 사용량 많음"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"서비스 사용"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"색상 보정 사용"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"캡션 사용"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"사용"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"사용 안함"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"사용"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"사용 안함"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"빠른 설정에 표시"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"보정 모드"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"자격증명 저장소를 사용하려면 기기에 보안 잠금 화면을 설정해야 합니다."</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"잠금 설정"</string>
     <string name="usage_access_title" msgid="332333405495457839">"사용 액세스 권한을 보유한 앱"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"긴급 신호음"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"긴급 통화 중 동작 설정"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"백업"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"백업 및 복원"</string>
@@ -2888,6 +2893,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"일련번호, 하드웨어 버전"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"Android 보안 패치 수준, 베이스밴드 버전, 커널 버전"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"절전 모드 자동 해제, 잠금 화면 표시"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"지문"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC 태그 설정"</string>
     <string name="write_tag" msgid="8571858602896222537">"쓰기"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"태그를 탭하여 작성하세요..."</string>
@@ -2921,9 +2927,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"무음"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"알림"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"진동"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"부팅 소리"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"사용 안함"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g>까지 알람만 수신 모드로 변경"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"항상 알림 모드로 변경"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"화면이 켜져 있을 때"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"알림 일시중지로 음소거된 알림이 화면에 표시되도록 허용"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"알림 일시중지로 음소거된 알림이 화면에 표시되고 상태 표시줄 아이콘에 나타나도록 허용"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"화면이 꺼져 있을 때"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"알림 일시중지로 음소거된 알림이 화면을 켜고 불빛을 깜박이도록 허용"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"알림 일시중지로 음소거된 알림이 화면을 켜도록 허용"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"이 기기를 MIDI로 사용"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB 사용"</string>
     <string name="usb_use_also" msgid="557340935190819370">"다음 항목에 USB 사용"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"기본 USB 설정"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"다른 기기가 연결되고 휴대전화가 잠금 해제되었을 때 이 설정이 적용됩니다. 신뢰할 수 있는 기기에만 연결하세요."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"기기 충전 중"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"연결된 기기 충전 중"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"평균 <xliff:g id="USED_MEMORY">%1$s</xliff:g>/<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> 저장용량 사용됨"</string>
     <string name="users_summary" msgid="1674864467098487328">"<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>은(는) 기본 앱입니다."</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"사용"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"사용 안함"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"사용"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"사용 안함"</string>
     <string name="backup_disabled" msgid="485189128759595412">"백업 사용 안함"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> 버전으로 업데이트됨"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"업데이트 가능"</string>
@@ -3657,9 +3664,10 @@
     <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">"시스템 UI 데모 모드"</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="window_trace_quick_settings_title" msgid="3839917000546526898">"창 추적"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"표면 추적"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"직장 프로필 설정"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"연락처 검색"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"운전 중 블루투스 사용"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"운전 중에 블루투스를 자동으로 사용 설정"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 배터리 설정 확인하기"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-ky/arrays.xml b/res/values-ky/arrays.xml
index 9f26b73..d3fb2ec 100644
--- a/res/values-ky/arrays.xml
+++ b/res/values-ky/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 саат"</item>
     <item msgid="5198271470953124739">"Токтотпоо"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (Демейки)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Начар"</item>
     <item msgid="2042505933058940139">"Начар"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Ченелет"</item>
     <item msgid="2266114985518865625">"Ченелбейт"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Автоматтык түрдө (күндүн убагына жараша)"</item>
+    <item msgid="6620560879508595181">"Ар дайым күйүк"</item>
+    <item msgid="6385301106124765323">"Ар дайым өчүк"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index dacab25..0077ac1 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -706,6 +706,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Жөндөөлөрдү эстеп калуу"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Туташып турган Bluetooth аудио түзмөктөрүнүн эң жогорку саны"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Туташып турган Bluetooth аудио түзмөктөрүнүн эң жогорку санын тандоо"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Bluetooth AVDTP кечигүүлөрү тууралуу кабарлоону иштетүү"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Bluetooth AVDTP кечигүүлөрү тууралуу кабарлоону кабыл алууга уруксат берүү"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Тышкы экранга чыгаруу"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Зымсыз дисплейди иштетүү"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Жакын жерден бир дагы түзмөк табылган жок."</string>
@@ -1440,6 +1442,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Жумуш профилинин жайгашкн жери"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Колдонмонун уруксаттары"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Жакында изделген жерлер"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Акыркы мезгилде жайгашууну сураган колдонмолор болгон жок"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Жайгашкан жерди аныктоо кызматы"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Батарейди көп колдонуу"</string>
@@ -1879,8 +1883,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Кызматты колдонуу"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Түсүн тууралоону колдонуу"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Коштомо жазууларды колдонуу"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"КҮЙҮК"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ӨЧҮК"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Күйүк"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Өчүк"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Ылдам тууралоолор абалында көргөзүү"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Тууралоо режими"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2316,7 +2320,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Эсептик дайындар сакталчу жерди колдонуудан мурда түзмөгүңүзгө коопсуз экран кулпусу коюлушу керек"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"КУЛПУ КОЮУ"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Пайдалануу уруксаты бар колдн."</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Шашылыш чалуунун сигналы"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"Шашылыш чалуу аткарылганда көрүлчү аракетти коюу"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Камдык көчүрмөнү сактоо"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Бэкаптоо жана калыбына келтирүү"</string>
@@ -2891,6 +2896,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"сериялык номер, аппараттык камсыздоонун версиясы"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android коопсуздугун жаңыртуу деңгээли, байланыш модулунун версиясы, өзөктүн версиясы"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Градиент дисплейи, экранды кулпулоо"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"манжа изи"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC тегин орнотуу"</string>
     <string name="write_tag" msgid="8571858602896222537">"Жазуу"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Жазуу үчүн тегди таптап коюңуз…"</string>
@@ -2924,9 +2930,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Үнсүз"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Айгай"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Дирилдөө"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Түзмөк күйгүзүлгөндөгү үндөр"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Эч качан"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3173,7 +3182,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> чейин \"Ойготкучтар гана\" режимин иштетүү"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Ар дайым үзгүлтүккө учуратуу режимине өзгөртүү"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Экран күйүп турганда"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"\"Тынчымды алба\" режиминде үнү өчүрүлгөн эскертмелер экранга калкып чыксын"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"\"Тынчымды алба\" режиминде үнү өчүрүлгөн эскертмелер экранга калкып чыгып, абал тилкесинде көрсөтүлсүн"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Экран өчүп турганда"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"\"Тынчымды алба\" режиминде үнү өчүрүлгөн эскертмелер алынганда экран же жарык индикатору күйсүн"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"\"Тынчымды алба\" режиминде үнү өчүрүлгөн эскертмелер алынганда экран күйсүн"</string>
@@ -3361,10 +3370,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Бул түзмөктү MIDI катары колдонуу"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB төмөнкү үчүн колдонулсун:"</string>
     <string name="usb_use_also" msgid="557340935190819370">"USB төмөнкү функцияларды да аткара алат:"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Демейки USB конфигурациясы"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Телефонуңуз башка түзмөккө туташып, кулпуланбай турганда, ушул жөндөөлөр колдонулат. Телефонуңузду ишенимдүү түзмөктөргө гана туташтырыңыз."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Бул түзмөктү кубаттоо"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Туташкан түзмөктү кубаттоо"</string>
@@ -3485,8 +3492,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Орто эсеп менен <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> ичинен <xliff:g id="USED_MEMORY">%1$s</xliff:g> эстутум колдонулууда"</string>
     <string name="users_summary" msgid="1674864467098487328">"<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> демейки колдонмо"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"КҮЙҮК"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"ӨЧҮК"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Күйүк"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Өчүк"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Камдык көчүрмө өчүрүлгөн"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> версиясына жаңыртылды"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Жаңы версия бар"</string>
@@ -3660,9 +3667,10 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"Иштеп чыгуучунун ыкчам жөндөөлөр такталары"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Терезеге көз салуу"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Калыпка көз салуу"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Жумуш профилинин жөндөөлөрү"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Байланыштарды издөө"</string>
@@ -3858,4 +3866,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Унаа айдаганда, Bluetooth колднлсун"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Унаа айдап баратканда, Bluetooth автоматтык түрдө күйгүзүлсүн"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 батареясынын жөндөөрөлүн көрүү"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-lo/arrays.xml b/res/values-lo/arrays.xml
index 72c6778..38bf1c7 100644
--- a/res/values-lo/arrays.xml
+++ b/res/values-lo/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 ຊົ່ວ​ໂມງ"</item>
     <item msgid="5198271470953124739">"ບໍ່ມີໝົດເວລາ"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (ຄ່າເລີ່ມຕົ້ນ)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"ອ່ອນ"</item>
     <item msgid="2042505933058940139">"ອ່ອນ"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"ໃຊ້ແບບວັດແທກປະລິມານ"</item>
     <item msgid="2266114985518865625">"ໃຊ້ແບບບໍ່ວັດແທກປະລິມານ"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"ອັດຕະໂນມັດ (ອ້າງອີງຈາກເວລາຂອງມື້)"</item>
+    <item msgid="6620560879508595181">"ເປີດຕະຫຼອດ"</item>
+    <item msgid="6385301106124765323">"ປິດຕະຫຼອດ"</item>
+  </string-array>
 </resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 4480d17..463b280 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -482,7 +482,7 @@
     <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="lock_settings_picker_fingerprint_added_security_message" msgid="5008939545428518367">"ເພື່ອຄວາມປອດໄພທີ່ເພີ່ມຂຶ້ນ, ໃຫ້ຕັ້ງໜ້າຈໍລັອກແບບສຳຮອງໄວ້."</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>
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ຈື່ການຕັ້ງຄ່າ"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"ອຸປະກອນສຽງ Bluetooth ທີ່ເຊື່ອມຕໍ່ສູງສຸດ"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"ເລືອກຈຳນວນອຸປະກອນສຽງ Bluetooth ທີ່ເຊື່ອມຕໍ່ສູງສຸດ"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"ເປີດນຳໃຊ້ການລາຍງານການຊັກຊ້າ Bluetooth AVDTP"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"ອະນຸຍາດການຮັບລາຍງານການຊັກຊ້າ Bluetooth AVDTP"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"ການສົ່ງສັນຍານ"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"ເປີດໃຊ້ງານການສະແດງພາບໄຮ້ສາຍ"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"ບໍ່ມີອຸປະກອນຢູ່ໃນບໍລິເວນໃກ້ຄຽງ."</string>
@@ -923,7 +925,7 @@
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"ການ​ຕັ້ງ​ຄ່າ Wi‑Fi ຮັອດ​ສະ​ປອດ"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"ຮັອດສະປອດ AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
-    <string name="wifi_tether_disabled_by_airplane" msgid="414480185654767932">"Unavailable because airplane mode is turned on"</string>
+    <string name="wifi_tether_disabled_by_airplane" msgid="414480185654767932">"ບໍ່ສາມາດໃຊ້ໄດ້ເນື່ອງຈາກເປີດໃຊ້ໂໝດຢູ່ໃນຍົນ"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"ການ​ໂທ Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="7766895085362824508">"ຂະຫຍາຍສັນຍານໂທລະສັບດ້ວຍ Wi‑Fi"</string>
     <string name="wifi_calling_suggestion_summary" msgid="6460250990899143406">"ເປີດໃຊ້ການໂທ Wi-Fi"</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ຈຸດ​ທີ່​ຕັ້ງ​ສຳ​ລັບ​ໂປ​ຣ​ໄຟ​ລ໌​ບ່ອນ​ເຮັດ​ວຽກ​"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"ສິດອະນຸຍາດລະດັບແອັບ"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"ການຮ້ອງຂໍຂໍ້ມູນສະຖານທີ່ຫຼ້າສຸດ"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"ຫຼ້າສຸດນີ້ບໍ່ມີແອັບຯໃດເອີ້ນໃຊ້ຂໍ້ມູນຕຳແໜ່ງ"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"ບໍລິການສະຖານທີ່"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"ໃຊ້ແບັດເຕີຣີ່ຫຼາຍ"</string>
@@ -1489,13 +1493,13 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"ຂໍ້ມູນດ້ານຄວາມປອດໄພ"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="142307697309858185">"ທ່ານບໍ່ໄດ້ເຊື່ອມຕໍ່ອິນເຕີເນັດ. ເພື່ອເບິ່ງຂໍ້ມູນນີ້ໃນຕອນນີ້, ກະລຸນາໄປທີ່ %s ຈາກຄອມພິວເຕີເຄື່ອງໃດກໍໄດ້ທີ່ເຊື່ອມຕໍ່ກັບອິນເຕີເນັດຢູ່."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ກຳລັງໂຫລດ..."</string>
-    <string name="lockpassword_choose_your_screen_lock_header" msgid="2942199737559900752">"ຕັ້ງການລັອກໜ້າຈໍ"</string>
-    <string name="lockpassword_choose_your_password_message" msgid="5377842480961577542">"For security, set password"</string>
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="2942199737559900752">"ຕັ້ງໜ້າຈໍລັອກ"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="5377842480961577542">"ເພື່ອຄວາມປອດໄພ, ໃຫ້ຕັ້ງລະຫັດຜ່ານໄວ້"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ເພື່ອໃຊ້ລາຍນິ້ວມື, ໃຫ້ຕັ້ງລະຫັດຜ່ານກ່ອນ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ເພື່ອໃຊ້ລາຍນິ້ວມື, ໃຫ້ຕັ້ງຮູບແບບປົດລັອກກ່ອນ"</string>
-    <string name="lockpassword_choose_your_pin_message" msgid="6658264750811929338">"For security, set PIN"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="6658264750811929338">"ເພື່ອຄວາມປອດໄພ, ໃຫ້ຕັ້ງລະຫັດ PIN ໄວ້"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"ເພື່ອໃຊ້ລາຍນິ້ວມື, ໃຫ້ຕັ້ງລະຫັດ PIN ກ່ອນ"</string>
-    <string name="lockpassword_choose_your_pattern_message" msgid="8631545254345759087">"For security, set pattern"</string>
+    <string name="lockpassword_choose_your_pattern_message" msgid="8631545254345759087">"ເພື່ອຄວາມປອດໄພ, ໃຫ້ຕັ້ງຮູບແບບປົດລັອກໄວ້"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"ໃສ່ລະຫັດຜ່ານຂອງທ່ານອີກຄັ້ງ"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"ຢືນຢັນຮູບແບບຂອງທ່ານ"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"ໃສ່ລະຫັດ PIN ຂອງທ່ານອີກຄັ້ງ"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"ໃຊ້ບໍລິການ"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"ໃຊ້ການແກ້ໄຂສີ"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"ໃຊ້ຄຳບັນຍາຍ"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ເປີດ"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ປິດ"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"ເປີດ"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"ປິດ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"ສະ​ແດງໃນການຕັ້ງຄ່າດ່ວນ"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"ໂໝດການແກ້ໄຂ"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"ກ່ອນທ່ານຈະໃຊ້ບ່ອນຈັດເກັບຂໍ້ມູນຮອງຮັບ, ອຸປະກອນຂອງທ່ານຕ້ອງມີໜ້າຈໍລັອກທີ່ປອດໄພກ່ອນ"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ຕັ້ງການລັອກ"</string>
     <string name="usage_access_title" msgid="332333405495457839">"ແອັບທີ່ມີສິດອະນຸຍາດເຂົ້າເຖິງ"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"ໂທນສຽງສຸກເສີນ"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"ຕັ້ງຄ່າການເຮັດວຽກເມື່ອມີການໂທຫາໝາຍເລກສຸກເສີນ"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"ສຳຮອງຂໍ້ມູນ"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"ສຳຮອງຂໍ້ມູນ &amp; ດຶງຂໍ້ມູນຄືນ"</string>
@@ -2888,6 +2893,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"ໝາຍເລກຊີຣຽວ, ເວີຊັນຮາດແວ"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android security patch level, ເວີຊັນ baseband, ເວີຊັນ kernel"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"ການສະແດງຜົນຕາມແສງສະພາບແວດລ້ອມ, ໜ້າຈໍລັອກ"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"ລາຍນີ້ວມື"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ຕັ້ງ​ຄ່າ​ແທັກ Wi-Fi NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"ຂຽນ"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"​ແ​ຕະ​ທີ່​ແທັກ​ເພື່ອ​ຂຽນ..."</string>
@@ -2921,9 +2927,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"ປິດສຽງ"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"​ແຈ້ງ​ເຕ​ືອນ"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ສັ່ນເຕືອນ"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"ສຽງຕອນເປີດເຄື່ອງ"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"ບໍ່ໃຊ້"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"ປ່ຽນ​ເປັນ​ໂມງ​ປຸກ​ເທົ່າ​ນັ້ນຈົນ​ຮອດ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"ປ່ຽນ​ເປັນ​ຂັດ​ຈັງ​ຫວະ​ທຸກ​ຄັ້ງ"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"ເມື່ອເປີດໜ້າຈໍ"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"ປ່ອຍໃຫ້ການແຈ້ງເຕືອນທີ່ຖືກປິດໄວ້ໂດຍໂໝດຫ້າມລົບກວນສາມາດສະແດງຢູ່ໜ້າຈໍໄດ້"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"ໃຫ້ໂໝດຫ້າມລົບກວນປິດສຽງການແຈ້ງເຕືອນຢູ່ໜ້າຈໍ ແລະ ສະແດງໄອຄອນແຖບສະຖານະໄດ້"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"ເມື່ອໜ້າຈໍປິດ"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"ປ່ອຍໃຫ້ການແຈ້ງເຕືອນທີ່ຖືກປິດໄວ້ໂດຍໂໝດຫ້າມລົບກວນສາມາດເປີດໜ້າຈໍ ແລະ ກະພິບໄຟໄດ້"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"ປ່ອຍໃຫ້ການແຈ້ງເຕືອນທີ່ຖືກປິດໄວ້ໂດຍໂໝດຫ້າມລົບກວນສາມາດເປີດໜ້າຈໍໄດ້"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"ໃຊ້ອຸປະກອນນີ້ເປັນ MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"ໃຊ້ USB ສຳ​ລັບ"</string>
     <string name="usb_use_also" msgid="557340935190819370">"ໃຊ້ USB ສຳລັບ"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Default USB Configuration"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"When another device is connected and your phone is unlocked, these settings will be applied. Only connect to trusted devices."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"ກຳລັງສາກໄຟອຸປະກອນນີ້"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"ການສາກໄຟອຸປະກອນທີ່ເຊື່ອມຕໍ່"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"ໂດຍສະເລ່ຍ ໃຊ້ຄວາມຈຳໄປແລ້ວ <xliff:g id="USED_MEMORY">%1$s</xliff:g> ຈາກທັງໝົດ <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"ເຂົ້າສູ່ລະບົບເປັນ <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> ແມ່ນຄ່າເລີ່ມຕົ້ນ"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"ເປີດ"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"ປິດ"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"ເປີດ"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"ປິດ"</string>
     <string name="backup_disabled" msgid="485189128759595412">"ການສຳຮອງຂໍ້ມູນຖືກປິດໃຊ້ແລ້ວ"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"ອັບເດດເປັນ Android <xliff:g id="VERSION">%1$s</xliff:g> ແລ້ວ"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"ມີອັບເດດໃໝ່"</string>
@@ -3657,9 +3664,10 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"Quick settings developer tiles"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Window Trace"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"ຕິດຕາມພື້ນຜິວ"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"ການຕັ້ງຄ່າໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"ຊອກຫາລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"ໃຊ້ Bluetooth ໃນເວລາຂັບລົດ"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"ເປີດໃຊ້ Bluetooth ໂດຍອັດຕະໂນມັດໃນເວລາຂັບລົດ"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"ເບິ່ງການຕັ້ງຄ່າແບັດເຕີຣີ Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 091efc6..22fcec9 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 val."</item>
     <item msgid="5198271470953124739">"Nėra skirtojo laiko pabaigos"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (numatytoji parinktis)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Prastas"</item>
     <item msgid="2042505933058940139">"Prastas"</item>
@@ -422,7 +414,7 @@
     <item msgid="8342334626783983353">"100 %"</item>
   </string-array>
   <string-array name="captioning_preset_selector_titles">
-    <item msgid="7009918361545506251">"Naudoti progr. numatytuosius nust."</item>
+    <item msgid="7009918361545506251">"Naudoti programos numatytuosius nustatymus"</item>
     <item msgid="1770533843436933500">"Baltas ant juodo"</item>
     <item msgid="758587126802411846">"Juodas ant balto"</item>
     <item msgid="1495307195241623402">"Geltonas ant juodo"</item>
@@ -497,7 +489,9 @@
     <item msgid="8745603368609022803">"Laikyti matuojamu"</item>
     <item msgid="2266114985518865625">"Laikyti nematuojamu"</item>
   </string-array>
-    <!-- no translation found for dark_ui_mode_entries:0 (146804192658443142) -->
-    <!-- no translation found for dark_ui_mode_entries:1 (6620560879508595181) -->
-    <!-- no translation found for dark_ui_mode_entries:2 (6385301106124765323) -->
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automatinis (pagal dienos laiką)"</item>
+    <item msgid="6620560879508595181">"Visada įjungtas"</item>
+    <item msgid="6385301106124765323">"Visada išjungtas"</item>
+  </string-array>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 6b16d7e..9320d7d 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -729,10 +729,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Atsiminti nustatymus"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maksimalus prijungtų „Bluetooth“ garso įrenginių skaičius"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Pasirinkite maksimalų prijungtų „Bluetooth“ garso įrenginių skaičių"</string>
-    <!-- no translation found for bluetooth_enable_avdtp_delay_reports (5101903170688399944) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_avdtp_delay_reports_summary (7052797876020616399) -->
-    <skip />
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Įgalinti „Bluetooth“ AVDTP delsos ataskaitas"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Leisti gauti „Bluetooth“ AVDTP delsos ataskaitas"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Perdavimas"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Įgalinti belaidį rodymą"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nerasta netoliese esančių įrenginių."</string>
@@ -1471,6 +1469,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Darbo profilio vieta"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Programos lygio leidimai"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Pastarosios vietovės užklausos"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Nė viena programa pastaruoju metu nepateikė užklausų dėl vietovės"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Vietovės nustatymo paslaugos"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Naudoja daug akum. energijos"</string>
@@ -1912,10 +1912,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Naudoti paslaugą"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Naudoti spalvų taisymą"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Naudoti subtitrus"</string>
-    <!-- no translation found for accessibility_summary_state_enabled (7914278500885887763) -->
-    <skip />
-    <!-- no translation found for accessibility_summary_state_disabled (2984230257590246745) -->
-    <skip />
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Įjungta"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Išjungta"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Rodyti sparčiuosiuose nustatymuose"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Koregavimo režimas"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2371,7 +2369,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Kad galėtumėte naudoti prisijungimo duomenų atmintinę, įrenginyje turi būti nustatytas saugus užrakinimo ekranas"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"NUSTATYTI UŽRAKTĄ"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Progr., gal. pasiekti duom."</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Pagalbos tonas"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Kurti atsarginę kopiją ir atkurti"</string>
@@ -2956,8 +2955,7 @@
     <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>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Aplinkos ekranas, užrakinimo ekranas"</string>
-    <!-- no translation found for keywords_fingerprint_settings (239222512315619538) -->
-    <skip />
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"kontrolinis kodas"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nustatyti „Wi-Fi“ ALR žymą"</string>
     <string name="write_tag" msgid="8571858602896222537">"Rašyti"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Palieskite žymą, kad galėtumėte rašyti..."</string>
@@ -2991,9 +2989,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Prie doko prij. garsiak. gars."</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Visi garso įrašai"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Tik medijų garso įrašai"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Tylus"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Įspėjimas"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibravimas"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Įjungti garsus"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Niekada"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3256,8 +3257,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Pakeisti tik į signalus iki <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Pakeisti į pertraukimo nustatymą visam laikui"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Kai ekranas įjungtas"</string>
-    <!-- no translation found for zen_mode_screen_on_summary (2208664848367443505) -->
-    <skip />
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Leisti, kad gavus pran., nutildytų naudojant rež. „Netrukdyti“, jie būtų pateikiami ekrane ir būtų rodoma būsenos juostos piktogr."</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Kai ekranas išjungtas"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Leisti, kad gavus pranešimų, nutildytų naudojant režimą „Netrukdyti“, būtų įjungiamas ekranas ir mirksėtų lemputė"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Leisti, kad gavus pranešimų, nutildytų naudojant režimą „Netrukdyti“, būtų įjungiamas ekranas"</string>
@@ -3583,10 +3583,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Vid. naudojama atminties: <xliff:g id="USED_MEMORY">%1$s</xliff:g> iš <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"Prisijungta kaip <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="payment_summary" msgid="3472482669588561110">"Programa „<xliff:g id="APP_NAME">%1$s</xliff:g>“ yra numatytoji"</string>
-    <!-- no translation found for location_on_summary (3637699010986988970) -->
-    <skip />
-    <!-- no translation found for location_off_summary (7217264690673949107) -->
-    <skip />
+    <string name="location_on_summary" msgid="3637699010986988970">"Įjungta"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Išjungta"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Atsarginės kopijos kūrimas išjungtas"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Atnaujinta į <xliff:g id="VERSION">%1$s</xliff:g> versijos „Android“"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Pasiekiamas naujinys"</string>
@@ -3770,13 +3768,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Prisijungta prie „<xliff:g id="ID_1">%1$s</xliff:g>“"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Prisijungta prie kelių įrenginių"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Sistemos NS demonstracinis režimas"</string>
-    <!-- no translation found for dark_ui_mode (2112241426441807273) -->
-    <skip />
-    <!-- no translation found for dark_ui_mode_title (975299966259850992) -->
-    <skip />
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Naktinis režimas"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Nustatyti naktinį režimą"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Sparčiųjų nustatymų kūrėjo išklotinės elementai"</string>
-    <!-- no translation found for winscope_trace_quick_settings_title (1294290008255732032) -->
-    <skip />
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"„Winscope“ pėdsakas"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Darbo profilio nustatymai"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontaktų paieška"</string>
@@ -3992,4 +3987,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Naudoti „Bluetooth“ vairuojant"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Automatiškai įjungti „Bluetooth“ vairuojant"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Žr. 8.0 vers. „Android“ akumuliatoriaus nustatymus"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 852c445..0a87fd4 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 stunda"</item>
     <item msgid="5198271470953124739">"Nekad ar noildzi"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (noklusējums)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Vājš"</item>
     <item msgid="2042505933058940139">"Vājš"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Maksas"</item>
     <item msgid="2266114985518865625">"Bezmaksas"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automātiski (atkarībā no diennakts laika)"</item>
+    <item msgid="6620560879508595181">"Vienmēr ieslēgts"</item>
+    <item msgid="6385301106124765323">"Vienmēr izslēgts"</item>
+  </string-array>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 640d521..da323a3 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -718,6 +718,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Iegaumēt iestatījumus"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Pievienoto Bluetooth audioierīču maksimālais skaits"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Pievienoto Bluetooth audioierīču maksimālā skaita atlase"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Iespējot Bluetooth AVDTP aizkaves ziņojumus"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Atļaut saņemt Bluetooth AVDTP aizkaves ziņojumus"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Apraide"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Bezvadu attēlošanas iespējošana"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Tuvumā nav atrasta neviena ierīce."</string>
@@ -1454,6 +1456,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Darba profila atrašanās vieta"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Lietotnes līmeņa atļaujas"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Neseni vietu pieprasījumi"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Pēdējā laikā nevienā lietotnē nav pieprasīta atrašanās vietas informācija."</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Atrašanās vietu pakalpojumi"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Augsts akumulatora patēriņš"</string>
@@ -1894,8 +1898,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Izmantot pakalpojumu"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Izmantot krāsu korekciju"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Izmantot parakstus"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"IESLĒGTS"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"IZSLĒGTS"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Ieslēgts"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Izslēgts"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Rādīt ātrajos iestatījumos"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Korekcijas režīms"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2339,7 +2343,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Lai varētu izmantot akreditācijas datu atmiņu, vispirms ierīcei jāiestata droša ekrāna bloķēšana."</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"IESTATĪT BLOĶĒŠANU"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Piekļuve lietojuma datiem"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Ārkārtas signāls"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Dublēšana un atjaunošana"</string>
@@ -2919,6 +2924,7 @@
     <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>
     <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>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Iestatīt Wi-Fi NFC atzīmi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Rakstīt"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Pieskarieties atzīmei, lai rakstītu."</string>
@@ -2952,9 +2958,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Dokoto skaļruņu skaņa"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Visas skaņas"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Tikai multivides audio"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Klusums"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Brīdinājums"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrozvans"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Ieslēgšanas skaņas"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Nekad"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3209,7 +3218,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Pāriet uz režīmu “Tikai signāli” līdz plkst. <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Pāriet uz “Vienmēr pārtraukt”"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Kad ekrāns ir ieslēgts"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Atļaut ekrānā rādīt paziņojumus, kas izslēgti, izmantojot režīmu “Netraucēt”"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Atļaut ekrānā rādīt paziņojumus, kas izslēgti, izmantojot režīmu “Netraucēt”, un rādīt ikonu statusa joslā"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Kad ekrāns ir izslēgts"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Atļaut ekrāna ieslēgšanu vai gaismas mirgošanu paziņojumiem, kas izslēgti, izmantojot režīmu “Netraucēt”"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Atļaut ekrāna ieslēgšanu paziņojumiem, kas izslēgti, izmantojot režīmu “Netraucēt”"</string>
@@ -3403,10 +3412,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Izmantot šo ierīci MIDI režīmā"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB savienojuma lietošana"</string>
     <string name="usb_use_also" msgid="557340935190819370">"USB savienojuma izmantošanas iespējas"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Noklusējuma USB konfigurācija"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Šie iestatījumi tiks piemēroti, kad būs pievienota cita ierīce un jūsu tālrunis būs atbloķēts. Izveidojiet savienojumu tikai ar uzticamām ierīcēm."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Šīs ierīces uzlāde"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Pievienotās ierīces uzlāde"</string>
@@ -3529,8 +3536,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Izmantotais atmiņas apjoms: vidēji <xliff:g id="USED_MEMORY">%1$s</xliff:g> no <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"Pierakstījies kā: <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> ir noklusējuma lietotne."</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"IESLĒGTA"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"IZSLĒGTS"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Ieslēgta"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Izslēgta"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Dublēšana atspējota"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Atjaunināta uz Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Ir pieejams atjauninājums"</string>
@@ -3709,9 +3716,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Izveidots savienojums ar ierīci <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Izveidots savienojums ar vairākām ierīcēm"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Sistēmas lietotāja saskarnes demonstrācijas režīms"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Nakts režīms"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Iestatīt nakts režīmu"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Izstrādātāja ātro iestatījumu elementi"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Loga izsekošana"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Virsmas izsekošana"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope izsekošana"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Darba profila iestatījumi"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontaktpersonu meklēšana"</string>
@@ -3917,4 +3925,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Izmantot Bluetooth braukšanas laikā"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Automātiska Bluetooth ieslēgšana, vadot transportlīdzekli"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 akumulatora iestatījumu skatīšana"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-mk/arrays.xml b/res/values-mk/arrays.xml
index de774f7..8c28f87 100644
--- a/res/values-mk/arrays.xml
+++ b/res/values-mk/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 час"</item>
     <item msgid="5198271470953124739">"Времето никогаш да не истече"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (Стандардно)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Слаба"</item>
     <item msgid="2042505933058940139">"Слаб"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Сметај како ограничена мрежа"</item>
     <item msgid="2266114985518865625">"Сметај како неограничена мрежа"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Автоматски (врз основа на периодот од денот)"</item>
+    <item msgid="6620560879508595181">"Секогаш вклучен"</item>
+    <item msgid="6385301106124765323">"Секогаш исклучен"</item>
+  </string-array>
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index d7c0cf3..c51f843 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запомни поставки"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Максимален број аудиоуреди поврзани преку Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Изберете го максималниот број аудиоуреди поврзани преку Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Овозможување Bluetooth да прима извештаи за доцнење од AVDTP"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Дозволете Bluetooth да прима извештаи за доцнење од AVDTP"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Емитувај"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Овозможи приказ на безжични мрежи"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Не се пронајдени уреди во близина."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Локација за работен профил"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Дозволи на ниво на апликација"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Последни барања за локација"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Нема апликации што скоро побарале локација"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Услуги за локација"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Голема употреба на батеријата"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Користи ја услугата"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Користи корекција на боите"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Користи титлови"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ВКЛУЧЕНО"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ИСКЛУЧЕНО"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Вклучен"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Исклучен"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Прикажи во „Брзи поставки“"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Режим на корекција"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Пред да може да користите складирање акредитиви, уредот треба да има безбеден заклучен екран"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ПОСТАВИ ЗАКЛУЧУВАЊЕ"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Апликации со пристап до корис."</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Тон за итен повик"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"Постави однесување кога се прави итен повик"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Бекап"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Бекап и обнова"</string>
@@ -2888,6 +2893,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"сериски број, верзија на хардвер"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"ниво на безбедносна лепенка на Android, верзија на радиомодул, верзија на кернел"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Амбиентален екран, Екран за заклучување на екранот"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"отпечаток"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Поставете Wi-Fi ознака за NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"Пишувај"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Допрете ознака да пишувате…"</string>
@@ -2921,9 +2927,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"На тивко"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Предупредување"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вибрации"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Вклучете ги звуците"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Никогаш"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Промена на аларми само до <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Промени секогаш да се прекине"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Кога екранот е вклучен"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Дозволи известувањата стишени од „Не вознемирувај“ да се прикажат на екранот"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Дозволи известувањата стишени од „Не вознемирувај“ да се појават на екранот и прикажи икона во статусната лента"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Кога екранот е исклучен"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Дозволи известувањата стишени од „Не вознемирувај“ да го вклучат екранот, а сијаличката да трепка"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Дозволи известувањата стишени од „Не вознемирувај“ да го вклучат екранот"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Користете го уредов како MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Користи USB за"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Користење на USB и за"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Стандардна конфигурација за USB"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Поставкиве ќе се применуваат кога друг уред е поврзан, а телефонот е отклучен. Поврзувајте се само со доверливи уреди."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Полнење на уредот"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Се полни поврзаниот уред"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Искористени се просечно <xliff:g id="USED_MEMORY">%1$s</xliff:g> од <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> меморија"</string>
     <string name="users_summary" msgid="1674864467098487328">"Најавени сте како <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> е стандардна"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"ВКЛУЧЕНО"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"ИСКЛУЧЕНО"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Вклучена"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Исклучена"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Бекапот е оневозможен"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Ажурирано на Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Достапно е ажурирање"</string>
@@ -3657,9 +3664,10 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"Плочки на програмерот за брзи поставки"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Трага од прозорец"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Површинска трага"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Поставки на работен профил"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Пребарување контакти"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Користење Bluetooth при возење"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Вклучување Bluetooth автоматски при возење"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Приказ на поставките за батерија на Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml
index a336127..b03faed 100644
--- a/res/values-ml/arrays.xml
+++ b/res/values-ml/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"ഒരു മണിക്കൂർ"</item>
     <item msgid="5198271470953124739">"ഒരിക്കലും കാലഹരണപ്പെടരുത്"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (ഡിഫോൾട്ട്)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"മോശം"</item>
     <item msgid="2042505933058940139">"മോശം"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"മീറ്റർ-മാപകമായി കണക്കാക്കുക"</item>
     <item msgid="2266114985518865625">"മീറ്റർ മാപകമല്ലാത്തതായി കണക്കാക്കുക"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"സ്വമേധയാ (ദിവസത്തിലെ സമയത്തിന്റെ അടിസ്ഥാനത്തിൽ)"</item>
+    <item msgid="6620560879508595181">"എപ്പോഴും ഓണാക്കുക"</item>
+    <item msgid="6385301106124765323">"എപ്പോഴും ഓഫാക്കുക"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index a580443..2f83678 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ക്രമീകരണങ്ങൾ ഓർമ്മിക്കുക"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"കണക്റ്റ് ചെയ്‌ത പരമാവധി Bluetooth ഓഡിയോ ഉപകരണങ്ങൾ"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"കണക്റ്റ് ചെയ്‌ത പരമാവധി Bluetooth ഓഡിയോ ഉപകരണങ്ങളുടെ എണ്ണം തിരഞ്ഞെടുക്കുക"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Bluetooth AVDTP വൈകൽ റിപ്പോർട്ടുകൾ പ്രവർത്തനക്ഷമമാക്കുക"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Bluetooth AVDTP വൈകൽ റിപ്പോർട്ടുകൾ സ്വീകരിക്കാൻ അനുവദിക്കുക"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"കാസ്‌റ്റുചെയ്യുക"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"വയർലസ്‌ഡിസ്പ്ലേ സജീവമാക്കൂ"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"സമീപത്തുള്ള ഉപകരണങ്ങളൊന്നും കണ്ടെത്തിയില്ല."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ഔദ്യോഗിക പ്രൊഫൈലിനായുള്ള ലൊക്കേഷൻ"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"ആപ്പ്-തല അനുമതികൾ"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"പുതിയ ലൊക്കേഷൻ അഭ്യർത്ഥനകൾ"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"അപ്ലിക്കേഷനുകളൊന്നും അടുത്തിടെ ലൊക്കേഷൻ അഭ്യർത്ഥിച്ചില്ല"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"ലൊക്കേഷൻ സേവനങ്ങൾ"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"ഉയർന്ന ബാറ്ററി ഉപയോഗം"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"സേവനം ഉപയോഗിക്കുക"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"നിറം ക്രമീകരിക്കൽ ഉപയോഗിക്കുക"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"അടിക്കുറിപ്പുകൾ ഉപയോഗിക്കുക"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ഓൺ"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ഓഫ്"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"ഓണാണ്"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"ഓഫാണ്"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"ദ്രുത്ര ക്രമീകരണങ്ങളിൽ ദൃശ്യമാക്കുക"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"തിരുത്തൽ മോഡ്"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"ക്രെഡൻഷ്യൽ സ്‌റ്റോറേജ് ഉപയോഗിക്കുന്നതിന് മുമ്പ്, നിങ്ങളുടെ ഉപകരണത്തിന് സുരക്ഷിത ലോക്ക് സ്‌ക്രീൻ ഉണ്ടായിരിക്കണം."</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ലോക്ക് സജ്ജീകരിക്കുക"</string>
     <string name="usage_access_title" msgid="332333405495457839">"ഉപയോഗഅക്‌സസ്സുള്ള ആപ്സ്"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"അടിയന്തര ടോൺ"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"ഒരു അടിയന്തര കോൾ ലഭിക്കുന്ന സമയത്തെ പ്രവർത്തരീതി സജ്ജീകരിക്കുക"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"ബാക്കപ്പുചെയ്യുക"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"ബാക്കപ്പുചെയ്യലും പുനഃസ്ഥാപിക്കലും"</string>
@@ -2888,6 +2893,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"സീരിയൽ നമ്പർ, ഹാർഡ്‌വെയർ പതിപ്പ്"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android സുരക്ഷാ പാച്ച് നില, ബേസ്‌ബാൻഡ് പതിപ്പ്, കെർണൽ പതിപ്പ്"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"ആമ്പിയന്റ് ഡിസ്‌പ്ലേ, ലോക്ക് സ്‌ക്രീൻ ഡിസ്‌പ്ലേ"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"ഫിംഗർപ്രിന്റ്"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"വൈഫൈ NFC ടാഗ് സജ്ജമാക്കുക"</string>
     <string name="write_tag" msgid="8571858602896222537">"റൈറ്റുചെയ്യുക"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"റൈറ്റുചെയ്യാൻ ഒരു ടാഗ് ടാപ്പുചെയ്യുക..."</string>
@@ -2921,9 +2927,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"നിശബ്‌ദം"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"അലേർട്ട്"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"വൈബ്രേറ്റുചെയ്യുക"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"ശബ്ദങ്ങൾ ഓണാക്കുക"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"ഒരിക്കലും ഇല്ല"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> വരെ മാത്രം അലാറങ്ങളിലേക്ക് മാറ്റുക"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"\'എല്ലായ്‌പ്പോഴും തടസ്സപ്പെടുത്തുക\' എന്നതിലേക്ക് മാറ്റുക"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"സ്‌ക്രീൻ ഓണാകുമ്പോൾ"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"\'ശല്യപ്പെടുത്തരുത്\' വഴി നിശബ്‌ദമാക്കിയ അറിയിപ്പുകളെ സ്‌ക്രീൻ പോപ്പ് ചെയ്യാൻ അനുവദിക്കുക"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"\'ശല്യപ്പെടുത്തരുത്\' വഴി നിശബ്‌ദമാക്കിയ അറിയിപ്പുകളെ സ്‌ക്രീൻ പോപ്പ് ചെയ്യാൻ അനുവദിക്കുക ഒപ്പം ഒരു സ്‌റ്റാറ്റസ് ബാർ ഐക്കണും കാണിക്കുക"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"സ്‌ക്രീൻ ഓഫാകുമ്പോൾ"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"\'ശല്യപ്പെടുത്തരുത്\' വഴി നിശബ്‌ദമാക്കിയ അറിയിപ്പുകളെ സ്‌ക്രീൻ ഓണാക്കാനും ലൈറ്റ് മിന്നിക്കാനും അനുവദിക്കുക"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"\'ശല്യപ്പെടുത്തരുത്\' വഴി നിശബ്‌ദമാക്കിയ അറിയിപ്പുകളെ സ്‌ക്രീൻ ഓണാക്കാൻ അനുവദിക്കുക"</string>
@@ -3482,8 +3491,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"ശരാശരി <xliff:g id="USED_MEMORY">%1$s</xliff:g> / <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> മെമ്മറി ഉപയോഗിച്ചു"</string>
     <string name="users_summary" msgid="1674864467098487328">"<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> ഡിഫോൾട്ട് ആണ്"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"ഓൺ"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"ഓഫ്"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"ഓണാക്കുക"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"ഓഫാക്കുക"</string>
     <string name="backup_disabled" msgid="485189128759595412">"ബാക്കപ്പ് പ്രവർത്തനരഹിതമാക്കി"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g>-ലേക്ക് അപ്‌ഡേറ്റ് ചെയ്തു"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"അപ്‌ഡേറ്റ് ലഭ്യമാണ്"</string>
@@ -3657,9 +3666,10 @@
     <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">"സിസ്റ്റം UI ഡെമോ മോഡ്"</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="window_trace_quick_settings_title" msgid="3839917000546526898">"വിൻഡോ ട്രെയ്‌സ്"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"ഉപരിതല ട്രെയ്‌സ്"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"വിൻസ്‌കോപ്പ് അടയാളം"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"ഔദ്യോഗിക പ്രൊഫൈൽ ക്രമീകരണം"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"കോൺടാക്റ്റ് തിരയൽ"</string>
@@ -3855,4 +3865,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"ഡ്രൈവ് ചെയ്യുമ്പോൾ Bluetooth ഉപയോഗിക്കുക"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"ഡ്രൈവ് ചെയ്യുമ്പോൾ സ്വമേധയാ Bluetooth ഓണാക്കുക"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 ബാറ്ററി ക്രമീകരണം കാണുക"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-mn/arrays.xml b/res/values-mn/arrays.xml
index 93e2acf..690143a 100644
--- a/res/values-mn/arrays.xml
+++ b/res/values-mn/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 цаг"</item>
     <item msgid="5198271470953124739">"Хэзээ ч завсарлахгүй"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (Өгөгдмөл)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Муу"</item>
     <item msgid="2042505933058940139">"Муу"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Хязгаартайгаар тохируулах"</item>
     <item msgid="2266114985518865625">"Хязгааргүйгээр тохируулах"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Автомат (өдрийн цагт тулгуурласан)"</item>
+    <item msgid="6620560879508595181">"Байнга асаалттай"</item>
+    <item msgid="6385301106124765323">"Байнга унтраалттай"</item>
+  </string-array>
 </resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 4d647d3..9d62e01 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Тохиргоог сануулах"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Холбогдсон Bluetooth аудио төхөөрөмжийн дээд тоо"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Холбогдсон Bluetooth аудио төхөөрөмжийн дээд тоог сонгох"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Bluetooth AVDTP-н саатсан мэдэгдлийг идэвхжүүлэх"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Bluetooth AVDTP-н саатсан мэдэгдэл хүлээж авахыг зөвшөөрөх"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Дамжуулах"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Утасгүй дэлгэцийг идэвхжүүлэх"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Ойролцоо төхөөрөмж олдсонгүй."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Ажлын профайлын байршил"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Аппын төвшний зөвшөөрөл"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Саяхны байршлын хүсэлтүүд"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Саяхан байршлын мэдээлэл хүссэн апп байхгүй"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Байршлын үйлчилгээ"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Батерейны зарцуулалт өндөр"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Үйлчилгээг ашиглах"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Өнгө тохируулагчийг ашиглах"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Тайлбар ашиглах"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ИДЭВХТЭЙ"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ИДЭВХГҮЙ"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Асаалттай"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Унтраалттай"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Шуурхай Тохиргоонд харуулах"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Залруулгын горим"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Та итгэмжлэлийн сан ашиглахын өмнө таны төхөөрөмжид аюулгүй түгжигдсэн дэлгэц байх шаардлагатай"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ТҮГЖЭЭГ ТОХИРУУЛАХ"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Ашиглалтын хандалттай апп-ууд"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Ослын хонхны ая"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"Яаралтай дуудлага хийх үеийн үйлдлийг тохируулах"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Нөөцлөх"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Нөөцлөх &amp; сэргээх"</string>
@@ -2888,6 +2893,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"серийн дугаар, техник хангамжийн хувилбар"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"андройдын аюулгүй байдлын patch-н түвшин, долгион баригчийн хувилбар, кернел хувилбар"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Орчинтой тохирсон дэлгэц, Түгжигдсэн дэлгэцийн дэлгэц"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"хурууны хээ"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC Tагь тохируулах"</string>
     <string name="write_tag" msgid="8571858602896222537">"Бичих"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Бичихийн тулд тагь дээр дарах ..."</string>
@@ -2921,9 +2927,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Дуугүй"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Сэрэмжлүүлэг"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Чичиргээ"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Дууны чадал"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Хэзээ ч үгүй"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3168,7 +3177,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> хүртэл анхааруулах горимд шилжих"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Үргэлж саад бол горимд шилжих"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Дэлгэц асаалттай үед"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Бүү саад бол горимоор чимээгүй болгосон мэдэгдлийг дэлгэцэд гарч ирэхийг зөвшөөрөх"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Бүү саад бол горимоор чимээгүй болгосон мэдэгдлийг дэлгэцэд гарч ирэхийг зөвшөөрөх"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Дэлгэц унтраалттай үед"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Бүү саад бол горимоор чимээгүй болгосон мэдэгдлийг дэлгэцэд асааж гэрэл анивчуулахыг зөвшөөрөх"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Бүү саад бол горимоор чимээгүй болгосон мэдэгдлийг дэлгэцэд асаах"</string>
@@ -3356,10 +3365,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Энэ төхөөрөмжийг MIDI горимоор ашиглах"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB-ыг ашиглах"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Мөн USB-г дараахад ашиглах"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Өгөгдмөл USB тохируулга"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Эдгээр тохиргоо нь нөгөө төхөөрөмжийг холбосон бөгөөд таны утасны түгжээг тайлсан үед хэрэгжинэ. Зөвхөн итгэмжлэгдсэн төхөөрөмжид холбогдоно уу."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Энэ төхөөрөмжийг цэнэглэж байна"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Холбосон төхөөрөмжийг цэнэглэж байна"</string>
@@ -3480,8 +3487,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Ойролцоогоор <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>-н <xliff:g id="USED_MEMORY">%1$s</xliff:g> санах ойг ашигласан"</string>
     <string name="users_summary" msgid="1674864467098487328">"<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> нь өгөгдмөл"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"АСААЛТТАЙ"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"УНТРААЛТТАЙ"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Асаалттай"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Унтраалттай"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Нөөцлөлт идэвхгүй болсон"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Андройдын <xliff:g id="VERSION">%1$s</xliff:g> хувилбарт шинэчилсэн"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Шинэчлэх боломжтой"</string>
@@ -3655,9 +3662,10 @@
     <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">"Системийн UI демо горим"</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="window_trace_quick_settings_title" msgid="3839917000546526898">"Цонхны мөр"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Гадаргын мөр"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope Trace"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Ажлын профайлын тохиргоо"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Харилцагч хайх"</string>
@@ -3853,4 +3861,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Жолоо барих үед Bluetooth-г ашиглах"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Жолоо барих үед Bluetooth-г автоматаар асаах"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Андройд 8.0-н батерейны тохиргоог харах"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml
index b2bb9f0..11f2279 100644
--- a/res/values-mr/arrays.xml
+++ b/res/values-mr/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 तास"</item>
     <item msgid="5198271470953124739">"कधीही टाइमआउट नाही"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"१ (डिफॉल्ट)"</item>
-    <item msgid="7584056855393485416">"२"</item>
-    <item msgid="844570832050176311">"३"</item>
-    <item msgid="1896812737336024220">"४"</item>
-    <item msgid="2664420770707984266">"५"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"१"</item>
-    <item msgid="2731443086402670729">"२"</item>
-    <item msgid="74627748729027880">"३"</item>
-    <item msgid="2654447223197666662">"४"</item>
-    <item msgid="7026157954713482328">"५"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"खराब"</item>
     <item msgid="2042505933058940139">"खराब"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"मीटरने मोजले जात असल्याचे धरा"</item>
     <item msgid="2266114985518865625">"मीटरने मोजले जात नसल्याचे धरा"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"आपोआप (वेळेच्या आधारावर)"</item>
+    <item msgid="6620560879508595181">"नेहमी चालू"</item>
+    <item msgid="6385301106124765323">"नेहमी बंद"</item>
+  </string-array>
 </resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index ed68e42..ad58125 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"सेटिंग्ज लक्षात ठेवा"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"जास्तीत जास्त कनेक्ट होऊ शकणारी ऑडिओ डिव्हाइस"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"जास्तीत जास्त कनेक्ट होऊ शकणार्‍या ऑडिओ डिव्हाइसची संख्या निवडा"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"ब्लूटूथ AVDTP विलंब अहवाल चालू करा"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"ब्लूटूथ AVDTP विलंब अहवाल मिळवण्याला परवानगी द्या"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"कास्‍ट करा"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"वायरलेस डिस्प्ले सुरू करा"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"कोणतीही जवळपासची डिव्हाइसेस आढळली नाहीत."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"कार्य प्रोफाईलसाठी स्थान"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"अॅप-दर्जा परवानग्या"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"अलीकडील स्थान विनंत्या"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"अलीकडे कोणत्याही अॅप्सने स्थानाची विनंती केलेली नाही"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"स्‍थान सेवा"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"उच्च बॅटरी वापर"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"सेवा वापरा"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"रंग सुधारणा वापरा"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"कॅप्शन वापरा"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"चालू"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"बंद"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"चालू"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"बंद"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"द्रुत सेटिंग्जमध्ये दर्शवा"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"सुधार मोड"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"तुम्ही क्रेडेन्शियल स्टोरेज वापरण्यापूर्वी, तुमच्या डीव्हाइसला एक सुरक्षित स्क्रीन लॉक असणे आवश्यक आहे"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"लॉक सेट करा"</string>
     <string name="usage_access_title" msgid="332333405495457839">"वापर प्रवेश असलेले अ‍ॅप्स"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"आणीबाणी टोन"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"आणीबाणी कॉल केला जातो तेव्हा वर्तन सेट करा"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"बॅकअप"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"बॅकअप घ्या आणि पुनर्संचयित करा"</string>
@@ -2888,6 +2893,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"सीरीअल नंबर, हार्डवेअर आवृत्ती"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"Android सुरक्षितता पॅच पातळी, बेसबँड आवृत्ती, कर्नल आवृत्ती"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"अँबियन्ट डिस्‍प्‍ले, लॉक स्‍क्रीन डिस्‍प्‍ले"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"फिंगरप्रिंट"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"वाय-फाय NFC टॅग सेट अप"</string>
     <string name="write_tag" msgid="8571858602896222537">"लिहा"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"लिहिण्यासाठी एक टॅग टॅप करा..."</string>
@@ -2921,9 +2927,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"मूक"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"सूचना"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"कंपन करा"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"ध्वनी चालू करा"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"कधीही नाही"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"केवळ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> पर्यंत अलार्मवर बदला"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"नेहमी व्‍यत्यय आणा वर बदला"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"स्क्रीन चालू असताना"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"स्क्रीनवर व्यत्यय आणू नका पॉप करून सूचना मूक होऊ द्या"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"सूचनांना स्क्रीनवरील व्यत्यय आणू नका पॉपने शांत होऊ द्या, आणि एक स्टेटस बार आयकॉन दाखवू द्या"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"स्क्रीन बंद असताना"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"व्यत्यय आणू नका ने स्क्रीन चालू करून लाइटची उघडझाप करू द्या आणि सूचनांना मूक होऊ द्या"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"व्यत्यय आणू नका ने स्क्रीन चालू करा आणि सूचनांना मूक होऊ द्या"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"या डिव्हाइसचा MIDI म्हणून वापर करा"</string>
     <string name="usb_use" msgid="3372728031108932425">"यासाठी USB वापरा"</string>
     <string name="usb_use_also" msgid="557340935190819370">"यासाठी देखील USB वापरा"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"डीफॉल्ट USB कॉंफिगरेशन"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"दुसरे डिव्हाइस कनेक्ट केलेले असताना आणि तुमचा फोन अनलॉक केलेला असतना, या सेटिंग्ज लागू होतील. फक्त विश्वसनीय डिव्हाइसशी कनेक्ट करा."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"हे डिव्हाइस चार्ज करणे"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"कनेक्ट केलेले डिव्हाइस चार्ज करत आहे"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> पैकी सरासरी <xliff:g id="USED_MEMORY">%1$s</xliff:g> मेमरी वापरली"</string>
     <string name="users_summary" msgid="1674864467098487328">"<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> डीफॉल्ट आहे"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"चालू"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"बंद"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"चालू"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"बंद"</string>
     <string name="backup_disabled" msgid="485189128759595412">"बॅक अप घेणे अक्षम केले"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> वर अपडेट केले"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"अपडेट उपलब्ध"</string>
@@ -3657,9 +3664,10 @@
     <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">"सिस्टम UI डेमो मोड"</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="window_trace_quick_settings_title" msgid="3839917000546526898">"विंडो ट्रेस"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"पृष्ठभाग ट्रेस"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"विनस्कोप ट्रेस"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"कार्य प्रोफाइल सेटिंग्ज"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"संपर्क शोध"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"ड्राइव्ह करत असताना ब्लूटूथ वापरा"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"ड्राइव्ह करत असताना ब्लूटूथ आपोआप चालू करा"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 बॅटरी सेटिंग्ज पहा"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index 0d9fe17..d0bb2e0 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 jam"</item>
     <item msgid="5198271470953124739">"Jangan sekali-kali tamat masa"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (Lalai)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Lemah"</item>
     <item msgid="2042505933058940139">"Lemah"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Anggap sebagai bermeter"</item>
     <item msgid="2266114985518865625">"Anggap sebagai tidak bermeter"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automatik (berdasarkan masa)"</item>
+    <item msgid="6620560879508595181">"Sentiasa hidup"</item>
+    <item msgid="6385301106124765323">"Sentiasa mati"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 0d2e605..c7a8d48 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ingat tetapan"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Bilangan maksimum peranti audio Bluetooth yang disambungkan"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Pilih bilangan maksimum peranti audio Bluetooth yang disambungkan"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Dayakan laporan tangguh AVDTP Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Benarkan laporan tangguh AVDTP Bluetooth penerimaan"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Hantar"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Dayakan paparan wayarles"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Tiada peranti berdekatan ditemui."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Lokasi untuk profil kerja"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Kebenaran tahap apl"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Permintaan lokasi terbaharu"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Tiada aplikasi yang telah meminta lokasi baru-baru ini"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Perkhidmatan lokasi"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Penggunaan bateri tinggi"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Gunakan perkhidmatan"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Gunakan pembetulan warna"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Gunakan kapsyen"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"HIDUP"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"MATI"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Hidup"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Mati"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Tunjukkan dalam Tetapan Pantas"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Mod pembetulan"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Sebelum anda dapat menggunakan storan bukti kelayakan, peranti anda perlu ada skrin kunci selamat"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"TETAPKAN KUNCI"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apl dgn akses guna"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Nada kecemasan"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Sandarkan &amp; pulihkan"</string>
@@ -2888,6 +2893,7 @@
     <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>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Paparan ambien, Paparan skrin kunci"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"cap jari"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Sediakan Teg NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Tulis"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Ketik teg untuk menulis..."</string>
@@ -2921,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Pembesar suara dok dimainkan"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Semua audio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Audio media sahaja"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Senyap"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Makluman"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Bergetar"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Bunyi semasa kuasa dihidupkan"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Jangan sekali-kali"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Tukar kepada penggera sahaja hingga <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Tukar kepada sentiasa ganggu"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Apabila skrin dihidupkan"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Benarkan pemberitahuan yang disenyapkan oleh Jangan Ganggu dipaparkan pada skrin"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Benarkan pemberitahuan yang disenyapkan oleh Jangan Ganggu dipaparkan pada skrin dan menunjukkan ikon bar status"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Apabila skrin dimatikan"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Benarkan pemberitahuan yang disenyapkan oleh Jangan Ganggu menghidupkan skrin dan mengelipkan lampu"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Benarkan pemberitahuan yang disenyapkan oleh Jangan Ganggu menghidupkan skrin"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Gunakan peranti ini sebagai MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Gunakan USB untuk"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Turut gunakan USB untuk"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Kofigurasi USB Lalai"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Tetapan ini akan digunakan apabila peranti lain disambungkan dan telefon anda tidak dikunci. Sambung ke peranti yang dipercayai sahaja."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Mengecas peranti ini"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Mengecas peranti tersambung"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Purata <xliff:g id="USED_MEMORY">%1$s</xliff:g> daripada <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> memori digunakan"</string>
     <string name="users_summary" msgid="1674864467098487328">"Dilog masuk sebagai <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> ialah apl lalai"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"HIDUP"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"MATI"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Hidup"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Mati"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Sandaran dilumpuhkan"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Dikemas kini kepada Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Kemas kini tersedia"</string>
@@ -3657,9 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Dihubungkan ke <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Dihubungkan ke berbilang peranti"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Mod tunjuk cara UI sistem"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Mod malam"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Tetapkan mod Malam"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Jubin pembangun tetapan pantas"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Surih Tetingkap"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Surih Permukaan"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Surih 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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Tetapan profil kerja"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Carian kenalan"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Gunakan Bluetooth apabila memandu"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Hidupkan Bluetooth secara automatik apabila memandu"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Lihat tetapan bateri Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml
index 5cf6a2e..967dcc8 100644
--- a/res/values-my/arrays.xml
+++ b/res/values-my/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"၁ နာရီ"</item>
     <item msgid="5198271470953124739">"ဘယ်တော့မှ ပိတ်မပစ်ရန်"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"၁ (မူရင်း)"</item>
-    <item msgid="7584056855393485416">"၂"</item>
-    <item msgid="844570832050176311">"၃"</item>
-    <item msgid="1896812737336024220">"၄"</item>
-    <item msgid="2664420770707984266">"၅"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"၁"</item>
-    <item msgid="2731443086402670729">"၂"</item>
-    <item msgid="74627748729027880">"၃"</item>
-    <item msgid="2654447223197666662">"၄"</item>
-    <item msgid="7026157954713482328">"၅"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"ညံ့သည်"</item>
     <item msgid="2042505933058940139">"ညံ့သည်"</item>
@@ -497,7 +489,9 @@
     <item msgid="8745603368609022803">"အခမဲ့ မဟုတ်သော အသုံးပြုခြင်းအဖြစ် သတ်မှတ်ရန်"</item>
     <item msgid="2266114985518865625">"အခမဲ့ အသုံးပြုခြင်းအဖြစ် သတ်မှတ်ရန်"</item>
   </string-array>
-    <!-- no translation found for dark_ui_mode_entries:0 (146804192658443142) -->
-    <!-- no translation found for dark_ui_mode_entries:1 (6620560879508595181) -->
-    <!-- no translation found for dark_ui_mode_entries:2 (6385301106124765323) -->
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"အလိုအလျောက် (တစ်နေ့တာ၏ အချိန်အပေါ် မူတည်သည်)"</item>
+    <item msgid="6620560879508595181">"အမြဲတမ်း ဖွင့်ထားခြင်း"</item>
+    <item msgid="6385301106124765323">"အမြဲပိတ်ခြင်း"</item>
+  </string-array>
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index a1ab225..1d4aef5 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -89,7 +89,7 @@
     <string name="font_size_preview_text_title" msgid="1310536233106975546">"Oz ၏အံ့ဖွယ်ဝိဇ္ဇာ"</string>
     <string name="font_size_preview_text_subtitle" msgid="4231671528173110093">"အခန်းကြီး ၁၁ − Oz ၏အံ့ဖွယ် မြစိမ်းရောင်မြို့တော်"</string>
     <string name="font_size_preview_text_body" msgid="2846183528684496723">"မျက်လုံးများကို ကာကွယ်ရန် အစိမ်းရောင်မျက်မှန်များ တပ်ထားသော်လည်း ဒေါ်ရသီနှင့် သူ့သူယ်ချင်းများသည် အံ့ဩဖွယ်မြို့တော်၏ တောက်ပမှုကြောင့် မျက်စိစူးသွားပါသေးသည်။ လမ်းများတလျှောက် အစိမ်းရောင်စကျင်ကျောက်များဖြင့် ဆောက်လုပ်ထားပြီး တဖိတ်ဖိတ်တောက်ပနေသည့် မြများ မြုပ်သွင်းထားသည့် လပသောအိမ်များနှင့် စီတန်းထားပါသည်။ သူတို့သည် ၎င်းအစိမ်းရောင်စကျင်ကျောက်ဖြင့် ခင်းထားပြီး ဆက်ထားသည့် နေရာများတွင် မြများကို အတန်းလိုက် နီးကပ်စွာစီတန်းထား၍ နေရောင်အောက်တွင် တစ်လျှပ်လျှပ်တောက်ပနေသည့် ပလပ်ဖောင်းတလျှောက် လမ်းလျှောက်လာခဲ့ပါသည်။ ပြတင်းပေါက်မှန်များအားလုံးသည် အစိမ်းရောင်ဖန်သားများဖြစ်သည်။ မြို့အထက်ရှိ ကောင်းကင်ပြင်သည်ပင်လျှင် အစိမ်းရောင်သန်းလျက်ရှိပြီး နေရောင်ခြည်သည်လည်း အစိမ်းရောင်ပင်ဖြစ်သည်။ \n\nလူများစွာရှိပြီး ယောကျာ်း၊ မိန်းမနှင့် ကလေးများ လမ်းလျှောက်လျက်ရှိကာ ၎င်းတို့အားလုံးသည် အစိမ်းရောင်အဝတ်အစားများကို ဝတ်ဆင်ထား၍ အစိမ်းရောင်သန်းသည့် အသားရောင်များ ရှိကြပါသည်။ သူတို့သည် ဒေါ်ရသီနှင့် ကွဲပြားခြားနားသည့် သူ့အဖော်များကို စိတ်ဝင်တစား ကြည့်နေကြပြီး ကလေးများသည် ခြင်္သေ့ကို တွေ့သည့်အခါ အမေ့နောက်ကျော်တွင် သွားရောက် ကွယ်ဝှက်နေကြပါသည်။ သို့သော် မည်သူမျှ သူတို့ကို စကားမပြောကြပါ။ လမ်းတလျှောက် ဆိုင်များစွာရှိပါသည်။ ၎င်းဆိုင်များရှိ အရာအားလုံးသည် အစိမ်းရောင်များဖြစ်သည်ကို ဒေါ်ရသီ တွေ့ရှိခဲ့ရပါသည်။ အစိမ်းရောင်ချိုချဉ်နှင့် အစိမ်းရောင်ပေါက်ပေါက်ဆုတ်တို့အပြင် အစိမ်းရောင်ဖိနပ်၊ အစိမ်းရောင်ဦးထုပ်နှင့် အစိမ်းရောင် အဝတ်အထည် မျိုးစုံတို့ကို ရောင်းနေကြသည်။ တစ်နေရာတွင် လူတစ်ဦးသည် အစိမ်းရောင် သံပုရာရည်ကို ရောင်းချလျှက်ရှိပြီး ကလေးများက၎င်းကို ဝယ်ယူကြရာတွင် အစိမ်းရောင် ဒင်္ဂါးပြားများဖြင့် ပေးဝယ်နေကြကြောင်းကို ဒေါ်ရသီတွေ့ရှိခဲ့ပါသည်။ \n\nထိုနေရာတွင် မြင်းအစရှိသည့် တိရစ္ဆာန်တစ်ကောင်တလေမျှ မတွေ့ခဲ့ရပါ။ ယောကျာ်းများသည် ပစ္စည်းများကို လှည်းတစ်ခုထဲထည့်၍ တွန်းသွားကြပါသည်။ လူတိုင်းလူတိုင်းသည် ပျော်ရွှင်နေကြပြီး ရောင့်ရဲတင်းတိမ်ကြပြီး ကြွယ်ဝကြပါသည်။"</string>
-    <string name="font_size_save" msgid="3450855718056759095">"အိုကေ"</string>
+    <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
     <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USBသိုလှောင်ကိရိယာ"</string>
     <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD ကဒ်"</string>
     <string name="bluetooth" msgid="5549625000628014477">"ဘလူးတုသ်"</string>
@@ -194,7 +194,7 @@
     <string name="proxy_action_text" msgid="2957063145357903951">"ပြီးပါပြီ"</string>
     <string name="proxy_hostname_label" msgid="8490171412999373362">"ပရောက်စီကို လက်ခံဝန်ဆောင်ပေးသူ"</string>
     <string name="proxy_error" msgid="8926675299638611451">"သတိပြုရန်"</string>
-    <string name="proxy_error_dismiss" msgid="4993171795485460060">"အိုကေ"</string>
+    <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="6865850167802455230">"သင်ရိုက်ထည့်သော အင်တာနက်လက်ခံဝန်ဆောင်ပေးသူအမည်မှာ မဆီလျော်ပါ"</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="678527645450894773">"ထုတ်ဖယ်မည့်စာရင်းမှာ မှန်ကန်စွာဖွဲ့စည်းထား၍ ရိုက်ထည့်ထားခြင်းမဟုတ်ပါ။ ပုဒ်ရပ်သကေင်္တ(ကော်မာ)ဖြင့်ခြားထားသော ထုတ်ဖယ်မည့်ဒိုမိန်းစာရင်းကို ရိုက်ထည့်ပါ။"</string>
     <string name="proxy_error_empty_port" msgid="5539106187558215246">"သင် port field ကို ပြီးအောင်လုပ်ရန်လိုသည်။"</string>
@@ -283,7 +283,7 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD ကဒ်"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"ပရောက်စီ ဆက်တင်များ"</string>
     <string name="cancel" msgid="6859253417269739139">"မလုပ်တော့"</string>
-    <string name="okay" msgid="1997666393121016642">"အိုကေ"</string>
+    <string name="okay" msgid="1997666393121016642">"OK"</string>
     <string name="forget" msgid="1400428660472591263">"မေ့ပစ်ရန်"</string>
     <string name="save" msgid="879993180139353333">"သိမ်းရန်"</string>
     <string name="done" msgid="6942539184162713160">"ပြီးပါပြီ"</string>
@@ -405,7 +405,7 @@
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"၎င်းသည် သင့်ဖုန်း၏ ကျောဘက်တွင်ရှိပါသည်။ လက်ညှိုးကို အသုံးပြုပါ။"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"စက်ကိရိယာနှင့် လက်ဗွေရာအာရုံခံစက် ကိုတည်နေရာနှင့်အတူသရုပ်ဖော်ပုံ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"အမည်"</string>
-    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"အိုကေ"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"ဖျက်ရန်"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"အာရုံခံကိရိယာကို ထိပါ"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"သင့်လက်ချောင်းကို အာရုံခံကိရိယာပေါ်သို့ တင်လိုက်ပြီး တုန်ခါမှုကို ခံစားရချိန်တွင် ပြန်ရုပ်လိုက်ပါ"</string>
@@ -707,10 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ဆက်တင်များအားမှတ်မိစေရန်"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"ဘလူးတုသ်စက်ပစ္စည်း အများဆုံးချိတ်ဆက်ထားနိုင်သည့် အရေအတွက်"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"ချိတ်ဆက်ထားနိုင်သည့် ဘလူးတုသ် ချိတ်ဆက်နိုင်သည့် အများဆုံးအရေအတွက်ကို ရွေးပါ"</string>
-    <!-- no translation found for bluetooth_enable_avdtp_delay_reports (5101903170688399944) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_avdtp_delay_reports_summary (7052797876020616399) -->
-    <skip />
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"ဘလူးတုသ် AVDTP နှောင့်နှေးမှု အစီရင်ခံချက်များ လက်ခံခြင်းကို ဖွင့်ရန်"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"ဘလူးတုသ် AVDTP နှောင့်နှေးမှု အစီရင်ခံချက်များ လက်ခံခွင့်ပြုရန်"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"ကာစ်"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"ကြိုးမဲ့ ပြသမှုကို ဖွင့်ရန်"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"အနီးတဝိုက်တွင် စက်ပစ္စည်းများ ရှာမတွေ့ပါ။"</string>
@@ -1125,7 +1123,7 @@
     <string name="sim_change_failed" msgid="3602072380172511475">"ပင်နံပါတ်ပြောင်း၍မရပါ\nပင်နံပါတ်အမှား ဖြစ်နိုင်သည်"</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"ဆင်းကဒ် ပင်နံပါတ် ပြောင်းခြင်းအောင်မြင်ပါသည်"</string>
     <string name="sim_lock_failed" msgid="2489611099235575984">"ဆင်းမ်ကဒ်သော့ကျနေမှုအခြေအနေအား ပြောင်းမရပါ။ \nပင်နံပါတ်မှားယွင်းမှု ဖြစ်နိုင်သည်။"</string>
-    <string name="sim_enter_ok" msgid="6475946836899218919">"အိုကေ"</string>
+    <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"မလုပ်တော့"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"ဆင်းမ်များ အများအပြား တွေ့ထား"</string>
     <string name="sim_multi_sims_summary" msgid="2698176447067691396">"မိုဘိုင်းဒေတာ အသုံးပြုလိုသည့် ဆင်းမ်ကဒ်ကို ရွေးပါ။"</string>
@@ -1445,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"အလုပ်ပရိုဖိုင်အတွက် တည်နေရာ"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"အက်ပ်အဆင့် ခွင့်ပြုချက်များ"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"လတ်တလောတည်နေရာ တောင်းခံမှုများ"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"လတ်တလောတွင် မည်သည့်အပလီကေးရှင်းမှ တည်နေရာကို တောင်းခံမှုမရှိပါ။"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"တည်နေရာဝန်ဆောင်မှုများ"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"ဘက်ထရီအသုံးပြုမှုမြင့်သော"</string>
@@ -1646,7 +1646,7 @@
     <string name="recompute_size" msgid="7722567982831691718">"အရွယ်အစားကို ပြန်လည်တွက်ချက်နေသည်"</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"အပ်ပလီကေးရှင်းဒေတာအား ပယ်ဖျက်မည်လား?"</string>
     <string name="clear_data_dlg_text" msgid="3951297329833822490">"ဤအပလီကေးရှင်၏ဒေတာများအားလုံးကို ထာဝရဖျက်ပါမည်။ ဖိုင်များအားလုံး၊ ဆက်တင်များ၊ အကောင့်များ၊ ဒေတာဘေ့စ်စသည်တို့ပါဝင်ပါမည်။"</string>
-    <string name="dlg_ok" msgid="2402639055725653590">"အိုကေ"</string>
+    <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"မလုပ်တော့"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
     <string name="app_not_found_dlg_text" msgid="4893589904687340011">"ထည့်သွင်းထားသော အပ်ပလီကေးရှင်းထဲတွင် ဤအပ်ပလီကေးရှင်းအား မတွေ့ရှိပါ"</string>
@@ -1794,7 +1794,7 @@
     <string name="user_dict_settings_add_screen_title" msgid="742580720124344291">"စကားစု"</string>
     <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"ပိုမိုရွေးချယ်စရာများ"</string>
     <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"ရွေးစရာလျှော့ရန်"</string>
-    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"အိုကေ"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"OK"</string>
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"စာလုံး"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"အတိုကောက်"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"ဘာသာစကား"</string>
@@ -1884,10 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"ဝန်ဆောင်မှုကို သုံးရန်"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"အရောင်ပြင်ဆင်ခြင်းကို သုံးရန်"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"စာတန်းကို သုံးရန်"</string>
-    <!-- no translation found for accessibility_summary_state_enabled (7914278500885887763) -->
-    <skip />
-    <!-- no translation found for accessibility_summary_state_disabled (2984230257590246745) -->
-    <skip />
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"ဖွင့်ထားသည်"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"ပိတ်ထားသည်"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"အမြန်ဆက်တင်များတွင်ပြပါ"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"ပြင်ဆင်ရန်နည်းလမ်း"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2319,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"ယုံကြည်စိတ်ချရသော သိုလှောင်ရာနေရာကို မသုံးနိုင်မီ သင့်စက်ပစ္စည်းတွင် လုံခြုံသော လော့ခ်ချထားချိန် မျက်နှာပြင်စနစ်ကို သတ်မှတ်ရပါမည်"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"လော့ခ်ကို သတ်မှတ်ရန်"</string>
     <string name="usage_access_title" msgid="332333405495457839">"အသုံးပြုခွင့်ရထားသည့် အက်ပ်များ"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"အရေးပေါ်ခေါ်ဆိုမှုအတွက် မြည်သံ"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"အရေးပေါ်ခေါ်ဆိုမှုအတွက် လုပ်ဆောင်ပုံကို သတ်မှတ်ရန်"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"မိတ္တူကူးရန်"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"အရန်ပြုလုပ်ခြင်းနှင့် ပြန်လည်ရယူခြင်း"</string>
@@ -2894,8 +2893,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"အမှတ်စဉ်၊ ဟာ့ဒ်ဝဲ ဗားရှင်း"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android လုံခြုံရေး ပက်ချ် အဆင့်၊ baseband ဗားရှင်း၊ kernel ဗားရှင်း"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"ဝန်းကျင်ကို ပြကွက်၊ လော့ခ်ချထားချိန် မျက်နှာပြင်"</string>
-    <!-- no translation found for keywords_fingerprint_settings (239222512315619538) -->
-    <skip />
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"လက်ဗွေ"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ကြိုးမဲ့ NFC တဲဂ်ကို စဖွင့်သတ်မှတ်ရန်"</string>
     <string name="write_tag" msgid="8571858602896222537">"ရေးရန်"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ရေးရန် တဲဂ် တစ်ခုကို ပုပ်ပါ..."</string>
@@ -2929,9 +2927,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"အသံတိတ်ရန်"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"သတိပေးချက်"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"တုန်ခါရန်"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"အသံများ ဖွင့်ထားပါ"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"ဘယ်တော့မှ"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3178,13 +3179,12 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> အထိနိုးစက်သာလျှင် သို့ပြောင်းမည်"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"အမြဲတမ်း ကြားဖြတ်ရန်သို့ ပြောင်းမည်"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"မျက်နှာပြင် ဖွင့်ထားချိန်"</string>
-    <!-- no translation found for zen_mode_screen_on_summary (2208664848367443505) -->
-    <skip />
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"\'မနှောင့်ယှက်ရ\' အကွက်ဖြင့် အကြောင်းကြားချက်များကို အသံတိတ်ခွင့်ပြုပြီး အခြေနေဘား သင်္ကေတပြခွင့်ပြုပါ"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"မျက်နှာပြင် ပိတ်ထားချိန်"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"\"မနှောင့်ယှက်ရ\" က ပိတ်ထားသော အကြောင်းကြားချက်များကို မျက်နှာပြင်ကိုဖွင့်၍ မီးမှိတ်တုတ်ပြခွင့်ပေးပါ"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"\"မနှောင့်ယှက်ရ\" က ပိတ်ထားသော အကြောင်းကြားချက်များကို မျက်နှာပြင်ကိုဖွင့်ခွင့်ပေးပါ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"အကြောင်းကြားချက် ဆက်တင်များ"</string>
-    <string name="suggestion_button_text" msgid="3275010948381252006">"အိုကေ"</string>
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ဤကိရိယာအတွက် အကြံပြုချက် ပို့ရန်"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"စီမံခန့်ခွဲသူ၏ ပင်နံပါတ်ကို ထည့်ပါ"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"ဖွင့်ရန်"</string>
@@ -3296,7 +3296,7 @@
     <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" msgid="8498726261327239136">"ကူညီပေးသူသည် သင်၏ စနစ်ထဲတွင် သုံးနေသည့် အက်ပ်များ အကြောင်း အချက်အလက်များကို၊ သင်၏ မျက်နှာပြင် ပေါ်တွင် မြင်ရသည့် သို့မဟုတ် အက်ပ်များ အထဲတွင် ရယူသုံးနိုင်သည့် အချက်အလက်များ အပါအဝင်ကို၊ ဖတ်ရှုနိုင်မည်။"</string>
-    <string name="assistant_security_warning_agree" msgid="7710290206928033908">"အိုကေ"</string>
+    <string name="assistant_security_warning_agree" msgid="7710290206928033908">"OK"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"သဘောမတူပါ"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"အသံဖြင့်စာရိုက်ထည့်ခြင်းအား ရွေးပါ"</string>
     <string name="default_browser_title" msgid="8101772675085814670">"ဘရောင်ဇာ အက်ပ်"</string>
@@ -3489,10 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Avg သည်ယာယီမှတ်ဉာဏ် <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>  ၏ <xliff:g id="USED_MEMORY">%1$s</xliff:g> ကိုအသုံးပြုထားသည်"</string>
     <string name="users_summary" msgid="1674864467098487328">"<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> သည်မူရင်းဖြစ်သည်"</string>
-    <!-- no translation found for location_on_summary (3637699010986988970) -->
-    <skip />
-    <!-- no translation found for location_off_summary (7217264690673949107) -->
-    <skip />
+    <string name="location_on_summary" msgid="3637699010986988970">"ဖွင့်ထားသည်"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"ပိတ်ထားသည်"</string>
     <string name="backup_disabled" msgid="485189128759595412">"အရံကူးယူခြင်း ပိတ်ထားသည်"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> သို့ အပ်ဒိတ်လုပ်ထားသည်"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"အပ်ဒိတ် ရနိုင်သည်"</string>
@@ -3666,13 +3664,10 @@
     <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">"စနစ် UI သရုပ်ပြမုဒ်"</string>
-    <!-- no translation found for dark_ui_mode (2112241426441807273) -->
-    <skip />
-    <!-- no translation found for dark_ui_mode_title (975299966259850992) -->
-    <skip />
+    <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>
-    <!-- no translation found for winscope_trace_quick_settings_title (1294290008255732032) -->
-    <skip />
+    <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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"အလုပ်ပရိုဖိုင်ဆက်တင်များ"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"အဆက်အသွယ်ကို ရှာဖွေပါ"</string>
@@ -3868,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"ကားမောင်းနေစဉ် ဘလူးတုသ် သုံးခြင်း"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"ကားမောင်းနေစဉ် ဘလူးတုသ် အလိုအလျောက် ဖွင့်ပါ"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android ၈.၀ ဘက်ထရီဆက်တင်ကို ကြည့်ရန်"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 95fd3a9..9bf7f99 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"Én time"</item>
     <item msgid="5198271470953124739">"Aldri tidsavbrudd"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (standard)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Dårlig"</item>
     <item msgid="2042505933058940139">"Dårlig"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Behandle som med datamåling"</item>
     <item msgid="2266114985518865625">"Behandle som uten datamåling"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automatisk (basert på klokkeslett)"</item>
+    <item msgid="6620560879508595181">"Alltid på"</item>
+    <item msgid="6385301106124765323">"Alltid av"</item>
+  </string-array>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 24f6fe4..1e08cb9 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Husk innstillinger"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maksimalt antall Bluetooth-lydenheter"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Velg maksimalt antall tilkoblede Bluetooth-lydenheter"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Slå på Bluetooth AVDTP-forsinkelsesrapporter"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Tillat mottak av Bluetooth AVDTP-forsinkelsesrapporter"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Slå på trådløs skjermdeling"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Finner ingen enheter i nærheten."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Sted for arbeidsprofil"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Tillatelser på appnivå"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nylige posisjonsforespørsler"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Ingen apper har bedt om posisjonen din i det siste"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Posisjonstjenester"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Høy batteribruk"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Bruk tjenesten"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Bruk fargekorrigering"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Bruk teksting"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"PÅ"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"AV"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"På"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Av"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Vis i hurtiginnstillingene"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Korrigeringsmodus"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Enheten din må ha en sikker låseskjerm før du kan bruke legitimasjonslager"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ANGI LÅS"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apper med brukstilgang"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Nødtone"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Sikkerhetskopier og gjenopprett"</string>
@@ -2888,6 +2893,7 @@
     <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>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Passiv skjerm, låseskjerm"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"fingeravtrykk"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Konfigurer NFC-tag for Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Trykk på en brikke for å skrive"</string>
@@ -2921,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Avspilling fra dokkhøyttaler"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"All lyd"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Bare medielyd"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Stille"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Varsel"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrer"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Lyder ved oppstart"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Aldri"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Endre til Bare alarmer frem til <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Bytt til Alltid forstyrr"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Når skjermen er på"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"La varsler som er lydløse når «Ikke forstyrr» er slått på, vises på skjermen"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"La varsler som er lydløse når «Ikke forstyrr» er slått på, vises på skjermen, og vis et statusfeltikon"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Når skjermen er av"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"La varsler som er lydløse når «Ikke forstyrr» er slått på, slå på skjermen og blinke lyset"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"La varsler som er lydløse når «Ikke forstyrr» er slått på, slå på skjermen"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Bruk denne enheten som MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Bruk USB for"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Bruk i tillegg USB til"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Standard USB-konfigurasjon"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Disse innstillingene gjelder når en annen enhet er koblet til og telefonen din er låst opp. Du bør bare koble til pålitelige enheter."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Lading av denne enheten"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Lading av den tilkoblede enheten"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Gjennomsnittlig er <xliff:g id="USED_MEMORY">%1$s</xliff:g> av <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> minne er brukt"</string>
     <string name="users_summary" msgid="1674864467098487328">"Logget på som <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> er angitt som standard"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"PÅ"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"AV"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"På"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Av"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Sikkerhetskopiering er slått av"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Oppdatert til Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"En oppdatering er tilgjengelig"</string>
@@ -3657,9 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Koblet til <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Koblet til flere enheter"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Demomodus for systembrukergrensesnittet"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Nattmodus"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Angi nattmodus"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Fliser med hurtiginnstillinger for utviklere"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Vindussporing"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Overflatespor"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope-spor"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Innstillinger for jobbprofilen"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontaktsøk"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Bruk Bluetooth når du kjører"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Slå på Bluetooth automatisk når du kjører"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Se batteriinnstillinger for Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml
index 316953b..b321dc5 100644
--- a/res/values-ne/arrays.xml
+++ b/res/values-ne/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"१ घन्टा"</item>
     <item msgid="5198271470953124739">"कहिल्यै समय सकिँदैन"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"१ (पूर्वनिर्धारित मान)"</item>
-    <item msgid="7584056855393485416">"२"</item>
-    <item msgid="844570832050176311">"३"</item>
-    <item msgid="1896812737336024220">"४"</item>
-    <item msgid="2664420770707984266">"५"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"१"</item>
-    <item msgid="2731443086402670729">"२"</item>
-    <item msgid="74627748729027880">"३"</item>
-    <item msgid="2654447223197666662">"४"</item>
-    <item msgid="7026157954713482328">"५"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"कमजोर"</item>
     <item msgid="2042505933058940139">"कमजोर"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"मिटर गरिएको रूपमा व्यवहार गर्नुहोस्"</item>
     <item msgid="2266114985518865625">"मिटर नगरिएको रूपमा व्यवहार गर्नुहोस्"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"स्वचालित (दिनको कुन समय हो भन्ने कुरामा आधारित)"</item>
+    <item msgid="6620560879508595181">"सधैँ सक्रिय"</item>
+    <item msgid="6385301106124765323">"सधैँ निष्क्रिय"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 83f9376..659b35b 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -198,7 +198,7 @@
     <string name="proxy_error_invalid_host" msgid="6865850167802455230">"तपाईँले टाइप गर्नु भएको होस्टनाम मान्य छैन।"</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="678527645450894773">"तपाईंले टाइप गर्नुभएको असमावेशी सूची राम्रोसँग फर्म्याट भएको छैन। समावेश नगरिएका प्रयोगक्षेत्रहरूको अल्पविराम-विच्छेदक सूची टाइप गर्नुहोस्।"</string>
     <string name="proxy_error_empty_port" msgid="5539106187558215246">"तपाईँले पोर्टक्षेत्र पूरा गर्नु जरुरी छ।"</string>
-    <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"यदि होस्ट फिल्ड खाली छ भने पोर्ट फिल्ड पनि खाली हुनुपर्छ।"</string>
+    <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"यदि होस्ट फिल्ड खाली छ भने पोर्ट फिल्ड पनि खाली हुनु पर्छ।"</string>
     <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>
@@ -577,9 +577,9 @@
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"कम्तीमा पनि <xliff:g id="COUNT">%d</xliff:g> वटा वर्ण हुनु अनिवार्य छ"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN कम्तीमा पनि <xliff:g id="COUNT">%d</xliff:g> अङ्कको हुनु अनिवार्य छ"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"जारी राख्नुहोस्"</string>
-    <string name="lockpassword_password_too_long" msgid="4591720174765403476">"<xliff:g id="NUMBER">%d</xliff:g> भन्दा कम वर्ण हुनुपर्छ"</string>
-    <string name="lockpassword_pin_too_long" msgid="2079396149560490458">"<xliff:g id="NUMBER">%d</xliff:g> भन्दा थोरै अङ्क हुनुपर्छ"</string>
-    <string name="lockpassword_pin_contains_non_digits" msgid="7284664023164191198">"अनिवार्य रूपमा ० देखि ९ सम्मका अङ्कहरू मात्र समावेश हुनुपर्छ"</string>
+    <string name="lockpassword_password_too_long" msgid="4591720174765403476">"<xliff:g id="NUMBER">%d</xliff:g> भन्दा कम वर्ण हुनु पर्छ"</string>
+    <string name="lockpassword_pin_too_long" msgid="2079396149560490458">"<xliff:g id="NUMBER">%d</xliff:g> भन्दा थोरै अङ्क हुनु पर्छ"</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="7284664023164191198">"अनिवार्य रूपमा ० देखि ९ सम्मका अङ्कहरू मात्र समावेश हुनु पर्छ"</string>
     <string name="lockpassword_pin_recently_used" msgid="1401569207976460727">"यन्त्र प्रशासकले पछिल्लो PIN प्रयोग गर्न अनुमति दिँदैन"</string>
     <string name="lockpassword_pin_blacklisted_by_admin" msgid="8563366383328811472">"तपाईंकसे IT व्यवस्थापकले धेरै प्रयोग हुने PIN हरूमाथि रोक लगाउनु भएको छ। कुनै फरक PIN प्रयोग गरी हेर्नुहोस्।"</string>
     <string name="lockpassword_illegal_character" msgid="8049611046639943217">"यसमा अमान्य वर्ण समावेश गर्न सकिँदैन"</string>
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"सेटिङहरू सम्झनुहोस्"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"जडान भएका ब्लुटुथ अडियो यन्त्रहरूको अधिकतम सङ्ख्या"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"जडान भएका ब्लुटुथ अडियो यन्त्रहरूको अधिकतम सङ्ख्या चयन गर्नुहोस्"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"ब्लुटुथ AVDTP को ढिलाइसम्बन्धी रिपोर्टहरू सक्षम पार्नुहोस्"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"ब्लुटुथ AVDTP को ढिलाइसम्बन्धी रिपोर्टहरू प्राप्त गर्ने अनुमति दिनुहोस्"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"वायरलेस प्रदर्शन सक्षम गर्नुहोस्"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"नजिकै कुनै उपकरण भेटिएन।"</string>
@@ -830,7 +832,7 @@
     <string name="wifi_use_system_certs" msgid="5270879895056893783">"प्रणालीका प्रमाणपत्रहरू प्रयोग गर्नुहोस्"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"प्रदान नगर्नुहोस्"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"प्रमाणित नगर्नुहोस्"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"कुनै प्रमाणपत्र निर्दिष्ट गरिएको छैन। तपाईंको जडान निजी हुनेछैन।"</string>
+    <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"कुनै प्रमाणपत्र निर्दिष्ट गरिएको छैन। तपाईंको जडान निजी हुने छैन।"</string>
     <string name="wifi_ssid_too_long" msgid="3474753269579895244">"नेटवर्कको नाम धेरै लामो भयो।"</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"डोमेन निर्दिष्ट गर्नुपर्छ"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS उपलब्ध छ"</string>
@@ -1062,7 +1064,7 @@
     <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"<xliff:g id="ID_1">%1$s</xliff:g> मा स्वतः सक्रिय हुनेछ"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"सूर्यास्तको बेला स्वतः सक्रिय हुनेछ"</string>
     <string name="night_display_summary_on" msgid="1355713529996456744">"सक्रिय / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"कहिल्यै पनि स्वतः निष्क्रिय हुनेछैन"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"कहिल्यै पनि स्वतः निष्क्रिय हुने छैन"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"<xliff:g id="ID_1">%1$s</xliff:g> मा स्वतः निष्क्रिय हुनेछ"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"सूर्योदयको बेला स्वतः निष्क्रिय हुनेछ"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"निष्क्रिय"</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"काम प्रोफाइलका लागि स्थान"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"अनुप्रयोग-स्तरीय अनुमतिहरू"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"हालका स्थान अनुरोधहरू"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"हाल कुनै पनि अनुप्रयोगहरूले स्थान अनुरोध गरिएका छैनन्"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"स्थान सेवाहरू"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"उच्च ब्याट्री प्रयोग"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"सुविधा प्रयोग गर्नुहोस्"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"रङ सुधार गर्ने सुविधा प्रयोग गर्नुहोस्"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"क्याप्सनहरू प्रयोग गर्नुहोस्"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"सक्रिय छ"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"निष्क्रिय छ"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"सक्रिय"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"निष्क्रिय"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"द्रुत सेटिङमा देखाउनुहोस्"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"सुधार मोड"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"तपाईंले प्रमाणको भण्डारण प्रयोग गर्न सक्नुअघि तपाईंको यन्त्रमा एक सुरक्षित लक स्क्रिन हुनु अनिवार्य छ"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"लक सेट गर्नुहोस्"</string>
     <string name="usage_access_title" msgid="332333405495457839">"उपयोग पहुँचसहितका अनुप्रयोग"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"आपतकालीन टोन"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"आपातकालीन कल राखिएको बेलाको व्यवहार सेट गर्नुहोस्"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"ब्याकअप"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"ब्याकअप र पुनःस्थापना गर्नुहोस्"</string>
@@ -2560,8 +2565,8 @@
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(सर्भरबाट प्राप्त)"</string>
     <string name="vpn_always_on_invalid_reason_type" msgid="7574518311224455825">"यस प्रकारको VPN सधैँ जडान भएर रहन सक्दैन"</string>
     <string name="vpn_always_on_invalid_reason_server" msgid="477304620899799383">"सधैँ सक्रिय रहने VPN ले संख्यात्मक सर्भर ठेगानाहरूलाई मात्र समर्थन गर्छ"</string>
-    <string name="vpn_always_on_invalid_reason_no_dns" msgid="2226648961940273294">"सधैँ सक्रिय रहने VPN का लागि DNS सर्भर निर्दिष्ट गरिएको हुनुपर्छ"</string>
-    <string name="vpn_always_on_invalid_reason_dns" msgid="3551394495620249972">"सधैँ सक्रिय रहने VPN का लागि DNS ठेगानाहरू संख्यात्मक नै हुनुपर्छ"</string>
+    <string name="vpn_always_on_invalid_reason_no_dns" msgid="2226648961940273294">"सधैँ सक्रिय रहने VPN का लागि DNS सर्भर निर्दिष्ट गरिएको हुनु पर्छ"</string>
+    <string name="vpn_always_on_invalid_reason_dns" msgid="3551394495620249972">"सधैँ सक्रिय रहने VPN का लागि DNS ठेगानाहरू संख्यात्मक नै हुनु पर्छ"</string>
     <string name="vpn_always_on_invalid_reason_other" msgid="5959352052515258208">"प्रविष्ट गरिएको जानकारीले सधैँ सक्रिय रहने VPN लाई समर्थन गर्दैन"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"रद्द गर्नुहोस्"</string>
     <string name="vpn_done" msgid="8678655203910995914">"खारेज गर्नुहोस्"</string>
@@ -2577,8 +2582,8 @@
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN लाई बिर्सनुहोस्"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"विद्यमान VPN लाई बदल्ने हो?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"सधैँ-सक्रिय VPN लाई सेट गर्ने हो?"</string>
-    <string name="vpn_first_always_on_vpn_message" msgid="7144543717673197102">"सेटिङ सक्रिय भएको बेला VPN सफलतापूर्वक जडान नहुन्जेलसम्म तपाईंसँग इन्टरनेट जडान हुनेछैन"</string>
-    <string name="vpn_replace_always_on_vpn_enable_message" msgid="798121133114824006">"तपाईंको विद्यमान VPN लाई प्रतिस्थापन गरिने छ र त्यसपछि VPN सफलतापूर्वक जडान नहुन्जेलसम्म तपाईंसँग इन्टरनेट जडान हुनेछैन"</string>
+    <string name="vpn_first_always_on_vpn_message" msgid="7144543717673197102">"सेटिङ सक्रिय भएको बेला VPN सफलतापूर्वक जडान नहुन्जेलसम्म तपाईंसँग इन्टरनेट जडान हुने छैन"</string>
+    <string name="vpn_replace_always_on_vpn_enable_message" msgid="798121133114824006">"तपाईंको विद्यमान VPN लाई प्रतिस्थापन गरिने छ र त्यसपछि VPN सफलतापूर्वक जडान नहुन्जेलसम्म तपाईंसँग इन्टरनेट जडान हुने छैन"</string>
     <string name="vpn_replace_always_on_vpn_disable_message" msgid="3011818750025879902">"तपाईँले पहिले नै एउटा सधैं-सक्रिय VPN मा जडान गर्नुभएको छ। तपाईंले अर्को कुनै VPN मा ज‍डान गर्नुभयो भने तपाईंको विद्यमान VPN लाई प्रतिस्थापन गरिनेछ र सधैं-सक्रिय मोड निष्क्रिय हुने छ।"</string>
     <string name="vpn_replace_vpn_message" msgid="5611635724578812860">"तपाईँले पहिले नै एउटा VPN मा जडान गर्नुभएको छ। तपाईँले कुनै नयाँ VPN मा ज‍डान गर्नुभयो भने तपाईँको विद्यमान VPN लाई प्रतिस्थापन गरिनेछ।"</string>
     <string name="vpn_turn_on" msgid="2363136869284273872">"सक्रिय गर्नुहोस्"</string>
@@ -2888,6 +2893,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"क्रम संख्या, हार्डवेयरको संस्करण"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android को सुरक्षासम्बन्धी प्याचको स्तर, बेसब्यान्ड संस्करण, कर्नेल संस्करण"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"परिवेशको प्रदर्शन, लक स्क्रिनको प्रदर्शन"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"फिंगरप्रिन्ट"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ट्याग सेट गर्नुहोस्"</string>
     <string name="write_tag" msgid="8571858602896222537">"लेख्नुहोस्"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"लेख्न ट्याग छुनुहोस्..."</string>
@@ -2921,9 +2927,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"मौन"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"सतर्कता"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"भाइब्रेट"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"यन्त्र सक्रिय हुँदाका ध्वनिहरू"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"कहिल्यै होइन"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> सम्मको लागि मात्र अलार्म परिवर्तन गर्नुहोस्"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"सधैं अवरोध गर्ने गरी परिवर्तन गर्नुहोस्"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"स्क्रिन सक्रिय रहेको अवस्थामा"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"बाधा नपुऱ्याउनुहोस् नामक मोडमार्फत मौन पारिएका सूचनाहरूलाई स्क्रिनमा देखिन दिनुहोस्"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"बाधा नपुऱ्याउनुहोस् नामक मोडमार्फत मौन पारिएका सूचनाहरूलाई स्क्रिनमा देखिन तथा वस्तुस्थिति पट्टीको आइकन देखाउन दिनुहोस्"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"स्क्रिन निष्क्रिय रहेको अवस्थामा"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"बाधा नपुऱ्याउनुहोस् नामक मोडमार्फत मौन पारिएका सूचनाहरूलाई स्क्रिन सक्रिय गर्न र बत्तीलाई धिपधिपाउन दिनुहोस्"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"बाधा नपुऱ्याउनुहोस् नामक मोडमार्फत मौन पारिएका सूचनाहरूलाई स्क्रिन सक्रिय गर्न दिनुहोस्"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"यस यन्त्रलाई MIDI को रूपमा प्रयोग गर्नुहोस्"</string>
     <string name="usb_use" msgid="3372728031108932425">"का लागि USB प्रयोग गर्नुहोस्"</string>
     <string name="usb_use_also" msgid="557340935190819370">"USB लाई निम्न कार्यका लागि पनि प्रयोग गर्नुहोस्"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"USB को पूर्वनिर्धारित कन्फिगरेसन"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"अर्को यन्त्र जडान भएको र तपाईंको फोन अनलक भएको खण्डमा यी सेटिङहरू लागू हुने छन्‌। विश्वसनीय यन्त्रहरूमा मात्र जडान गर्नुहोस्‌।"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"यो यन्त्रलाई चार्ज गर्दै"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"जडान गरिएको यन्त्र चार्ज गर्दै"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> मेमोरीमध्ये औसत <xliff:g id="USED_MEMORY">%1$s</xliff:g> प्रयोगमा छ"</string>
     <string name="users_summary" msgid="1674864467098487328">"<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> पूर्वनिर्धारित छ"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"सक्रिय छ"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"निष्क्रिय"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"सक्रिय"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"निष्क्रिय"</string>
     <string name="backup_disabled" msgid="485189128759595412">"ब्याकअप असक्षम गरियो"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> मा अद्यावधिक गरियो"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"अद्यावधिक उपलब्ध छ"</string>
@@ -3659,9 +3666,10 @@
     <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">"प्रणालीको UI को प्रदर्शन मोड"</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="window_trace_quick_settings_title" msgid="3839917000546526898">"विन्डो ट्रेस"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"सतह पत्ता लगाउने कार्य"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"कार्य प्रोफाइलका सेटिङहरू"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"सम्पर्कको खोजी"</string>
@@ -3857,4 +3865,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"सवारी चलाउँदा ब्लुटुथ प्रयोग गर्नु…"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"सवारी चलाउँदा ब्लुटुथ स्वतः सक्रिय गर्नुहोस्"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android ८.० को ब्याट्रीसम्बन्धी सेटिङहरू हेर्नुहोस्‌"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index 11765ce..2e880c6 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 uur"</item>
     <item msgid="5198271470953124739">"Geen time-out"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (standaard)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Slecht"</item>
     <item msgid="2042505933058940139">"Slecht"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Behandelen als gemeten"</item>
     <item msgid="2266114985518865625">"Behandelen als niet-gemeten"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automatisch (gebaseerd op tijdstip van de dag)"</item>
+    <item msgid="6620560879508595181">"Altijd aan"</item>
+    <item msgid="6385301106124765323">"Altijd uit"</item>
+  </string-array>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 9b270ac..1b5bc00 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Instellingen onthouden"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maximum aantal verbonden Bluetooth-audioapparaten"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Selecteer het maximum aantal verbonden Bluetooth-audioapparaten"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Bluetooth AVDTP-vertragingsrapporten inschakelen"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"De ontvangst van Bluetooth AVDTP-vertragingsrapporten toestaan"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Casten"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Draadloze weergave inschakelen"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Geen apparaten in de buurt gevonden."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Locatie voor werkprofiel"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Machtigingen op app-niveau"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Recente locatieverzoeken"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Er zijn geen apps die je locatie onlangs hebben aangevraagd"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Locatieservices"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Hoog accugebruik"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Service gebruiken"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Kleurcorrectie gebruiken"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Ondertiteling gebruiken"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"AAN"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"UIT"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Aan"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Uit"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Weergeven in Snelle instellingen"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Correctiemodus"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Voordat je de opslag voor certificaatgegevens kunt gebruiken, moet je apparaat een beveiligd vergrendelingsscherm hebben"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"VERGRENDELING INST."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps met gebruikstoegang"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Toon voor noodoproep"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Back-up en herstel"</string>
@@ -2888,6 +2893,7 @@
     <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>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Inactieve display, vergrendelingsscherm"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"vingerafdruk"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wifi NFC-tag instellen"</string>
     <string name="write_tag" msgid="8571858602896222537">"Schrijven"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tik op een tag om te schrijven..."</string>
@@ -2921,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Afspelen op dockluidspreker"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Alle audio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Alleen media-audio"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Stil"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Waarschuwing"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Trillen"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Opstartgeluiden"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Nooit"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Wijzigen in \'Alleen wekkers\' tot <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Wijzigen in \'Altijd onderbreken\'"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Wanneer het scherm is ingeschakeld"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Meldingen die op stil zijn gezet door \'Niet storen\', het scherm laten inschakelen"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Meldingen die door \'Niet storen\' zijn gedempt, op het scherm laten weergeven en een pictogram in de statusbalk weergeven"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Wanneer het scherm is uitgeschakeld"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Toestaan dat meldingen die op stil zijn gezet door \'Niet storen\', het scherm inschakelen of het meldingslampje laten knipperen"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Meldingen die op stil zijn gezet door \'Niet storen\', het scherm laten inschakelen"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Dit apparaat gebruiken als MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB gebruiken voor"</string>
     <string name="usb_use_also" msgid="557340935190819370">"USB ook gebruiken voor"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Standaard USB-configuratie"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Wanneer er een ander apparaat is verbonden en je telefoon is ontgrendeld, worden deze instellingen toegepast. Maak alleen verbinding met vertrouwde apparaten."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Dit apparaat opladen"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Verbonden apparaat wordt opgeladen"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Gem. <xliff:g id="USED_MEMORY">%1$s</xliff:g> van <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> geheugen gebruikt"</string>
     <string name="users_summary" msgid="1674864467098487328">"Ingelogd als <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> is standaard"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"AAN"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"UIT"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Aan"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Uit"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Back-up uitgeschakeld"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Geüpdatet naar Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Update beschikbaar"</string>
@@ -3657,9 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Verbonden met <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Verbonden met meerdere apparaten"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Demomodus voor systeemgebruikersinterface"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Nachtmodus"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Nachtmodus instellen"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Ontwikkelaarstegels voor Snelle instellingen"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Spoor voor venster"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Oppervlaktespoor"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope-tracering"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Instellingen voor werkprofiel"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Contacten zoeken"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Bluetooth gebruiken tijdens rijden"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Bluetooth automatisch inschakelen tijdens het rijden"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Batterij-instellingen voor Android 8.0 weergeven"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-or/arrays.xml b/res/values-or/arrays.xml
index 4b99711..93ccfdd 100644
--- a/res/values-or/arrays.xml
+++ b/res/values-or/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"୧ ଘଣ୍ଟା"</item>
     <item msgid="5198271470953124739">"କେବେବି ବନ୍ଦ କରନାହିଁ"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"୧ (ପୂର୍ବ-ନିର୍ଦ୍ଧାରିତ)"</item>
-    <item msgid="7584056855393485416">"୨"</item>
-    <item msgid="844570832050176311">"୩"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"୨"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"ଖରାପ"</item>
     <item msgid="2042505933058940139">"ଖରାପ"</item>
@@ -497,4 +489,7 @@
     <item msgid="8745603368609022803">"ମାପ ହୋଇଥିବା ସଂଯୋଗ ରୂପେ ବିବେଚନା କରନ୍ତୁ"</item>
     <item msgid="2266114985518865625">"ଅପରିମିତ ସଂଯୋଗ ରୂପେ ବିବେଚନା କରନ୍ତୁ"</item>
   </string-array>
+    <!-- no translation found for dark_ui_mode_entries:0 (146804192658443142) -->
+    <!-- no translation found for dark_ui_mode_entries:1 (6620560879508595181) -->
+    <!-- no translation found for dark_ui_mode_entries:2 (6385301106124765323) -->
 </resources>
diff --git a/res/values-pa/arrays.xml b/res/values-pa/arrays.xml
index 3d86192..0f3a920 100644
--- a/res/values-pa/arrays.xml
+++ b/res/values-pa/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 ਘੰਟਾ"</item>
     <item msgid="5198271470953124739">"ਕਦੇ ਵੀ ਸਮਾਂ ਸਮਾਪਤ ਨਹੀਂ"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (ਪੂਰਵ-ਨਿਰਧਾਰਤ)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"ਖ਼ਰਾਬ"</item>
     <item msgid="2042505933058940139">"ਕਮਜ਼ੋਰ"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"ਮੀਟਰਬੱਧ ਮੰਨੋ"</item>
     <item msgid="2266114985518865625">"ਗੈਰ-ਮੀਟਰਬੱਧ ਮੰਨੋ"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"ਸਵੈਚਲਿਤ (ਦਿਨ ਦੇ ਸਮੇਂ ਅਨੁਸਾਰ)"</item>
+    <item msgid="6620560879508595181">"ਹਮੇਸ਼ਾਂ ਚਾਲੂ"</item>
+    <item msgid="6385301106124765323">"ਹਮੇਸ਼ਾਂ ਬੰਦ"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 2b0bc3e..3af3969 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ਸੈਟਿੰਗਾਂ ਯਾਦ ਰੱਖੋ"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"ਵੱਧ ਤੋਂ ਵੱਧ ਕਨੈਕਟ ਕੀਤੇ ਬਲੂਟੁੱਥ ਆਡੀਓ ਡੀਵਾਈਸ"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"ਵੱਧ ਤੋਂ ਵੱਧ ਕਨੈਕਟ ਕੀਤੇ ਬਲੂਟੁੱਥ ਆਡੀਓ ਡੀਵਾਈਸ ਚੁਣੋ"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"ਬਲੂਟੁੱਥ AVDTP ਦੇਰੀ ਦੀਆਂ ਰਿਪੋਰਟਾਂ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"ਬਲੂਟੁੱਥ AVDTP ਦੇਰੀ ਦੀਆਂ ਰਿਪੋਰਟਾਂ ਪ੍ਰਾਪਤ ਕਰਨ ਦਿਓ"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"ਕਾਸਟ"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"ਵਾਇਰਲੈਸ ਡਿਸਪਲੇ ਚਾਲੂ ਕਰੋ"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"ਕੋਈ ਨੇੜਲੀਆਂ ਡਿਵਾਈਸਾਂ ਨਹੀਂ ਮਿਲੀਆਂ।"</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਲਈ ਟਿਕਾਣਾ"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"ਐਪ-ਪੱਧਰ ਇਜਾਜ਼ਤਾਂ"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"ਹਾਲੀਆ ਟਿਕਾਣਾ ਬੇਨਤੀਆਂ"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"ਕਿਸੇ ਐਪਸ ਨੇ ਹਾਲ ਵਿੱਚ ਹੀ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਕੀਤੀ ਹੈ"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"ਉੱਚ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"ਸੇਵਾ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"ਰੰਗ ਸੁਧਾਈ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"ਸੁਰਖੀਆਂ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ਚਾਲੂ"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ਬੰਦ"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"ਚਾਲੂ"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"ਬੰਦ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"ਤਤਕਾਲ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਦਿਖਾਓ"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"ਸੰਸ਼ੋਧਨ ਮੋਡ"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਵਰਤੇ ਜਾ ਸਕਣ ਤੋਂ ਪਹਿਲਾਂ, ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਸੁਰੱਖਿਅਤ ਸਕ੍ਰੀਨ ਲਾਕ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ਲਾਕ ਸੈੱਟ ਕਰੋ"</string>
     <string name="usage_access_title" msgid="332333405495457839">"ਵਰਤੋਂ ਤੱਕ ਪਹੁੰਚ ਵਾਲੀਆਂ ਐਪਾਂ"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"ਸੰਕਟਕਾਲੀਨ ਟੋਨ"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"ਜਦੋਂ ਇੱਕ ਸੰਕਟਕਾਲੀਨ ਕਾਲ ਕੀਤੀ ਜਾਂਦੀ ਹੈ ਤਾਂ ਵਿਵਹਾਰ ਸੈੱਟ ਕਰੋ"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"ਬੈਕਅੱਪ"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"ਬੈਕਅੱਪ &amp; ਰੀਸਟੋਰ ਕਰੋ"</string>
@@ -2888,6 +2893,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"ਸੀਰੀਅਲ ਨੰਬਰ, ਹਾਰਡਵੇਅਰ ਵਰਜਨ"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"Android ਸੁਰੱਖਿਆ ਪੈਚ ਪੱਧਰ, ਬੇਸਬੈਂਡ ਵਰਜਨ, ਕਰਨਲ ਵਰਜਨ"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"ਤੱਕਣੀਯੋਗ ਡਿਸਪਲੇ, ਲਾਕ ਸਕ੍ਰੀਨ ਡਿਸਪਲੇ"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ਵਾਈ-ਫਾਈ NFC ਟੈਗ ਸੈੱਟ ਅੱਪ ਕਰੋ"</string>
     <string name="write_tag" msgid="8571858602896222537">"ਲਿਖੋ"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ਲਿਖਣ ਲਈ ਇੱਕ ਟੈਗ ਟੈਪ ਕਰੋ..."</string>
@@ -2921,9 +2927,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"ਸ਼ਾਂਤ"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"ਚਿਤਾਵਨੀ"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ਥਰਥਰਾਹਟ ਕਰੋ"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"ਚਾਲੂ ਹੋਣ \'ਤੇ ਵੱਜਣ ਵਾਲੀਆਂ ਧੁਨੀਆਂ"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"ਕਦੇ ਵੀ ਨਹੀਂ"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"ਅਲਾਰਮ ਨੂੰ ਸਿਰਫ਼ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> ਤੱਕ ਬਦਲੋ"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"ਹਮੇਸ਼ਾਂ ਵਿਘਨ ਪਾਓ ਵਿੱਚ ਬਦਲੋ"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"ਜਦੋਂ ਸਕ੍ਰੀਨ ਚਾਲੂ ਹੋਵੇ"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਵੱਲੋਂ ਚੁੱਪ ਕਰਵਾਈਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਸਕ੍ਰੀਨ \'ਤੇ ਦਿਖਣ ਦਿਓ"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਵੱਲੋਂ ਖਾਮੋਸ਼ ਕਰਵਾਈਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਸਕ੍ਰੀਨ \'ਤੇ ਦਿਖਣ ਦਿਓ ਅਤੇ ਇੱਕ ਸਥਿਤੀ ਪੱਟੀ ਪ੍ਰਤੀਕ ਦਿਖਾਉਣ ਦਿਓ"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"ਜਦੋਂ ਸਕ੍ਰੀਨ ਬੰਦ ਹੋਵੇ"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਵੱਲੋਂ ਚੁੱਪ ਕਰਵਾਈਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਸਕ੍ਰੀਨ ਚਾਲੂ ਕਰਨ ਅਤੇ ਰੋਸ਼ਨੀ ਨੂੰ ਟਿਮ-ਟਿਮਾਉਣ ਦਿਓ"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਵੱਲੋਂ ਚੁੱਪ ਕਰਵਾਈਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਸਕ੍ਰੀਨ ਚਾਲੂ ਕਰਨ ਦਿਓ"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"ਇਸ ਡੀਵਾਈਸ ਦੀ MIDI ਵਜੋਂ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="usb_use" msgid="3372728031108932425">"ਇਸ ਲਈ USB ਦਾ ਉਪਯੋਗ ਕਰੋ"</string>
     <string name="usb_use_also" msgid="557340935190819370">"ਇਸ ਲਈ ਵੀ USB ਵਰਤੋ"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"ਪੂਰਵ-ਨਿਰਧਾਰਤ USB ਸੰਰੂਪਣ"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"ਜਦੋਂ ਕੋਈ ਹੋਰ ਡੀਵਾਈਸ ਕਨੈਕਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕੀਤਾ ਜਾਂਦਾ ਹੈ, ਤਾਂ ਇਹ ਸੈਟਿੰਗਾਂ ਲਾਗੂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਸਿਰਫ਼ ਭਰੋਸੇਯੋਗ ਡੀਵਾਈਸਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ।"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਚਾਰਜ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"ਕਨੈਕਟ ਕੀਤੇ ਡੀਵਾਈਸ ਨੂੰ ਚਾਰਜ ਕਰਨਾ"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> ਵਿੱਚੋਂ ਔਸਤ <xliff:g id="USED_MEMORY">%1$s</xliff:g> ਮੇਮੋਰੀ ਵਰਤੀ ਗਈ"</string>
     <string name="users_summary" msgid="1674864467098487328">"<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> ਪੂਰਵ-ਨਿਰਧਾਰਤ ਹੈ"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"ਚਾਲੂ"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"ਬੰਦ"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"ਚਾਲੂ"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"ਬੰਦ"</string>
     <string name="backup_disabled" msgid="485189128759595412">"ਬੈਕ ਅੱਪ ਬੰਦ ਕੀਤਾ ਗਿਆ"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"ਅੱਪਡੇਟ ਕਰਕੇ Android <xliff:g id="VERSION">%1$s</xliff:g> ਕੀਤਾ ਗਿਆ"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"ਅੱਪਡੇਟ ਉਪਲਬਧ ਹੈ"</string>
@@ -3657,9 +3664,10 @@
     <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">"ਸਿਸਟਮ UI ਡੈਮੋ ਮੋਡ"</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="window_trace_quick_settings_title" msgid="3839917000546526898">"ਵਿੰਡੋ ਟ੍ਰੇਸ"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"ਸਤ੍ਹਾ ਟ੍ਰੇਸ"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਸੈਟਿੰਗਾਂ"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"ਸੰਪਰਕ ਖੋਜ"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"ਗੱਡੀ ਚਲਾਉਣ ਵੇਲੇ ਬਲੂਟੁੱਥ ਵਰਤੋ"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"ਗੱਡੀ ਚਲਾਉਣ ਵੇਲੇ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਬਲੂਟੁੱਥ ਚਾਲੂ ਕਰੋ"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 ਦੀਆਂ ਬੈਟਰੀ ਸੈਟਿੰਗਾਂ ਦੇਖੋ"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index ac2140a..337f1b3 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 godz."</item>
     <item msgid="5198271470953124739">"Brak limitu czasu"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (domyślnie)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Słaba"</item>
     <item msgid="2042505933058940139">"Słaba"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Traktuj jako sieć z pomiarem użycia danych"</item>
     <item msgid="2266114985518865625">"Traktuj jako sieć bez pomiaru użycia danych"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automatycznie (na podstawie pory dnia)"</item>
+    <item msgid="6620560879508595181">"Zawsze włączony"</item>
+    <item msgid="6385301106124765323">"Zawsze wyłączony"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 0fbcf1c..d8edbcd 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -729,6 +729,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamiętaj ustawienia"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maksymalna liczba podłączonych urządzeń audio Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Wybierz maksymalną liczbę podłączonych urządzeń audio Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Włącz raporty o opóźnieniach Bluetooth AVDTP"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Zezwól na otrzymywanie raportów o opóźnieniach Bluetooth AVDTP"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Przesyłanie ekranu"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Wyświetlacz bezprzewodowy"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Brak urządzeń w pobliżu."</string>
@@ -1467,6 +1469,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Lokalizacja dla profilu do pracy"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Uprawnienia na poziomie aplikacji"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Ostatnie prośby o lokalizację"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Żadne aplikacje nie poprosiły ostatnio o lokalizację"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Usługi lokalizacyjne"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Wysokie użycie baterii"</string>
@@ -1908,8 +1912,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Użyj usługi"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Użyj korekcji kolorów"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Użyj napisów"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"WŁ."</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"WYŁ."</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Wł."</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Wył."</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Pokaż w szybkich ustawieniach"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Tryb korekcji"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2365,7 +2369,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Jeśli chcesz korzystać z magazynu danych logowania, musisz skonfigurować na urządzeniu ekran blokady"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"USTAW BLOKADĘ"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Aplikacje monitorujące"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Sygnał alarmowy"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Tworzenie i przywracanie kopii zapasowej"</string>
@@ -2950,6 +2955,7 @@
     <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>
     <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>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Skonfiguruj tag NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapisz"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Kliknij tag, by zapisać..."</string>
@@ -2983,9 +2989,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Głośnik w doku odtwarza"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Wszystkie dźwięki"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Tylko dźwięk multimediów"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Bez dźwięku"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alert"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Wibracje"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Włącz dźwięki"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Nigdy"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3248,7 +3257,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Zmień na same alarmy do <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Zmień na ciągle powiadamianie"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Gdy ekran jest włączony"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Powiadomienia wyciszone w trybie Nie przeszkadzać będą pojawiać się na ekranie"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Powiadomienia wyciszone w trybie Nie przeszkadzać będą pojawiać się na ekranie i wyświetlać ikonę na pasku stanu"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Gdy ekran jest wyłączony"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Powiadomienia wyciszone w trybie Nie przeszkadzać będą włączać ekran i będą sygnalizowane diodą"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Powiadomienia wyciszone w trybie Nie przeszkadzać będą włączać ekran"</string>
@@ -3448,10 +3457,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Użyj tego urządzenia jako MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Użyj USB do:"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Dodatkowe tryby USB"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Domyślna konfiguracja USB"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Te ustawienia będą obowiązywać, gdy zostanie połączone inne urządzenie, a Twój telefon będzie odblokowany. Łącz się tylko z zaufanymi urządzeniami."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Ładowanie tego urządzenia"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Ładowanie podłączonego urządzenia"</string>
@@ -3576,8 +3583,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Średnie wykorzystanie pamięci: <xliff:g id="USED_MEMORY">%1$s</xliff:g> z <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"Jesteś zalogowany jako <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="payment_summary" msgid="3472482669588561110">"Domyślna aplikacja to <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"WŁ."</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"WYŁ."</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Wł."</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Wył."</string>
     <string name="backup_disabled" msgid="485189128759595412">"Kopia zapasowa wyłączona"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Zaktualizowano do Androida <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Dostępna aktualizacja"</string>
@@ -3761,9 +3768,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Połączono z: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Połączono z wieloma urządzeniami"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Tryb demonstracyjny interfejsu"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Tryb nocny"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Ustaw Tryb nocny"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Kafelki szybkich ustawień dla programisty"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Monitorowanie okien"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Śledzenie powierzchni"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Śledzenie 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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Ustawienia profilu do pracy"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Wyszukiwanie kontaktów"</string>
@@ -3979,4 +3987,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Używaj Bluetootha podczas jazdy"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Włącz Bluetooth automatycznie podczas jazdy"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Zobacz ustawienia baterii w Androidzie 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml
index 0368567..72ec75e 100644
--- a/res/values-pt-rBR/arrays.xml
+++ b/res/values-pt-rBR/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"Uma hora"</item>
     <item msgid="5198271470953124739">"Nunca definir tempo limite"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (padrão)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Ruim"</item>
     <item msgid="2042505933058940139">"Fraca"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Tratar como limitada"</item>
     <item msgid="2266114985518865625">"Tratar como ilimitada"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automático (com base na hora do dia)"</item>
+    <item msgid="6620560879508595181">"Sempre ativado"</item>
+    <item msgid="6385301106124765323">"Sempre desativado"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 10e0776..a437cce 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Lembrar configurações"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Número máximo de dispositivos de áudio Bluetooth conectados"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Selecione o número máximo de dispositivos de áudio Bluetooth conectados"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Ativar relatórios de atraso AVDTP via Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Permitir o recebimento de relatórios de atraso AVDTP via Bluetooth"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Transmitir"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Ativar tela sem fio"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nenhum dispositivo próximo encontrado."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Local do perfil de trabalho"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Permissões no nível do app"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Solicitações recentes"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Nenhum app solicitou a localização recentemente"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Serviços de localização"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Uso da bateria elevado"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Usar serviço"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Usar correção de cor"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Usar legendas"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ATIVAR"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESATIVAR"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Ativado"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Desativado"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar em \"Configurações rápidas\""</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Modo de correção"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2254,7 +2258,7 @@
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Este serviço de entrada por voz poderá executar monitoramento por voz sempre ativado e apps com o recurso de controle por voz em seu nome. Ele está incluído no app <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Quer ativar o uso deste serviço?"</string>
     <string name="tts_engine_preference_title" msgid="1578826947311494239">"Mecanismo preferencial"</string>
     <string name="tts_engine_settings_title" msgid="6886964122861384818">"Configurações do mecanismo"</string>
-    <string name="tts_sliders_title" msgid="992059150784095263">"Taxa de fala e frequência do som"</string>
+    <string name="tts_sliders_title" msgid="992059150784095263">"Taxa e tom da fala"</string>
     <string name="tts_engine_section_title" msgid="6289240207677024034">"Mecanismo"</string>
     <string name="tts_install_voice_title" msgid="6275828614052514320">"Vozes"</string>
     <string name="tts_spoken_language" msgid="5542499183472504027">"Idioma falado"</string>
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Para que você possa usar o armazenamento de credenciais, seu dispositivo precisa ter uma tela de bloqueio"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"DEFINIR BLOQUEIO"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps com acesso ao uso"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Tom de emergência"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Backup e restauração"</string>
@@ -2731,7 +2736,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Alterar PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostrar notificações"</string>
     <string name="help_label" msgid="6886837949306318591">"Ajuda e feedback"</string>
-    <string name="support_summary" msgid="2705726826263742491">"Artigos de ajuda, telefone e bate-papo, primeiros passos"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Ajuda, início, telefone e bate-papo"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Conta para conteúdo"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID de foto"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Ameaças extremas"</string>
@@ -2888,6 +2893,7 @@
     <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>
     <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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Gravar"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Toque em uma marca para gravar…"</string>
@@ -2921,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Repr. de alto-falante em dock"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Todo o áudio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Somente áudio de mídia"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Silencioso"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerta"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibração"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Ativar sons"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Nunca"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Alterar para \"Somente alarmes\" até <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Alterar para \"Sempre interromper\""</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Quando a tela estiver ativada"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Permitir que as notificações silenciadas pelo modo \"Não perturbe\" sejam exibidas na tela"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Permitir que as notificações silenciadas pelo modo \"Não perturbe\" sejam exibidas na tela e mostrem um ícone na barra de status"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Quado a tela estiver desativada"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Permitir que as notificações silenciadas pelo modo \"Não perturbe\" ativem a tela e façam a luz piscar"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Permitir que as notificações silenciadas pelo modo \"Não perturbe\" ativem a tela"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Usar este dispositivo como MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Usar USB para"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Também usar o USB para"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Configuração USB padrão"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Quando outro dispositivo estiver conectado e seu smartphone estiver desbloqueado, essas configurações serão aplicadas. Conecte-se apenas a dispositivos confiáveis."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Para carregamento do dispositivo"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Carregando dispositivo conectado"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Média de <xliff:g id="USED_MEMORY">%1$s</xliff:g> de <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> de memória usados"</string>
     <string name="users_summary" msgid="1674864467098487328">"Conectado como <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> é padrão"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"ATIVADA"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"DESATIVADA"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Ativado"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Desativado"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Backup desativado"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Atualizado para o Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Atualização disponível"</string>
@@ -3657,9 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Conectado a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Conectado a vários dispositivos"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Modo de demonstração da IU do sistema"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Modo noturno"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Definir modo noturno"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Blocos de desenvolvedor para configurações rápidas"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Rastros da janela"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Rastros de superfície"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Rastreamento do 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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Configurações do perfil de trabalho"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Pesquisa de contatos"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Usar Bluetooth ao dirigir"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Ativar Bluetooth automaticamente ao dirigir"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Ver configurações de bateria do Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 219373a..84fd178 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 hora"</item>
     <item msgid="5198271470953124739">"Nunca exceder tempo limite"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (predefinição)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Fraco"</item>
     <item msgid="2042505933058940139">"Fraca"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Tratar como acesso limitado"</item>
     <item msgid="2266114985518865625">"Tratar como acesso ilimitado"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automático (com base na hora do dia)"</item>
+    <item msgid="6620560879508595181">"Sempre ativado"</item>
+    <item msgid="6385301106124765323">"Sempre desativado"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 78e85d1..756a2ab 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Memorizar definições"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Máximo de dispositivos de áudio Bluetooth associados"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Selecione o número máximo de dispositivos de áudio Bluetooth associados."</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Ativar relatórios de atraso AVDTP por Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Permita a receção de relatórios de atraso AVDTP por Bluetooth."</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Transmitir"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Ativar display sem fios"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nenhum dispositivo nas proximidades."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Local. para perfil de trabalho"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Autoriz. de nível de aplicação"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Pedidos de localização recentes"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Nenhuma aplicação solicitou a localização recentemente"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Serviços de localização"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Utilização de bateria elevada"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Utilizar o serviço"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Utilizar a correção da cor"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Utilizar as legendas"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ATIVADO"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESATIVADO"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Ativado"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Desativado"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar nas Definições rápidas"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Modo de correção"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Antes de poder utilizar o armazenamento de credenciais, o seu dispositivo tem de possuir um ecrã de bloqueio seguro"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"DEFINIR BLOQUEIO"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps com acesso de utilização"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Tom de emergência"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Fazer cópia de segurança e restaurar"</string>
@@ -2888,6 +2893,7 @@
     <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>
     <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>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Config. etiqueta NFC p/ Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escrever"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Toque numa etiqueta para escrever..."</string>
@@ -2921,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Repr. da col. da est. de anc."</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Todo o áudio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Apenas áudio multimédia"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Silencioso"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerta"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrar"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Ativar sons"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Nunca"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Alterar para alarmes apenas, até <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Alterar para interromper sempre"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Quando o ecrã estiver ligado"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Permitir que as notificações silenciadas pelo modo Não incomodar surjam no ecrã"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Permita que as notificações silenciadas pelo modo Não incomodar surjam no ecrã e apresentem um ícone na barra de estado."</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Quando o ecrã estiver desligado"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Permitir que as notificações silenciadas pelo modo Não incomodar liguem o ecrã e ativem a luz de forma intermitente"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Permitir que as notificações silenciadas pelo modo Não incomodar liguem o ecrã"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Utilizar este dispositivo como MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Utilizar USB para"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Utilizar o USB também para"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Configuração USB predefinida"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Quando outro dispositivo estiver ligado e o telemóvel estiver desbloqueado, estas definições serão aplicadas. Ligue-se apenas a dispositivos fidedignos."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Carregar este dispositivo"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Carregar o dispositivo ligado"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Média de <xliff:g id="USED_MEMORY">%1$s</xliff:g> de <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> de memória utilizado(s)"</string>
     <string name="users_summary" msgid="1674864467098487328">"Sessão iniciada como <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> é a aplicação predefinida"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"ATIVADA"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"DESATIVADA"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Ativada"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Desativada"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Cópia de segurança desativada"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Atualizado para o Android <xliff:g id="VERSION">%1$s</xliff:g>."</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Atualização disponível."</string>
@@ -3657,9 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Ligado a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Ligado a vários dispositivos"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Modo de demonstração da IU do sistema"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Modo noturno"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Definir o modo noturno"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Mosaicos de definições rápidas do programador"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Window Trace"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Surface Trace"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope Trace"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Definições do perfil de trabalho"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Pesquisa de contactos"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Usar o Bluetooth durante a condução"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Ativar automaticamente o Bluetooth durante a condução"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Consultar as definições da bateria do Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 0368567..72ec75e 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"Uma hora"</item>
     <item msgid="5198271470953124739">"Nunca definir tempo limite"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (padrão)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Ruim"</item>
     <item msgid="2042505933058940139">"Fraca"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Tratar como limitada"</item>
     <item msgid="2266114985518865625">"Tratar como ilimitada"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automático (com base na hora do dia)"</item>
+    <item msgid="6620560879508595181">"Sempre ativado"</item>
+    <item msgid="6385301106124765323">"Sempre desativado"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 10e0776..a437cce 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Lembrar configurações"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Número máximo de dispositivos de áudio Bluetooth conectados"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Selecione o número máximo de dispositivos de áudio Bluetooth conectados"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Ativar relatórios de atraso AVDTP via Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Permitir o recebimento de relatórios de atraso AVDTP via Bluetooth"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Transmitir"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Ativar tela sem fio"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nenhum dispositivo próximo encontrado."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Local do perfil de trabalho"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Permissões no nível do app"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Solicitações recentes"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Nenhum app solicitou a localização recentemente"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Serviços de localização"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Uso da bateria elevado"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Usar serviço"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Usar correção de cor"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Usar legendas"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ATIVAR"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESATIVAR"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Ativado"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Desativado"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar em \"Configurações rápidas\""</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Modo de correção"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2254,7 +2258,7 @@
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Este serviço de entrada por voz poderá executar monitoramento por voz sempre ativado e apps com o recurso de controle por voz em seu nome. Ele está incluído no app <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Quer ativar o uso deste serviço?"</string>
     <string name="tts_engine_preference_title" msgid="1578826947311494239">"Mecanismo preferencial"</string>
     <string name="tts_engine_settings_title" msgid="6886964122861384818">"Configurações do mecanismo"</string>
-    <string name="tts_sliders_title" msgid="992059150784095263">"Taxa de fala e frequência do som"</string>
+    <string name="tts_sliders_title" msgid="992059150784095263">"Taxa e tom da fala"</string>
     <string name="tts_engine_section_title" msgid="6289240207677024034">"Mecanismo"</string>
     <string name="tts_install_voice_title" msgid="6275828614052514320">"Vozes"</string>
     <string name="tts_spoken_language" msgid="5542499183472504027">"Idioma falado"</string>
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Para que você possa usar o armazenamento de credenciais, seu dispositivo precisa ter uma tela de bloqueio"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"DEFINIR BLOQUEIO"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps com acesso ao uso"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Tom de emergência"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Backup e restauração"</string>
@@ -2731,7 +2736,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Alterar PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostrar notificações"</string>
     <string name="help_label" msgid="6886837949306318591">"Ajuda e feedback"</string>
-    <string name="support_summary" msgid="2705726826263742491">"Artigos de ajuda, telefone e bate-papo, primeiros passos"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Ajuda, início, telefone e bate-papo"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Conta para conteúdo"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID de foto"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Ameaças extremas"</string>
@@ -2888,6 +2893,7 @@
     <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>
     <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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Gravar"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Toque em uma marca para gravar…"</string>
@@ -2921,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Repr. de alto-falante em dock"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Todo o áudio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Somente áudio de mídia"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Silencioso"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerta"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibração"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Ativar sons"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Nunca"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Alterar para \"Somente alarmes\" até <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Alterar para \"Sempre interromper\""</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Quando a tela estiver ativada"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Permitir que as notificações silenciadas pelo modo \"Não perturbe\" sejam exibidas na tela"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Permitir que as notificações silenciadas pelo modo \"Não perturbe\" sejam exibidas na tela e mostrem um ícone na barra de status"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Quado a tela estiver desativada"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Permitir que as notificações silenciadas pelo modo \"Não perturbe\" ativem a tela e façam a luz piscar"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Permitir que as notificações silenciadas pelo modo \"Não perturbe\" ativem a tela"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Usar este dispositivo como MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Usar USB para"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Também usar o USB para"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Configuração USB padrão"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Quando outro dispositivo estiver conectado e seu smartphone estiver desbloqueado, essas configurações serão aplicadas. Conecte-se apenas a dispositivos confiáveis."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Para carregamento do dispositivo"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Carregando dispositivo conectado"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Média de <xliff:g id="USED_MEMORY">%1$s</xliff:g> de <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> de memória usados"</string>
     <string name="users_summary" msgid="1674864467098487328">"Conectado como <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> é padrão"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"ATIVADA"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"DESATIVADA"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Ativado"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Desativado"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Backup desativado"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Atualizado para o Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Atualização disponível"</string>
@@ -3657,9 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Conectado a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Conectado a vários dispositivos"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Modo de demonstração da IU do sistema"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Modo noturno"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Definir modo noturno"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Blocos de desenvolvedor para configurações rápidas"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Rastros da janela"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Rastros de superfície"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Rastreamento do 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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Configurações do perfil de trabalho"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Pesquisa de contatos"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Usar Bluetooth ao dirigir"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Ativar Bluetooth automaticamente ao dirigir"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Ver configurações de bateria do Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index 9ab2548..89926c8 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 oră"</item>
     <item msgid="5198271470953124739">"Fără timp limită"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (prestabilit)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Slab"</item>
     <item msgid="2042505933058940139">"Slab"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Tratați ca fiind contorizată"</item>
     <item msgid="2266114985518865625">"Tratați ca fiind necontorizată"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automat (în funcție de ora din zi)"</item>
+    <item msgid="6620560879508595181">"Activat permanent"</item>
+    <item msgid="6385301106124765323">"Dezactivat permanent"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index cbe0669..dd35ce0 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -718,6 +718,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Rețineți setările"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Numărul maxim de dispozitive audio Bluetooth conectate"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Selectați numărul maxim de dispozitive audio Bluetooth conectate"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Activați rapoartele de întârziere AVDTP Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Permiteți primirea rapoartelor de întârziere Bluetooth AVDTP"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Proiectare"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activați ecranul wireless"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nu s-au găsit dispozitive în apropiere."</string>
@@ -1454,6 +1456,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Locație pt. profil de serviciu"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Permisiuni la nivel de aplic."</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Solicitări recente ale locației"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Nicio aplicație nu a solicitat locația recent"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Servicii de localizare"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Utilizare intensă a bateriei"</string>
@@ -1894,8 +1898,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Utilizați serviciul"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Utilizați corecția de culoare"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Utilizați subtitrările"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ACTIVAT"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DEZACTIVAT"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Activat"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Dezactivat"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Afișați în Setări rapide"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Mod de corectare"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2339,7 +2343,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Înainte de a putea folosi spațiul de stocare a certificatelor, dispozitivul trebuie să aibă un ecran de blocare de siguranță"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"CONFIGURAȚI BLOCAREA"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Aplicații cu acces de utilizare"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Ton de urgență"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Backup și restabilire"</string>
@@ -2919,6 +2924,7 @@
     <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>
     <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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurarea etichetei NFC pentru Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Scrieți"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Atingeți o etichetă pentru a scrie..."</string>
@@ -2952,9 +2958,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Redare difuzor dispoz. andoc."</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Toate semnalele audio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Numai audio multimedia"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Silențios"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alertă"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrează"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Sunete la pornire"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Niciodată"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3209,7 +3218,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Schimbați la „Numai alarme” până la <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Schimbați la „Întrerupe întotdeauna”"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Când ecranul este activat"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Permiteți notificărilor dezactivate prin Nu deranja să se afișeze pe ecran"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Permiteți notificărilor dezactivate prin Nu deranja să se afișeze pe ecran și să prezinte o pictogramă din bara de stare"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Când ecranul este dezactivat"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Permiteți notificărilor dezactivate prin Nu deranja să activeze ecranul și lumina intermitentă a LED-ului"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Permiteți notificărilor dezactivate prin Nu deranja să activeze ecranul"</string>
@@ -3403,10 +3412,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Folosiți acest dispozitiv ca MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Folosiți conexiunea USB pentru"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Folosiți conexiunea USB și pentru"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Configurație USB prestabilită"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Aceste setări se vor aplica atunci când este conectat un alt dispozitiv și telefonul este deblocat. Conectați-vă numai la dispozitive de încredere."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Încărcarea acestui dispozitiv"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Se încarcă dispozitivul conectat"</string>
@@ -3529,8 +3536,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Memorie folosită în medie: <xliff:g id="USED_MEMORY">%1$s</xliff:g> din <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"V-ați conectat ca <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> este prestabilită"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"ACTIVAT"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"DEZACTIVATĂ"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Activat"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Dezactivat"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Backupul este dezactivat"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Actualizat la Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Actualizare disponibilă"</string>
@@ -3709,9 +3716,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Conectat la <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Conectat la mai multe dispozitive"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Mod demonstrativ pentru IU sistem"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Modul noapte"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Setați Modul noapte"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Casete dezvoltator pentru setări rapide"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Urmărirea ferestrei"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Trasarea suprafeței"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Urmă 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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Setările profilului de serviciu"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Căutarea persoanelor de contact"</string>
@@ -3917,4 +3925,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Utilizați Bluetooth când conduceți"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Setați ca Bluetooth să se activeze automat când conduceți"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Vedeți setările bateriei pentru Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 0079bae..9843ec7 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 ч."</item>
     <item msgid="5198271470953124739">"Без тайм-аута"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (по умолчанию)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Слабый"</item>
     <item msgid="2042505933058940139">"Слабый"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Лимитное"</item>
     <item msgid="2266114985518865625">"Безлимитное"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Автоматически (в зависимости от времени суток)"</item>
+    <item msgid="6620560879508595181">"Всегда включен"</item>
+    <item msgid="6385301106124765323">"Всегда отключен"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index b48b8df..5898505 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -729,6 +729,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запомнить настройки"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Максимально разрешенное количество подключенных Bluetooth-аудиоустройств"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Укажите максимально разрешенное количество подключенных Bluetooth-аудиоустройств"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Отчеты о задержках Bluetooth AVDTP"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Получать отчеты о задержках Bluetooth AVDTP."</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Трансляция"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Включить"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Устройства не найдены"</string>
@@ -1467,6 +1469,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Место для рабочего профиля"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Разрешения для приложений"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Последние геозапросы"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"В последнее время приложения не запрашивали геоданные"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Мое местоположение"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Высокий расход заряда батареи"</string>
@@ -1908,8 +1912,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Использовать сервис"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Использовать коррекцию цвета"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Использовать титры"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ВКЛ."</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ОТКЛ."</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Включено"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Отключено"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Показывать в быстрых настройках"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Режим коррекции"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2365,7 +2369,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Чтобы использовать хранилище учетных данных, необходимо сначала настроить блокировку экрана на устройстве"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"НАСТРОИТЬ БЛОКИРОВКУ"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Приложения с доступом к данным"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Тональный сигнал экстренного вызова"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"Настроить режим работы при экстренном вызове"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Резервное копирование"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Резервное копирование и восстановление"</string>
@@ -2950,6 +2955,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"серийный номер, версия аппаратного обеспечения"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"обновление системы безопасности, прошивка модуля связи, версия ядра"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Автоматическое включение экрана, заблокированный экран"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"отпечаток пальца"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Настройка NFC-метки"</string>
     <string name="write_tag" msgid="8571858602896222537">"Записать"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Нажмите на метку, чтобы начать запись..."</string>
@@ -2983,9 +2989,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Без звука"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Оповещение"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вибросигнал"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Звуки при включении устройства"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Никогда"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3248,7 +3257,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Активировать режим \"Только будильник\" до <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Режим \"Не беспокоить\" отключен."</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Когда экран включен"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Показывать уведомления, заблокированные в режиме \"Не беспокоить\""</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Показывать значок в строке состояния и уведомления, заблокированные в режиме \"Не беспокоить\""</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Когда экран выключен"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Включать экран и световой индикатор для уведомлений, заблокированных в режиме \"Не беспокоить\""</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Включать экран для уведомлений, заблокированных в режиме \"Не беспокоить\""</string>
@@ -3448,10 +3457,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Использование устройства как MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Режим работы USB"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Другие способы использования USB"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Конфигурация USB по умолчанию"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Эти настройки будут применяться, когда ваш телефон разблокирован и к нему подключено другое устройство. Устанавливайте соединения только с надежными устройствами."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Зарядка этого устройства"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Зарядка подключенного устройства"</string>
@@ -3576,8 +3583,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Используется в среднем <xliff:g id="USED_MEMORY">%1$s</xliff:g> из <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"Вы вошли как <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>"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"ВКЛ."</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"ВЫКЛ."</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Включено"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Отключено"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Резервное копирование отключено"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Обновлено до Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Доступно обновление"</string>
@@ -3761,9 +3768,10 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"Фрагменты быстрых настроек"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Трассировка окон"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Трассировка поверхности"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Настройки рабочего профиля"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Поиск контактов"</string>
@@ -3979,4 +3987,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Включать Bluetooth в машине"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Автоматическое включение Bluetooth во время вождения."</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Настройки батареи для Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-si/arrays.xml b/res/values-si/arrays.xml
index 7f3e5e8..9bba9df 100644
--- a/res/values-si/arrays.xml
+++ b/res/values-si/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"පැය 1"</item>
     <item msgid="5198271470953124739">"කිසිවිටෙක කල් ඉකුත් නොවන්න"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (පෙරනිමි)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"දුර්වල"</item>
     <item msgid="2042505933058940139">"දුර්වල"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"මනින ලද ලෙස සලකන්න"</item>
     <item msgid="2266114985518865625">"නොමනින ලද ලෙස සලකන්න"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"ස්වයංක්‍රිය (දිනයේ වේලාව මත පදනම්ව)"</item>
+    <item msgid="6620560879508595181">"සැමවිට ක්‍රියාත්මකයි"</item>
+    <item msgid="6385301106124765323">"සැමවිට ක්‍රියාවිරහිතයි"</item>
+  </string-array>
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 5302550..0f2b524 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"සැකසීම් මතක තබාගන්න"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"උපරිම සම්බන්ධිත බ්ලූටූත් ශ්‍රව්‍ය උපාංග"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"සම්බන්ධිත බ්ලූටූත් ශ්‍රව්‍ය උපාංග උපරිම ගණන තෝරන්න"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"බ්ලූටූත් AVDTP ප්‍රමාද වාර්තාව සබල කරන්න"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"බ්ලූටූත් AVDTP ප්‍රමාද වාර්තාව ලැබීම ඉඩ දෙන්න"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"රැහැන් රහිත දර්ශනය සබල කරන්න"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"කිසිඳු උපාංගයක් අවටින් සොයාගත්තේ නැත."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"කාර්යාල පැතිකඩ සඳහා ස්ථානය"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"යෙදුම මට්ටමේ අවසර"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"මෑත කාලීන ස්ථාන ඉල්ලීම්"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"මෑතකදී යෙදුම් කිසිවක් ස්ථානය ඉල්ලා නැත"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"ස්ථානීය සේවා"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"ඉහළ බැටරි භාවිතය"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"සේවාව භාවිත කරන්න"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"වර්ණ නිවැරදි කිරීම භාවිත කරන්න"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"සිරස්තල භාවිත කරන්න"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ක්‍රියාත්මකයි"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ක්‍රියාවිරහිතයි"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"ක්‍රියාත්මකයි"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"ක්‍රියාවිරහිතයි"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"ඉක්මන් සැකසීම් තුළ පෙන්වන්න"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"නිවැරදි කිරීම් ප්‍රකාරය"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"ඔබට අක්තපත්‍ර ගබඩාව භාවිත කිරීමට හැකි වීමට පෙර, ඔබගේ උපාංගයට ආරක්ෂිත අගුලු තිරයක් තිබිය යුතුය"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"අගුල සකසන්න"</string>
     <string name="usage_access_title" msgid="332333405495457839">"යෙදුම් භාවිත ප්‍රවේශය"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"හදිසි නාදය"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"හදිසි ඇමතුමක් ලැබුණ විට හැසිරීම සකසන්න"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"උපස්ථය"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"උපස්ථය සහ පිළිනැගුම"</string>
@@ -2888,6 +2893,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"අනුක්‍රමික අංකය, දෘඪාංග අනුවාදය"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"Android ආරක්ෂක පැච් මට්ටම, බේස්බෑන්ඩ් අනුවාදය, කර්නල් අනුවාදය"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"පරිසර දර්ශකය, අගුලු තිර දර්ශකය"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"ඇඟිලි සලකුණ"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ටැගයක් ස්ථාපනය කරන්න"</string>
     <string name="write_tag" msgid="8571858602896222537">"ලියනවා"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ලිවීමට ටැගයට තට්ටු කරන්න..."</string>
@@ -2921,9 +2927,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"නිහඬ"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"ඇඟවීම"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"කම්පනය වන්න"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"ශබ්ද බල ගන්වන්න"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"කිසි විටක නැත"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> පමණක් දක්වා ඇති සීනු වෙත මාරු වෙන්න"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"සෑම විටම බාධා කිරීම වෙත මාරු වෙන්න"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"තිරය ක්‍රියාත්මක විට"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"තිරය මත බාධා නොකරන්න උත්පතනය කිරීමෙන් දැනුම්දීම් නිහඬ කරන්න"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Do Not Disturb මගින් නිශ්ශබ්ද කළ දැනුම්දීම් තිරය මත උත්පතනය වී තත්ත්ව තීරු නිරූපකයක් පෙන්වීමට ඉඩ දෙන්න"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"තිරය ක්‍රියාවිරහිත විට"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"තිරය මත බාධා නොකරන්න ක්‍රියාත්මක කිරීමෙන් සහ එළිය ස්පන්දනය කිරීමෙන් දැනුම්දීම් නිහඬ කරන්න"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"තිරය මත බාධා නොකරන්න ක්‍රියාත්මක කිරීමෙන් දැනුම්දීම් නිහඬ කරන්න"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"මෙම උපාංගය MIDI ලෙස භාවිත කිරිම"</string>
     <string name="usb_use" msgid="3372728031108932425">"පහත සඳහා USB භාවිතා කරන්න"</string>
     <string name="usb_use_also" msgid="557340935190819370">"USB ද භාවිත කරන්න"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"පෙරනිමි USB වින්‍යාසකරණය"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"වෙනත් උපාංගයක් සම්බන්ධ කර ඇති විට සහ ඔබේ දුරකථනය අගුලු දමා ඇති විට, මෙම සැකසීම් අදාළ වනු ඇත. විශ්වාසදායි උපාංගවලට පමණක් සම්බන්ධ වන්න."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"මෙම උපාංගය ආරෝපණය කරමින්"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"සම්බන්ධිත උපාංගය ආරෝපණය කරමින්"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> මතකයෙන් සාමාන්‍යයෙන් <xliff:g id="USED_MEMORY">%1$s</xliff:g>ක් භාවිත කෙරේ"</string>
     <string name="users_summary" msgid="1674864467098487328">"<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> පෙරනිමි වේ"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"ක්‍රියාත්මකයි"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"ක්‍රියාවිරහිතයි"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"ක්‍රියාත්මකයි"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"ක්‍රියාවිරහිතයි"</string>
     <string name="backup_disabled" msgid="485189128759595412">"උපස්ථ කිරීම අබලයි"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> වෙත යාවත්කාලීන කරන ලදි"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"යාවත්කාලීනයක් ඇත"</string>
@@ -3657,9 +3664,10 @@
     <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">"පද්ධති UI ආදර්ශන ප්‍රකාරය"</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="window_trace_quick_settings_title" msgid="3839917000546526898">"කවුළු හඹා යාම"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"මතුපිට හෝඩුවාව"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"කාර්යාල පැතිකඩ සැකසීම්"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"සම්බන්ධතා සෙවීම"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"රිය ධාවනය කරන විට බ්ලූටූත් භාවිත කරන්න"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"රිය ධාවනය කරන අතරතුර  බ්ලූටූත් සහ ස්ථානය ක්‍රියාත්මක කරන්න"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 බැටරි සැකසීම් බලන්න"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 5bcd9c5..81b7584 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 h"</item>
     <item msgid="5198271470953124739">"Bez časového limitu"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (predvolené)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Nízka"</item>
     <item msgid="2042505933058940139">"Slabé"</item>
@@ -497,7 +489,9 @@
     <item msgid="8745603368609022803">"Považovať za sieť s meraním dát"</item>
     <item msgid="2266114985518865625">"Považovať za sieť bez merania dát"</item>
   </string-array>
-    <!-- no translation found for dark_ui_mode_entries:0 (146804192658443142) -->
-    <!-- no translation found for dark_ui_mode_entries:1 (6620560879508595181) -->
-    <!-- no translation found for dark_ui_mode_entries:2 (6385301106124765323) -->
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automaticky (podľa času dňa)"</item>
+    <item msgid="6620560879508595181">"Vždy zapnuté"</item>
+    <item msgid="6385301106124765323">"Vždy vypnuté"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 849528f..fde4ea3 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -729,10 +729,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamätať nastavenia"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maximálny počet pripojených zvukových zariadení Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Výber maximálneho počtu pripojených zvukových zariadení Bluetooth"</string>
-    <!-- no translation found for bluetooth_enable_avdtp_delay_reports (5101903170688399944) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_avdtp_delay_reports_summary (7052797876020616399) -->
-    <skip />
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Povoliť prehľady oneskorení Bluetooth AVDTP"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Povoliť prijímanie prehľadov oneskorení Bluetooth AVDTP"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Prenos"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Povoliť bezdrôtové zobrazenie"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"V okolí sa nenašli žiadne zariadenia."</string>
@@ -1471,6 +1469,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Poloha pre pracovný profil"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Povolenia na úrovni aplikácie"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nedávne žiadosti o polohu"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"V poslednom čase žiadne aplikácie o polohu nepožiadali"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Služby určovania polohy"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Vysoká spotreba batérie"</string>
@@ -1912,10 +1912,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Používať službu"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Používať úpravu farieb"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Používať titulky"</string>
-    <!-- no translation found for accessibility_summary_state_enabled (7914278500885887763) -->
-    <skip />
-    <!-- no translation found for accessibility_summary_state_disabled (2984230257590246745) -->
-    <skip />
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Zapnuté"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Vypnuté"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Zobraziť v Rýchlych nastaveniach"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Režim korekcie"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2371,7 +2369,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Než budete môcť používať úložisko poverení, musí mať zariadenie nastavenú zabezpečenú uzamknutú obrazovku"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"NASTAVIŤ UZAMKNUTIE"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Prístup k dátam o používaní"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Tiesňové vyzváňanie"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Zálohovať a obnoviť"</string>
@@ -2956,8 +2955,7 @@
     <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>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambientné zobrazenie, zobrazenie uzamknutej obrazovky"</string>
-    <!-- no translation found for keywords_fingerprint_settings (239222512315619538) -->
-    <skip />
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"odtlačok prsta"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nastavenie štítka NFC pre Wi‑Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapísať"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Klepnutím na značku začnete zápis..."</string>
@@ -2991,9 +2989,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Reproduktory doku"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Všetky zvukové súbory"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Iba zvukové médiá"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Tichý režim"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Upozornenie"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrovanie"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Zvuky pri spustení"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Nikdy"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3256,8 +3257,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Zmena na možnosť Iba budíky platná do <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Zmena na možnosť Vždy prerušiť"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Keď je obrazovka zapnutá"</string>
-    <!-- no translation found for zen_mode_screen_on_summary (2208664848367443505) -->
-    <skip />
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Povoliť, aby sa upozornenia stlmené režimom Nerušiť mohli spúšťať na obrazovke a zobrazovať ikonu v stavovom riadku"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Keď je obrazovka vypnutá"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Povoliť, aby upozornenia stlmené režimom Nerušiť mohli zapnúť obrazovku a blikať svetlom"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Povoliť, aby upozornenia stlmené režimom Nerušiť mohli zapnúť obrazovku"</string>
@@ -3583,10 +3583,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Využíva sa v priemere <xliff:g id="USED_MEMORY">%1$s</xliff:g> z celkovej pamäte <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"Prihlásený používateľ <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> je predvolená aplikácia"</string>
-    <!-- no translation found for location_on_summary (3637699010986988970) -->
-    <skip />
-    <!-- no translation found for location_off_summary (7217264690673949107) -->
-    <skip />
+    <string name="location_on_summary" msgid="3637699010986988970">"Zapnuté"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Vypnuté"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Zálohovanie je zakázané"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Aktualizované na Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"K dispozícii je aktualizácia"</string>
@@ -3770,13 +3768,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Pripojené k zariadeniu <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Pripojené k viacerým zariadeniam"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Ukážka používateľského rozhrania systému"</string>
-    <!-- no translation found for dark_ui_mode (2112241426441807273) -->
-    <skip />
-    <!-- no translation found for dark_ui_mode_title (975299966259850992) -->
-    <skip />
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Nočný režim"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Nastaviť nočný režim"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Dlaždice rýchleho nastavenia pre vývojárov"</string>
-    <!-- no translation found for winscope_trace_quick_settings_title (1294290008255732032) -->
-    <skip />
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Trasovanie 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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Nastavenia pracovného profilu"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Vyhľadávanie kontaktov"</string>
@@ -3992,4 +3987,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Používať Bluetooth počas jazdy"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Automatické zapnutie rozhrania Bluetooth počas jazdy"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Zobraziť nastavenia batérie v Androide 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index e7e99e1..16b2c0d 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 ura"</item>
     <item msgid="5198271470953124739">"Brez časovne omejitve"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (privzeto)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Slaba"</item>
     <item msgid="2042505933058940139">"Šibko"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Obravnavaj kot omrežje z omejeno količino prenosa podatkov"</item>
     <item msgid="2266114985518865625">"Obravnavaj kot omrežje z neomejeno količino prenosa podatkov"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Samodejno (glede na uro dneva)"</item>
+    <item msgid="6620560879508595181">"Vedno vklopljeno"</item>
+    <item msgid="6385301106124765323">"Vedno izklopljeno"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 1f1e1d2..bea56fe 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -729,6 +729,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapomni si nastavitve"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Največje dovoljeno število povezanih zvočnih naprav Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Izberite največje dovoljeno število povezanih zvočnih naprav Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Omogoči poročila o zakasnitvah AVDTP prek Bluetootha"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Dovoli prejemanje poročil o zakasnitvah AVDTP prek Bluetootha"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Predvajanje"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Omogočanje brezžičnega zaslona"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"V bližini ni naprav."</string>
@@ -1467,6 +1469,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Mesto za delovni profil"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Dovoljenja na ravni aplikacije"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nedavne zahteve za lokacijo"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"V zadnjem času ni nobena aplikacija zahtevala lokacijskih podatkov"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Lokacijske storitve"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Visoka poraba akumulatorja"</string>
@@ -1908,8 +1912,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Uporaba storitve"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Uporaba popravljanja barv"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Uporaba napisov"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"VKLOPLJENO"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"IZKLOPLJENO"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Vklopljeno"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Izklopljeno"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Prikaži v »Hitrih nastavitvah«"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Način za popravljanje"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2365,7 +2369,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Preden lahko uporabite shrambo poverilnic, morate v napravi nastaviti varno zaklepanje zaslona."</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"NASTAVITEV ZAKLEPANJA"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apl. z dost. do pod. o uporabi"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Ton v sili"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Varnostno kopiranje in obnovitev"</string>
@@ -2950,6 +2955,7 @@
     <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>
     <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>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nastavitev brezžič. oznake NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapiši"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Dotaknite se oznake za zapisovanje ..."</string>
@@ -2983,9 +2989,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Zvočnik nosilca je vklopljen"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Vsi zvoki"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Samo zvoki predstavnosti"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Tiho"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Opozorilo"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibriranje"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Zvoki ob zagonu"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Nikoli"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3248,7 +3257,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Sprememba na samo alarme do <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Sprememba na vedno prekini"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Pri vklopljenem zaslonu"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Obvestilom, utišanim z načinom »ne moti«, dovoli, da se prikažejo na zaslonu"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Obvestilom, utišanim z načinom »ne moti«, dovoli, da se prikažejo na zaslonu skupaj z ikono v vrstici stanja"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Pri izklopljenem zaslonu"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Obvestilom, utišanim z načinom »ne moti«, dovoli, da vklopijo zaslon in sprožijo utripanje lučke"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Obvestilom, utišanim z načinom »ne moti«, dovoli, da vklopijo zaslon"</string>
@@ -3448,10 +3457,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Uporaba te naprave kot vmesnik MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Uporaba povezave USB za"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Uporabi USB tudi za"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Privzeta konfiguracija povezave USB"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Te nastavitve bodo uporabljene, ko bo telefon odklenjen in povezan z drugo napravo. Telefon povežite samo z zaupanja vrednimi napravami."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Polnjenje te naprave"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Polnjenje akumulatorja v povezani napravi"</string>
@@ -3576,8 +3583,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Povprečna uporaba pomnilnika: <xliff:g id="USED_MEMORY">%1$s</xliff:g> od <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"Prijavljeni ste kot <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> je privzeta aplikacija"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"Vklopljeno"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"IZKLOPLJENO"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Vklopljeno"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Izklopljeno"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Varnostno kopiranje je onemogočeno"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Posodobljeno na Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Na voljo je posodobljena različica"</string>
@@ -3761,9 +3768,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Povezan z napravo <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Povezan z več napravami"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Predstavitveni način uporabniškega vmesnika sistema"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Nočni način"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Nastavitev nočnega načina"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Ploščice razvijalcev za hitre nastavitve"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Sled okna"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Sled površinske plasti"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Sledenje z apl. 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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Nastavitve delovnega profila"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Iskanje po stikih"</string>
@@ -3979,4 +3987,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Uporaba Bluetootha med vožnjo"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Samodejni vklop vmesnika Bluetooth med vožnjo"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Ogled nastavitev akumulatorja za Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-sq/arrays.xml b/res/values-sq/arrays.xml
index 92e363f..e30e75d 100644
--- a/res/values-sq/arrays.xml
+++ b/res/values-sq/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 orë"</item>
     <item msgid="5198271470953124739">"Skadim të kohës së veprimit, asnjëherë!"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (I parazgjedhur)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"I dobët"</item>
     <item msgid="2042505933058940139">"I dobët"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Trajto si me matje"</item>
     <item msgid="2266114985518865625">"Trajto si pa matje"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automatik (bazuar në orën gjatë ditës)"</item>
+    <item msgid="6620560879508595181">"Gjithmonë aktiv"</item>
+    <item msgid="6385301106124765323">"Gjithmonë joaktiv"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 34cca05..42a3084 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Kujto cilësimet"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Numri maksimal i pajisjeve të lidhura audio me Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Zgjidh numrin maksimal të pajisjeve të lidhura audio me Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Aktivizo raportet e vonesës së profilit AVDTP me Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Lejo marrjen e raporteve të vonesës së profilit AVDTP me Bluetooth"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Transmetimi"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Aktivizo shfaqjen e rrjetit valor"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nuk u gjet asnjë pajisje në afërsi."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Vend. për profilin e punës"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Lejet në nivel aplikacioni"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Kërkesat e vendndodhjeve të fundit"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Asnjë aplikacion nuk ka kërkuar vendndodhje kohët e fundit"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Shërbimet e vendndodhjes"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Përdorimi i lartë i baterisë"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Përdor shërbimin"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Përdor korrigjimin e ngjyrave"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Përdor titrat"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"AKTIVE"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"JOAKTIVE"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Aktiv"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Joaktiv"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Shfaq në Cilësimet e shpejta"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Modaliteti i korrigjimit"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Përpara se të mund të përdorësh hapësirën ruajtëse të kredencialeve, pajisja jote duhet të ketë një ekran kyçjeje të sigurt"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"CAKTO KYÇJEN"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Aplikacionet me qasje përdorimi"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Toni i urgjencës"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Rezervo dhe restauro"</string>
@@ -2888,6 +2893,7 @@
     <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>
     <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>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Cakto një etiketë NFC për Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Shkruaj"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Trokit te një etiketë për të shkruar..."</string>
@@ -2921,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Luhet nga altoparlanti i stacionit"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Të gjitha audiot"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Vetëm klipe \"media\" audio"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Në heshtje"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Sinjalizimi"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Dridhje"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Aktivizo tingujt"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Asnjëherë"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Ndrysho në gjendjen \"vetëm alarmet\" deri në <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Ndrysho te \"ndërprit gjithmonë\""</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Kur ekrani është aktiv"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Lejo që njoftimet e vendosura në heshtje nga \"Mos shqetëso\" të shfaqen në ekran"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Lejo që njoftimet e vendosura në heshtje nga \"Mos shqetëso\" të shfaqen në ekran dhe të shfaqin një ikonë të shiritit të statusit"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Kur ekrani është joaktiv"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Lejo që njoftimet e vendosura në heshtje nga \"Mos shqetëso\" të aktivizojnë ekranin ose të bëjnë që drita të pulsojë"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Lejo që njoftimet e vendosura në heshtje nga \"Mos shqetëso\" të aktivizojnë ekranin"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Përdore këtë pajisje si MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Përdore USB-në për"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Përdor po ashtu USB-në për"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Konfigurimi i parazgjedhur i USB-së"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Kur të lidhet një pajisje tjetër dhe telefoni yt të jetë i shkyçur, do të zbatohen këto cilësime. Lidhe vetëm me pajisje të besuara."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Ngarkimi i kësaj pajisjeje"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Pajisja e lidhur po ngarkohet"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Mesatarisht <xliff:g id="USED_MEMORY">%1$s</xliff:g> nga <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> memorie të përdorura"</string>
     <string name="users_summary" msgid="1674864467098487328">"Identifikuar si <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> është i parazgjedhur"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"AKTIV"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"JOAKTIV"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Aktiv"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Joaktiv"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Rezervimi u çaktivizua"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Përditësuar në Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Ofrohet përditësim"</string>
@@ -3657,9 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Lidhur me <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Lidhur me shumë pajisje"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Modaliteti i demonstrimit i ndërfaqes së përdoruesit të sistemit"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Modaliteti \"natë\""</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Cakto modalitetin \"natë\""</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Pllakëzat e zhvilluesit të cilësimeve të shpejta"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Gjurma e dritares"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Gjurmimi i sipërfaqes"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Gjurma e 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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Cilësimet e profilit të punës"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kërkimi i kontakteve"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Përdor Bluetooth kur je në makinë"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Aktivizo Bluetooth-in automatikisht gjatë drejtimit të makinës"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Shiko cilësimet e baterisë të Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 43d7a6d..335ca7d 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 сат"</item>
     <item msgid="5198271470953124739">"Без чекања"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (подразумевано)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Слаба"</item>
     <item msgid="2042505933058940139">"Слаба"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Третирај као мрежу са ограничењем"</item>
     <item msgid="2266114985518865625">"Третирај као мрежу без ограничења"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Аутоматски (у зависности од доба дана)"</item>
+    <item msgid="6620560879508595181">"Увек укључено"</item>
+    <item msgid="6385301106124765323">"Увек искључено"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 7a2be58..1024cfe 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -718,6 +718,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запамти подешавања"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Максимални број повезаних Bluetooth аудио уређаја"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Изаберите максимални број повезаних Bluetooth аудио уређаја"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Омогућите пријем извештаја о кашњењу за AVDTP преко Bluetooth везе"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Омогућава пријем извештаја о кашњењу за AVDTP преко Bluetooth везе"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Пребацивање"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Омогући бежични приказ"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Нема уређаја у близини."</string>
@@ -1454,6 +1456,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Локација за пословни профил"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Дозволе на нивоу апликација"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Недавни захтеви за локацију"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Ниједна апликација није скоро тражила локацију"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Услуге локације"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Велика потрошња батерије"</string>
@@ -1894,8 +1898,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Користи услугу"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Користи корекцију боја"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Користи натписе"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"УКЉУЧЕНО"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ИСКЉУЧЕНО"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Укључено"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Искључено"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Прикажи у Брзим подешавањима"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Режим исправљања"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2339,7 +2343,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Да бисте могли да користите складиште акредитива, уређај мора да има безбедну опцију за закључавање екрана"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ПОДЕСИТЕ ЗАКЉУЧАВАЊЕ"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Апл. са приступом подацима о коришћењу"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Тон за хитне позиве"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"Подешавање понашања када се успоставља хитан позив"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Резервне копије"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Резервна копија и ресетовање"</string>
@@ -2919,6 +2924,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"серијски број, верзија хардвера"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"ниво безбедносне закрпе за android, верзија основног пропусног опсега, верзија језгра"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Амбијентални екран, приказ на закључаном екрану"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"дигитални отисак"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Подесите Wi-Fi NFC ознаку"</string>
     <string name="write_tag" msgid="8571858602896222537">"Напиши"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Додирните ознаку да бисте писали..."</string>
@@ -2952,9 +2958,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Нечујно"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Обавештење"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вибрација"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Звукови при укључивању"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Никад"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3209,7 +3218,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Пребацује у режим само са алармима до <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Пребацује у режим увек прекидај"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Када је екран укључен"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Нека обавештења која су искључена режимом Не узнемиравај искачу на екрану"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Нека обавештења искључена режимом Не узнемиравај искачу на екрану и прикажу икону на статусној траци"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Када је екран искључен"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Нека обавештења која су искључена режимом Не узнемиравај укључе екран и активирају светлосни сигнал"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Нека обавештења која су искључена режимом Не узнемиравај укључе екран"</string>
@@ -3403,10 +3412,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Користите овај уређај као MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Користи USB за"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Користите USB и за"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Подразумевана USB конфигурација"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Кад се повеже други уређај, а телефон је откључан, примењују се ова подешавања. Повезујте се само са поузданим уређајима."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Пуњење уређаја"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Пуњење повезаног уређаја"</string>
@@ -3529,8 +3536,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"У просеку је коришћено <xliff:g id="USED_MEMORY">%1$s</xliff:g> од <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> меморије"</string>
     <string name="users_summary" msgid="1674864467098487328">"Пријављени сте као <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> је подразумевана"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"УКЉУЧЕНО"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"ИСКЉУЧЕНО"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Укључено"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Искључено"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Прављење резервне копије је онемогућено"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Ажурирано на Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Доступно је ажурирање"</string>
@@ -3709,9 +3716,10 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"Плочице програмера за брза подешавања"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Траг прозора"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Површински траг"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Подешавања пословног профила"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Претрага контаката"</string>
@@ -3917,4 +3925,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Укључи Bluetooth током вожње"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Укључите Bluetooth аутоматски када возите"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Погледајте подешавања батерије за Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 537140f..8d41469 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 timme"</item>
     <item msgid="5198271470953124739">"Ange aldrig tidsgräns"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (Standard)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Dålig"</item>
     <item msgid="2042505933058940139">"Dålig"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Behandla som nätverk med datapriser"</item>
     <item msgid="2266114985518865625">"Behandla som nätverk utan datapriser"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Automatisk (grundat på tidpunkt)"</item>
+    <item msgid="6620560879508595181">"Alltid på"</item>
+    <item msgid="6385301106124765323">"Alltid av"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 9a56c2a..9572487 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Kom ihåg inställningarna"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maxantal för ljudenheter anslutna via Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Välj ett maxantal för ljudenheter anslutna via Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Aktivera rapporter för Bluetooth AVDTP-fördröjning"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Tillåt att rapporter för Bluetooth AVDTP-fördröjning tas emot"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Casta"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Aktivera Wi-Fi-skärmdelning"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Hittade inga enheter i närheten."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Plats för jobbprofil"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Behörigheter på appnivå"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nya platsbegäranden"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Inga appar har begärt uppgifter om plats nyligen"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Platstjänster"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Hög batterianvändning"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Använd tjänsten"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Använd färgkorrigering"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Använd textning"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"PÅ"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"AV"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"På"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Av"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Visa i Snabbinställningar"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Korrigeringsläge"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Enheten måste ha en säker låsskärm innan du kan använda uppgiftslagring"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"KONFIGURERA LÅS"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Appar med åtkomst"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Nödsignal"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Säkerhetskopiera och återställ"</string>
@@ -2888,6 +2893,7 @@
     <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>
     <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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Ange en NFC-tagg för Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tryck på en etikett för att skriva ..."</string>
@@ -2921,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Spela upp i dockade högtalare"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Allt ljud"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Endast ljud från mediafiler"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Tyst"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Varning"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibration"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Ljud vid uppstart"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Aldrig"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Ändra till endast alarm fram till kl. <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Ändra till avbryt alltid"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"När skärmen är på"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Tillåt att aviseringar som tystats via Stör ej visas på skärmen"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Tillåt att aviseringar som tystats via Stör ej visas på skärmen och visa en ikon i statusfältet"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"När skärmen är av"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Tillåt att skärmen slås på och aviseringslampan blinkar för aviseringar som tystats via Stör ej"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Tillåt att skärmen slås på för aviseringar som tystats via Stör ej"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Använd den här enheten som MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Använd USB för"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Använd även USB för"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Standardkonfiguration för USB"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"När en annan enhet ansluts och mobilen låses upp används de här inställningarna. Anslut bara till betrodda enheter."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Enheten laddas"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Laddning av ansluten enhet"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Genomsnittlig minnesanvändning: <xliff:g id="USED_MEMORY">%1$s</xliff:g> av <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"Inloggad som <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> är standardval"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"PÅ"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"AV"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"På"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Av"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Säkerhetskopiering har inaktiverats"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Uppdaterad till Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Det finns en uppdatering"</string>
@@ -3657,9 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Ansluten till <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Ansluten till flera enheter"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Demoläge för systemgränssnitt"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Nattläge"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Ställ in nattläge"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Utvecklarrutor för snabbinställningar"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Fönsterspårning"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Ytspårning"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscopespårning"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Inställningar för jobbprofilen"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontaktsökning"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Använd Bluetooth när du kör"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Aktivera Bluetooth automatiskt när du kör"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Visa batteriinställningarna för Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index acaf6cb..21c4d9f 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"Saa 1"</item>
     <item msgid="5198271470953124739">"Kamwe muda usiishe"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (Chaguo-msingi)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Mbaya"</item>
     <item msgid="2042505933058940139">"Dhaifu"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Tumia kama mtandao unaopima data"</item>
     <item msgid="2266114985518865625">"Tumia kama mtandao usiopima data"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Otomatiki (kulingana na wakati wa siku)"</item>
+    <item msgid="6620560879508595181">"Imewashwa kila wakati"</item>
+    <item msgid="6385301106124765323">"Imezimwa kila wakati"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 3103f4a..a94de68 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Kumbuka mipangilio"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Kima cha juu zaidi cha vifaa vya sauti vya Bluetooth vilivyounganishwa"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Chagua kima cha juu zaidi cha vifaa vya sauti vya Bluetooth vilivyounganishwa"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Ruhusu ripoti za kucheleweshwa kwa AVDTP kupitia Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Ruhusu upokeaji wa ripoti za kucheleweshwa kwa AVDTP kupitia Bluetooth"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Tuma"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Washa kuonyesha skrini bila kutumia waya"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Hakuna vifaa vilivyopatikana karibu."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Eneo la wasifu wa kazini"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Ruhusa za kiwango cha programu"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Maombi ya hivi karibuni ya kutambua eneo"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Hakuna programu iliyotaka kutambua eneo hivi karibuni"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Huduma za kutambua eneo"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Matumizi ya betri ya hali ya juu"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Tumia huduma"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Tumia masahihisho ya rangi"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Tumia manukuu"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"IMEWASHWA"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"IMEZIMWA"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Imewashwa"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Imezimwa"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Onyesha katika Mipangilio ya Haraka"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Hali ya kusahihisha"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Kabla ya kutumia hifadhi ya hati, unahitaji kuwa na njia salama ya kufunga skrini ya kifaa chako."</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"FUNGA SKRINI"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Zenye idhini ya kufikia maelezo"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Mlio wa dharura"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Hifadhi nakala na uzirejeshe"</string>
@@ -2888,6 +2893,7 @@
     <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>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Onyesho tulivu, Skrini iliyofungwa"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"alama ya kidole"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Sanidi tagi ya NFC ya Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Andika"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Gusa tagi ya NFC ili uandike..."</string>
@@ -2921,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Cheza kutumia spika ya kituo"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Sauti zote"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Sauti za maudhui pekee"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Kimya"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Arifu"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Tetema"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Washa sauti"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Kamwe"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Badilisha utumie kengele pekee hadi <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Badilisha utumie hali ya katiza wakati wote"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Wakati skrini imewashwa"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Ruhusu arifa zilizozuiwa na kipengele cha Usinisimbue zichomoze kwenye skrini"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Ruhusu arifa zilizozuiliwa na kipengele cha Usinisumbue zichomoze kwenye skrini na ionyeshe aikoni ya sehemu ya arifa"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Wakati skrini imezimwa"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Ruhusu arifa zilizozuiwa na kipengele cha Usinisumbue ziwashe skrini na kutoa mweko"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Ruhusu arifa zilizozuiwa na kipengele cha Usinisumbue ziwashe skrini"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Tumia kifaa hiki kama MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Tumia USB kwa ajili ya"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Pia tumia USB"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Mipangilio ya USB Chaguo-Msingi"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Wakati kifaa kingine kimeunganishwa na simu yako imefunguliwa, mipangilio hii itatumika. Unganisha kwenye vifaa unavyoamini pekee."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Kuchaji kifaa hiki"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Inachaji kifaa kilichounganishwa"</string>
@@ -3482,8 +3489,8 @@
     <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="location_on_summary" msgid="4083334422422067511">"IMEWASHWA"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"IMEZIMWA"</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>
     <string name="android_version_summary" msgid="2935995161657697278">"Imesasisha kuwa Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Sasisho linapatikana"</string>
@@ -3657,9 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Imeunganishwa kwenye <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Imeunganishwa kwenye vifaa vingi"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Hali ya onyesho la kiolesura cha mfumo"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Hali ya usiku"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Weka Hali ya usiku"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Vigae vya msanidi programu vya mipangilio ya haraka"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Alama ya Dirisha"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Ufuatiliaji wa Juujuu"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Ufuatiliaji wa 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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Mipangilio ya wasifu wa kazini"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Utafutaji wa anwani"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Tumia Bluetooth unapoendesha gari"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Washa Bluetooth kiotomatiki wakati unaendesha gari"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Angalia mipangilio ya betri ya Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-sw400dp/dimens.xml b/res/values-sw400dp/dimens.xml
index 6a02422..23a1176 100755
--- a/res/values-sw400dp/dimens.xml
+++ b/res/values-sw400dp/dimens.xml
@@ -23,7 +23,6 @@
     <dimen name="support_escalation_card_padding_end">56dp</dimen>
 
     <!-- Suggestion cards-->
-    <dimen name="suggestion_card_width_multiple_cards">180dp</dimen>
     <dimen name="suggestion_card_padding_bottom_one_card">22dp</dimen>
 
 </resources>
diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml
index 402375b..c51917e 100644
--- a/res/values-ta/arrays.xml
+++ b/res/values-ta/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 மணிநேரம்"</item>
     <item msgid="5198271470953124739">"காலநேரம் முடிய வேண்டாம்"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (இயல்பு)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"மோசம்"</item>
     <item msgid="2042505933058940139">"மோசம்"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"டேட்டா அளவிடப்பட்டது"</item>
     <item msgid="2266114985518865625">"டேட்டா அளவிடப்படாதது"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"தானியங்கு (நாளின் நேரத்தைப் பொறுத்து)"</item>
+    <item msgid="6620560879508595181">"எப்போதும் ஆனில் வைத்திரு"</item>
+    <item msgid="6385301106124765323">"எப்போதும் ஆஃபில் வைத்திரு"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 53d28fa..b763698 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"அமைப்புகளை நினைவில்கொள்"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"இணைத்துள்ள புளூடூத் ஆடியோ சாதனங்களின் அதிகபட்ச எண்ணிக்கை"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"இணைத்துள்ள புளூடூத் ஆடியோ சாதனங்களின் அதிகபட்ச எண்ணிக்கையைத் தேர்ந்தெடுக்கவும்"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"புளூடூத் AVDTP தாமத அறிக்கைகளை இயக்கு"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"புளூடூத் AVDTP தாமத அறிக்கைகளைப் பெற அனுமதிக்கும்"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"வயர்லெஸ் காட்சியை இயக்கு"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"அருகில் சாதனங்கள் எதுவுமில்லை."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"பணி சுயவிவரத்திற்கான இருப்பிடம்"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"பயன்பாட்டு நிலை அனுமதிகள்"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"சமீபத்திய இருப்பிட கோரிக்கைகள்"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"எந்தப் பயன்பாடுகளும் சமீபத்தில் இருப்பிடத்தைக் கோரவில்லை"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"இருப்பிடச் சேவைகள்"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"அதிகப் பேட்டரி பயன்பாடு"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"சேவையைப் பயன்படுத்து"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"வண்ணத் திருத்தத்தைப் பயன்படுத்து"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"தலைப்புகளைப் பயன்படுத்து"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ஆன்"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"முடக்கப்பட்டுள்ளது"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"ஆன்"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"ஆஃப்"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"விரைவு அமைப்புகளில் காட்டு"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"சரிப்படுத்தும் முறை"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"அனுமதிச் சான்றுகள் சேமிப்பகத்தைப் பயன்படுத்தும் முன்னர், உங்கள் சாதனத்தில் பாதுகாப்பான பூட்டுத் திரையை அமைக்க வேண்டும்"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"லாக்கை அமை"</string>
     <string name="usage_access_title" msgid="332333405495457839">"பயன்பாட்டு அணுகலுடைய ஆப்ஸ்"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"அவசர அழைப்பு டோன்"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"அவசர அழைப்பு இயக்கப்பட்டிருக்கும்போது நடத்தையை அமை"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"காப்புப் பிரதி"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"காப்புப் பிரதி &amp; மீட்டெடுத்தல்"</string>
@@ -2888,6 +2893,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"வரிசை எண், வன்பொருள் பதிப்பு"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android பாதுகாப்பு பேட்ச் நிலை, பேஸ்பேண்ட் பதிப்பு, கர்னல் பதிப்பு"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"சூழல்சார் திரை, பூட்டுத் திரை"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"கைரேகை"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"வைஃபை NFC குறியை அமை"</string>
     <string name="write_tag" msgid="8571858602896222537">"எழுது"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"எழுத, குறியைத் தட்டவும்..."</string>
@@ -2921,9 +2927,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"நிசப்தம்"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"விழிப்பூட்டல்"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"அதிர்வு"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"ஒலிகளை இயக்கு"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"ஒருபோதும் வேண்டாம்"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> வரை அலாரங்கள் மட்டும் என மாற்று"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"எப்போதும் குறுக்கிடு என மாற்று"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"திரை ஆன் செய்யப்பட்டிருக்கும்போது"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"’தொந்தரவு செய்ய வேண்டாம்’ அம்சத்தின் மூலம் ஒலியடக்கப்பட்ட அறிவிப்புகள் வரும்போது, திரையில் பாப் அப் ஆகட்டும்"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"\'தொந்தரவு செய்ய வேண்டாம்\' மூலம் ஒலியடக்கப்பட்ட அறிவிப்புகள் வரும்போது, திரையில் பாப் அப் ஆவதுடன், நிலைப்பட்டி ஐகானைக் காட்டும்"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"திரை ஆஃப் செய்யப்பட்டிருக்கும்போது"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"’தொந்தரவு செய்ய வேண்டாம்’ அம்சத்தின் மூலம் ஒலியடக்கப்பட்ட அறிவிப்புகள் வரும்போது, திரை ஆன் செய்யப்பட்டு, ஒளியை மிளிரச் செய்யட்டும்"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"’தொந்தரவு செய்ய வேண்டாம்’ அம்சத்தின் மூலம் ஒலியடக்கப்பட்ட அறிவிப்புகள் வரும்போது, திரையை ஆன் செய்யட்டும்."</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"இந்தச் சாதனத்தை MIDI ஆகப் பயன்படுத்தும்"</string>
     <string name="usb_use" msgid="3372728031108932425">"இதற்காக USBஐப் பயன்படுத்து:"</string>
     <string name="usb_use_also" msgid="557340935190819370">"USBஐ இதற்கும் பயன்படுத்தலாம்"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"இயல்பு USB உள்ளமைவு"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"மற்றொரு சாதனம் இணைக்கப்பட்டு, உங்கள் மொபைலின் பூட்டுத் திரை திறந்திருந்தால், இந்த அமைப்புகள் பயன்படுத்தப்படும். நம்பகமான சாதனங்களுடன் மட்டும் இணைக்கவும்."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"இந்தச் சாதனத்தைச் சார்ஜ் செய்வதற்கு"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"இணைக்கப்பட்ட சாதனத்தைச் சார்ஜ் செய்தல்"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> இல் சராசரியாக <xliff:g id="USED_MEMORY">%1$s</xliff:g> நினைவகம் பயன்படுத்தப்பட்டுள்ளது"</string>
     <string name="users_summary" msgid="1674864467098487328">"உள்நுழைந்துள்ள முகவரி: <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> இயல்பு பயன்பாடாகும்"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"ஆன்"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"ஆஃப்"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"ஆன்"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"ஆஃப்"</string>
     <string name="backup_disabled" msgid="485189128759595412">"காப்புப் பிரதி முடக்கப்பட்டுள்ளது"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> பதிப்புக்குப் புதுப்பிக்கப்பட்டது"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"புதுப்பிப்பு உள்ளது"</string>
@@ -3657,9 +3664,10 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"விரைவு அமைப்புகளின் டெவெலப்பர் கட்டங்கள்"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"விண்டோ ட்ரேஸ்"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"சர்ஃபேஸ் டிரேஸ்"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"வின்ஸ்கோப் டிரேஸ்"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"பணிச் சுயவிவர அமைப்புகள்"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"தொடர்புகளில் தேடு"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"வாகனம் ஓட்டும்போது புளூடூத் உபயோகி"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"வாகனம் ஓட்டும்போது புளூடூத் தானாகவே ஆன் செய்யப்படும்"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 பேட்டரி அமைப்புகளைக் காட்டு"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml
index 5e04466..1299c95 100644
--- a/res/values-te/arrays.xml
+++ b/res/values-te/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 గంట"</item>
     <item msgid="5198271470953124739">"ఎప్పటికీ గడువు ముగియదు"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (డిఫాల్ట్)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"చాలా తక్కువ"</item>
     <item msgid="2042505933058940139">"బాగాలేదు"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"గణించబడేదానిగా పరిగణించండి"</item>
     <item msgid="2266114985518865625">"గణించబడనిదిగా పరిగణించండి"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"ఆటోమేటిక్ (రోజులో సమయం ఆధారంగా)"</item>
+    <item msgid="6620560879508595181">"ఎల్లప్పుడూ ఆన్ చేయి"</item>
+    <item msgid="6385301106124765323">"ఎల్లప్పుడూ ఆఫ్‌ చేయి"</item>
+  </string-array>
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index f02e704..c6fc880 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"సెట్టింగ్‌లను గుర్తుంచుకో"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"గరిష్టంగా కనెక్ట్ అయిన బ్లూటూత్ ఆడియో పరికరాలు"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"గరిష్ట సంఖ్యలో కనెక్ట్ అయిన బ్లూటూత్ ఆడియో పరికరాలను ఎంచుకోండి"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"బ్లూటూత్ AVDTP ఆలస్య నివేదికలను ప్రారంభించు"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"బ్లూటూత్ AVDTP ఆలస్య నివేదికలను స్వీకరించడాన్ని ప్రారంభించు"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"ప్రసారం చేయండి"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"వైర్‌లెస్ ప్రదర్శనను ప్రారంభించు"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"సమీపంలోని పరికరాలు కనుగొనబడలేదు."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"కార్యాలయ ప్రొఫైల్ యొక్క స్థానం"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"అనువర్తన-స్థాయి అనుమతులు"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"ఇటీవలి స్థాన అభ్యర్థనలు"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"స్థానాన్ని ఇటీవల అనువర్తనాలు ఏవీ అభ్యర్థించలేదు"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"స్థానం సేవలు"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"అధిక బ్యాటరీ వినియోగం"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"సేవని ఉపయోగించండి"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"రంగు సవరణను ఉపయోగించండి"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"శీర్షికలను ఉపయోగించండి"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ఆన్"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ఆఫ్"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"ఆన్"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"ఆఫ్"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"శీఘ్ర సెట్టింగ్‌ల్లో చూపు"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"సవరణ మోడ్"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"మీరు ఆధారాల నిల్వను ఉపయోగించే ముందు, మీ పరికరం సురక్షిత లాక్ స్క్రీన్‌ను కలిగి ఉండాలి"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"లాక్‌ను సెట్ చేయి"</string>
     <string name="usage_access_title" msgid="332333405495457839">"వినియోగ యాక్సెస్ గల యాప్‌లు"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"అత్యవసర టోన్"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"అత్యవసర కాల్ వచ్చినప్పుడు చేయాల్సిన విధిని సెట్ చేయండి"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"బ్యాకప్"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"బ్యాకప్ &amp; పునరుద్ధరణ"</string>
@@ -2888,6 +2893,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"క్రమ సంఖ్య, హార్డ్‌వేర్ వెర్షన్"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"android భద్రతా అతికింపు స్థాయి, బేస్‌బ్యాండ్ వెర్షన్, కెర్నెల్ వెర్షన్"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"విస్తార ప్రదర్శన, లాక్ స్క్రీన్ ప్రదర్శన"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"వేలిముద్ర"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ట్యాగ్‌ను సెటప్ చేయండి"</string>
     <string name="write_tag" msgid="8571858602896222537">"వ్రాయి"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"వ్రాయడానికి ట్యాగ్‌ను నొక్కండి..."</string>
@@ -2921,9 +2927,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"నిశ్శబ్దం"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"హెచ్చరిక"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"వైబ్రేట్"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"పవర్ ఆన్ చేసేటప్పుడు ధ్వనులు"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"ఎప్పటికీ"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> వరకు అలారాలు మాత్రమే ఎంపికకు మార్చుతుంది"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"ఎల్లప్పుడూ అంతరాయం కలిగించు ఎంపికకు మార్చుతుంది"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"స్క్రీన్ ఆన్‌లో ఉన్నప్పుడు"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"అంతరాయం కలిగించవద్దు ద్వారా నిశ్శబ్దం చేయబడిన నోటిఫికేషన్‌లను స్క్రీన్‌పై ప్రత్యక్షం కానివ్వండి"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"అంతరాయం కలిగించవద్దు నిశ్శబ్దం చేసిన నోటిఫికేషన్‌లు స్క్రీన్‌లో పాప్-అప్ వలె కనిపించి, స్థితి బార్ చిహ్నాన్ని చూపడానికి అనుమతించు"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"స్క్రీన్ ఆఫ్‌లో ఉన్నప్పుడు"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"అంతరాయం కలిగించవద్దు ద్వారా నిశ్శబ్దం చేయబడిన నోటిఫికేషన్‌లను స్క్రీన్‌ని ఆన్ అయ్యేలా మరియు కాంతి మిణుకుమిణుకుమనేలా చేయనివ్వండి"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"అంతరాయం కలిగించవద్దు ద్వారా నిశ్శబ్దం చేయబడిన నోటిఫికేషన్‌లను స్క్రీన్‌ని ఆన్ చేయనివ్వండి"</string>
@@ -3359,10 +3368,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"ఈ పరికరాన్ని MIDI వలె ఉపయోగించడం"</string>
     <string name="usb_use" msgid="3372728031108932425">"దీని కోసం USBని ఉపయోగించండి"</string>
     <string name="usb_use_also" msgid="557340935190819370">"USBని దీని కోసం కూడా ఉపయోగించండి"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"డిఫాల్ట్ USB కాన్ఫిగరేషన్"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"మరొక పరికరం కనెక్ట్ అయ్యి ఉన్నప్పుడు మరియు మీ ఫోన్ అన్‌లాక్ చేయబడి ఉన్నప్పుడు, ఈ సెట్టింగ్‌లు వర్తింపజేయబడతాయి. కేవలం విశ్వసనీయ పరికరాలకు మాత్రమే కనెక్ట్ చేయండి."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"ఈ పరికరాన్ని ఛార్జ్ చేయడం"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"కనెక్ట్ చేయబడిన పరికరాన్ని ఛార్జ్ చేస్తోంది"</string>
@@ -3483,8 +3490,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"సగటున <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>లో <xliff:g id="USED_MEMORY">%1$s</xliff:g> మెమరీ వినియోగించబడింది"</string>
     <string name="users_summary" msgid="1674864467098487328">"<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> డిఫాల్ట్‌గా ఉంది"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"ఆన్"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"ఆఫ్"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"ఆన్"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"ఆఫ్"</string>
     <string name="backup_disabled" msgid="485189128759595412">"బ్యాకప్ నిలిపివేయబడింది"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g>కి అప్‌డేట్ చేయబడింది"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"అప్‌డేట్ అందుబాటులో ఉంది"</string>
@@ -3658,9 +3665,10 @@
     <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">"సిస్టమ్ UI డెమో మోడ్"</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="window_trace_quick_settings_title" msgid="3839917000546526898">"విండో స్థితిగతి కనుగొనడం"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"ఉపరితలం స్థితిగతి"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"విన్‌స్కోప్ ట్రేస్"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"కార్యాలయ ప్రొఫైల్ సెట్టింగ్‌లు"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"పరిచయ శోధన"</string>
@@ -3856,4 +3864,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"డ్రైవింగ్ సమయంలో బ్లూటూత్‌ని ఉపయోగించు"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"డ్రైవింగ్ సమయంలో బ్లూటూత్‌ను స్వయంచాలకంగా ఆన్ చేస్తుంది"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 బ్యాటరీ సెట్టింగ్‌లను చూడండి"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index c9fa19a..0b30b3b 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 ชั่วโมง"</item>
     <item msgid="5198271470953124739">"ไม่มีระยะหมดเวลา"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (ค่าเริ่มต้น)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"แย่"</item>
     <item msgid="2042505933058940139">"อ่อน"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"ถือว่ามีการวัดปริมาณอินเทอร์เน็ต"</item>
     <item msgid="2266114985518865625">"ถือว่าไม่มีการวัดปริมาณอินเทอร์เน็ต"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"อัตโนมัติ (อิงตามเวลาของวัน)"</item>
+    <item msgid="6620560879508595181">"เปิดอยู่เสมอ"</item>
+    <item msgid="6385301106124765323">"ปิดอยู่เสมอ"</item>
+  </string-array>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 74b21e4..27c9c54 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"จำการตั้งค่า"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"จำนวนอุปกรณ์เสียงบลูทูธที่เชื่อมต่อสูงสุด"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"เลือกจำนวนสูงสุดสำหรับอุปกรณ์เสียงบลูทูธที่เชื่อมต่อ"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"เปิดใช้รายงานความล่าช้าของ AVDTP บลูทูธ"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"อนุญาตให้รับรายงานความล่าช้าของ AVDTP บลูทูธ"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"แคสต์"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"เปิดใช้การแสดงผลแบบไร้สาย"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"ไม่พบอุปกรณ์ในบริเวณใกล้เคียง"</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"สถานที่สำหรับโปรไฟล์งาน"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"สิทธิ์ระดับแอป"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"คำขอตำแหน่งล่าสุด"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"ไม่มีแอปใดทำการขอตำแหน่งเมื่อเร็วๆ นี้"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"บริการตำแหน่ง"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"ใช้แบตเตอรี่มาก"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"ใช้บริการ"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"ใช้การปรับแก้สี"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"ใช้คำอธิบายภาพ"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"เปิด"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ปิด"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"เปิด"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"ปิด"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"แสดงในการตั้งค่าด่วน"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"โหมดแก้ไข"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"อุปกรณ์ต้องมีหน้าจอล็อกที่ปลอดภัยก่อน คุณจึงจะสามารถใช้ที่เก็บข้อมูลที่เชื่อถือได้"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ตั้งค่าล็อก"</string>
     <string name="usage_access_title" msgid="332333405495457839">"แอปที่มีสิทธิ์เข้าถึงการใช้งาน"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"โทนเสียงฉุกเฉิน"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"ตั้งค่าการทำงานเมื่อมีการโทรหาหมายเลขฉุกเฉิน"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"การสำรองข้อมูล"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"การสำรองและคืนค่าข้อมูล"</string>
@@ -2888,6 +2893,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"หมายเลขซีเรียล, เวอร์ชันฮาร์ดแวร์"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"ระดับแพตช์ความปลอดภัย android, เวอร์ชันเบสแบนด์, เวอร์ชันเคอร์เนล"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"หน้าจอแอมเบียนท์ หน้าจอล็อก"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"ลายนิ้วมือ"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ตั้งค่าแท็ก NFC สำหรับ Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"เขียน"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"แตะแท็กเพื่อเขียน..."</string>
@@ -2921,9 +2927,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"เงียบ"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"การแจ้งเตือน"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"สั่น"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"เสียงเปิดเครื่อง"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"ไม่เลย"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"เปลี่ยนเป็นเฉพาะปลุกเท่านั้นจนถึง <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"เปลี่ยนเป็นรบกวนได้เสมอ"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"เมื่อหน้าจอเปิดอยู่"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"อนุญาตให้การแจ้งเตือนที่ปิดเสียงโดย \"ห้ามรบกวน\" ปรากฏขึ้นในหน้าจอ"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"อนุญาตให้การแจ้งเตือนที่ปิดเสียงโดย \"ห้ามรบกวน\" ปรากฏขึ้นในหน้าจอและแสดงไอคอนแถบสถานะ"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"เมื่อหน้าจอปิดอยู่"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"อนุญาตให้การแจ้งเตือนที่ปิดเสียงโดย \"ห้ามรบกวน\" เปิดหน้าจอและกะพริบไฟ"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"อนุญาตให้การแจ้งเตือนที่ปิดเสียงโดย \"ห้ามรบกวน\" เปิดหน้าจอ"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"ใช้อุปกรณ์นี้เป็น MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"ใช้ USB สำหรับ"</string>
     <string name="usb_use_also" msgid="557340935190819370">"และใช้ USB สำหรับ"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"การกำหนดค่า USB เริ่มต้น"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"ระบบจะนำการตั้งค่าเหล่านี้มาใช้เมื่อมีการเชื่อมต่ออุปกรณ์เครื่องอื่นและโทรศัพท์ไม่ได้ล็อกอยู่ โปรดเชื่อมต่อกับอุปกรณ์ที่เชื่อถือได้เท่านั้น"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"ชาร์จอุปกรณ์นี้"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"การชาร์จอุปกรณ์ที่เชื่อมต่อ"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"ใช้หน่วยความจำไป <xliff:g id="USED_MEMORY">%1$s</xliff:g> จาก <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> โดยเฉลี่ย"</string>
     <string name="users_summary" msgid="1674864467098487328">"ลงชื่อเข้าใช้เป็น <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> เป็นค่าเริ่มต้น"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"เปิด"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"ปิด"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"เปิด"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"ปิด"</string>
     <string name="backup_disabled" msgid="485189128759595412">"ปิดใช้การสำรองข้อมูลอยู่"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"อัปเดตเป็น Android <xliff:g id="VERSION">%1$s</xliff:g> แล้ว"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"มีเวอร์ชันอัปเดต"</string>
@@ -3657,9 +3664,10 @@
     <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">"โหมดสาธิต UI ของระบบ"</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="window_trace_quick_settings_title" msgid="3839917000546526898">"Window Trace"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"การติดตามพื้นผิว"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope Trace"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"การตั้งค่าโปรไฟล์งาน"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"ค้นหารายชื่อติดต่อ"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"ใช้บลูทูธขณะขับรถ"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"เปิดบลูทูธโดยอัตโนมัติขณะขับรถ"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"ดูการตั้งค่าแบตเตอรี่ของ Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index c0889e9..db0ac29 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 oras"</item>
     <item msgid="5198271470953124739">"Huwag kailanman mag-time out"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (Default)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Mahina"</item>
     <item msgid="2042505933058940139">"Mahina"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Ituring bilang nakametro"</item>
     <item msgid="2266114985518865625">"Ituring bilang hindi nakametro"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Awtomatiko (batay sa oras sa isang araw)"</item>
+    <item msgid="6620560879508595181">"Palaging naka-on"</item>
+    <item msgid="6385301106124765323">"Palaging naka-off"</item>
+  </string-array>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 8190657..0dbe4cf 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Tandaan ang mga setting"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maximum na nakakonektang mga Bluetooth audio device"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Piliin ang maximum na bilang ng mga nakakonektang Bluetooth audio device"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"I-enable ang mga ulat sa pagkaantala ng AVDTP ng Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Payagan ang pagtanggap ng mga ulat ng pagkaantala ng AVDTP ng Bluetooth"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"I-cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"I-enable ang wireless display"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Walang nakitang mga kalapit na device."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Lokayon ng profile sa trabaho"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Mga pahintulot sa antas ng app"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Kamakailang hiling sa lokasyon"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Walang apps ang humiling ng lokasyon kamakailan"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Mga serbisyo sa lokasyon"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Mataas na paggamit ng baterya"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Gumamit ng serbisyo"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Gumamit ng pagwawasto ng kulay"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Gumamit ng mga caption"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"NAKA-ON"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"NAKA-OFF"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Naka-on"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Naka-off"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Ipakita sa Mga Mabilisang Setting"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Correction mode"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Bago mo magamit ang storage ng kredensyal, kailangang may secure na lock screen ang iyong device"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ITAKDA ANG LOCK"</string>
     <string name="usage_access_title" msgid="332333405495457839">"App na may access sa paggamit"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Tonong pang-emergency"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"I-backup &amp; ipanumbalik"</string>
@@ -2888,6 +2893,7 @@
     <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>
     <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>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"I-set up ang Tag ng NFC sa Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Magsulat"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Mag-tap ng tag upang magsulat..."</string>
@@ -2921,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Magpe-play ang speaker mg dock"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Lahat ng audio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Audio ng media lang"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Naka-silent"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerto"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Mag-vibrate"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"I-on ang mga tunog"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Hindi kailanman"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Gawing mag-a-alarm lang hanggang <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Gawing palaging mang-abala"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Kapag naka-on ang screen"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Hayaang lumabas sa screen ang mga notification na pinatahimik ng Huwag Istorbohin"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Hayaan ang mga notification na pinatahimik ng Huwag Istorbohin na mag-pop sa screen at magpakita ng icon ng status bar"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Kapag naka-off ang screen"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Hayaan ang mga notification na pinatahimik ng Huwag Istorbohin na i-on ang screen at ipatay-sindi ang ilaw"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Hayaan ang mga notification na pinatahimik ng Huwag Istorbohin na i-on ang screen"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Gamitin ang device na ito bilang MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Gamitin ang USB para sa"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Gamitin din ang USB para sa"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Default na USB Configuration"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Kapag nakakonekta ang isa pang device at naka-unlock ang iyong telepono, malalapat ang mga setting na ito. Sa mga pinagkakatiwalaang device lang kumonekta."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Pag-charge sa device na ito"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Pag-charge ng nakakonektang device"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Avg <xliff:g id="USED_MEMORY">%1$s</xliff:g> ng <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> ng ginamit na memory"</string>
     <string name="users_summary" msgid="1674864467098487328">"Naka-sign in bilang <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> ang default"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"NAKA-ON"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"NAKA-OFF"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Naka-on"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Naka-off"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Na-disable ang pag-back up"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Na-update sa Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"May available na update"</string>
@@ -3657,9 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Nakakonekta sa <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Nakakonekta sa maraming device"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Demo mode ng System UI"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Night mode"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Itakda ang Night mode"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Mga tile ng developer para sa mga mabilisang setting"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Trace ng Window"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Surface Trace"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Trace ng 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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Mga setting ng profile sa trabaho"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Paghahanap ng contact"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Gumamit ng Bluetooth sa pagmamaneho"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Awtomatikong i-on ang Bluetooth kapag nagmamaneho"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Tingnan ang mga setting ng baterya ng Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index adb0095..bded99e 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 saat"</item>
     <item msgid="5198271470953124739">"Asla zaman aşımı olmasın"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (Varsayılan)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Yetersiz"</item>
     <item msgid="2042505933058940139">"Zayıf"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Sınırlı olarak ele al"</item>
     <item msgid="2266114985518865625">"Sınırsız olarak ele al"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Otomatik (günün saatine bağlı)"</item>
+    <item msgid="6620560879508595181">"Her zaman açık"</item>
+    <item msgid="6385301106124765323">"Her zaman kapalı"</item>
+  </string-array>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 0e43462..bdf205b 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ayarları anımsa"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maksimum sayıda bağlı Bluetooth ses cihazı"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Maksimum sayıda bağlı Bluetooth ses cihazı seç"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Bluetooth AVDTP gecikme raporlarını etkinleştir"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Bluetooth AVDTP gecikme raporlarını almaya izin ver"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Yayınlama"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Kablosuz görüntülemeyi etkinleştir"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Yakınlarda cihaz bulunamadı."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"İş profili konumu"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Uygulama düzeyinde izinler"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Son konum istekleri"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Yakın zamanda hiçbir uygulama konum bilgisi isteğinde bulunmadı"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Konum hizmetleri"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Yüksek pil kullanımı"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Hizmeti kulan"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Renk düzeltme işlevini kullan"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Altyazıları kullan"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"AÇ"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"KAPAT"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Açık"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Kapalı"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Hızlı Ayarlar\'da göster"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Düzeltme modu"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Kimlik bilgileri deposunu kullanabilmek için öncelikle cihazınızda bir güvenli kilit ekranı olması gerekir"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"KİLİDİ AYARLA"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Erişimi olan uygulamalar"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Acil sesi"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Yedekleme ve geri yükleme"</string>
@@ -2888,6 +2893,7 @@
     <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>
     <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>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Kablosuz NFC Etiketini ayarla"</string>
     <string name="write_tag" msgid="8571858602896222537">"Yaz"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Yazmak için bir etikete dokunun..."</string>
@@ -2921,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Yuva hoparlörü çalsın"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Tüm ses"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Yalnızca medya sesi"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Sessiz"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Uyarı"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Titreşim"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Açılış sesleri"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Hiçbir zaman"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Yalnızca şu saate kadar alarmlara geç: <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Her zaman kes seçeneğine değiştir"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Ekran açıkken"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Rahatsız Etmeyin özelliği tarafından kapatılan bildirimlerin ekranda görünmesine izin ver"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Rahatsız Etmeyin özelliğinin kapattığı bildirimlerin ekranda görünmesine ve durum çubuğu simgesinin gösterilmesine izin ver"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Ekran kapalıyken"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Rahatsız Etmeyin özelliği tarafından kapatılan bildirimlerin ekranı açmasına ve ışık yakıp söndürmesine izin ver"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Rahatsız Etmeyin özelliği tarafından kapatılan bildirimlerin ekranı açmasına izin ver"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Bu cihazı MIDI olarak kullanın"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB\'yi şunun için kullan:"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Ayrıca USB\'yi şunun için kullan:"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Varsayılan USB Yapılandırması"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Bu ayarlar yalnızca başka bir cihaz bağlandığında ve telefonunuzun kilidi açıkken uygulanır. Yalnızca güvenilen cihazlara bağlanın."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Bu cihazı şarj et"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Bağlı cihazı şarj etme"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Toplam <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> belleğin ortalama <xliff:g id="USED_MEMORY">%1$s</xliff:g> kadarı kullanılıyor"</string>
     <string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> olarak oturum açıldı"</string>
     <string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> varsayılandır"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"AÇ"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"KAPALI"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Açık"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Kapalı"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Yedekleme devre dışı"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> sürümüne güncellendi"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Uygulama güncellendi"</string>
@@ -3657,9 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> cihazına bağlı"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Birden çok cihaza bağlı"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Sistem Kullanıcı Arayüzü demo modu"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Gece modu"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Gece modunu ayarla"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Hızlı ayarlar geliştirici blokları"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Pencere İzleme"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Yüzey İzleme"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope İzleme"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"İş profili ayarları"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kişi arama"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Araba sürerken Bluetooth\'u kullanın"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Araba kullanırken Bluetooth\'u otomatik olarak açın"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 pil ayarlarına bakın"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 289a712..c0cf86d 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 година"</item>
     <item msgid="5198271470953124739">"Без часу очікування"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (за умовчанням)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Слабкий"</item>
     <item msgid="2042505933058940139">"Слабкий"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Вважати тарифікованою"</item>
     <item msgid="2266114985518865625">"Вважати нетарифікованою"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Автоматично (за часом доби)"</item>
+    <item msgid="6620560879508595181">"Завжди ввімкнено"</item>
+    <item msgid="6385301106124765323">"Завжди вимкнено"</item>
+  </string-array>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 60477cf..e085abf 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -729,6 +729,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запам\'ятати налашт."</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Максимальна кількість підключених аудіопристроїв Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Вибрати максимальну кількість підключених аудіопристроїв Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Увімкнути звіти про затримку Bluetooth AVDTP"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Дозволити отримувати звіти про затримку Bluetooth AVDTP"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Трансляція"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Увімкнути бездротовий екран"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Не знайдено пристроїв поблизу."</string>
@@ -1467,6 +1469,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Місцезнах.для робочого профілю"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Дозволи на рівні додатка"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Останні запити геоданих"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Жодна програма не запитувала місцезнаходження останнім часом"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Служби локації"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Значне використання заряду"</string>
@@ -1908,8 +1912,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Використовувати сервіс"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Використовувати корекцію кольорів"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Використовувати субтитри"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"УВІМК."</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ВИМК."</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Увімкнено"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Вимкнено"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Показувати на панелі швидкого налаштування"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Режим корекції"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2365,7 +2369,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Щоб користуватися сховищем облікових даних, налаштуйте надійне блокування екрана"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"ВИБРАТИ БЛОКУВАННЯ"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Додатки з доступом до даних"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Аварійний сингал"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"Устан. поведінку при розміщ. аварійного виклику"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Резервне копіювання"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Резервне копіювання та відновлення"</string>
@@ -2950,6 +2955,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"серійний номер, версія апаратного забезпечення"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"рівень виправлення системи безпеки android, версія каналу зв’язку, версія ядра"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Активний екран, заблокований екран"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"відбиток пальця"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Налаштувати NFC-тег для Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Записати"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Торкніться тегу, у який потрібно записати дані…"</string>
@@ -2983,9 +2989,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Без звуку"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Сповіщення"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вібросигнал"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Увімкнути звуки"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Ніколи"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3248,7 +3257,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Активувати режим \"Лише будильник\" до <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Вибрати опцію \"Завжди надсилати\""</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Коли екран увімкнено"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Дозволити сповіщенням, для яких вибрано режим \"Не турбувати\", з’являтися на екрані"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Дозволити сповіщенням, для яких вибрано режим \"Не турбувати\", з’являтися на екрані й показувати значок у рядку стану"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Коли екран вимкнено"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Дозволити сповіщенням, для яких вибрано режим \"Не турбувати\", вмикати екран та індикатор"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Дозволити сповіщенням, для яких вибрано режим \"Не турбувати\", вмикати екран"</string>
@@ -3448,10 +3457,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Використовувати цей пристрій як MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Використання USB"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Інші застосування USB"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Налаштування USB за умовчанням"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Ці налаштування буде застосовано, коли ви під’єднаєте інший пристрій і розблокуєте телефон. Під’єднуйтеся лише до надійних пристроїв."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Заряджання пристрою"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Заряджання під’єднаного пристрою"</string>
@@ -3576,8 +3583,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"У середньому використовується <xliff:g id="USED_MEMORY">%1$s</xliff:g> пам’яті з <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"Ви ввійшли як <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> використовується за умовчанням"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"УВІМКНЕНО"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"ВИМКНЕНО"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Увімкнено"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Вимкнено"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Резервне копіювання вимкнено"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Оновлено до Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Доступне оновлення"</string>
@@ -3761,9 +3768,10 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"Швидкі налаштування блоку розробника"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Трасування вікон"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Трасування поверхні"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Налаштування робочого профілю"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Пошук контактів"</string>
@@ -3979,4 +3987,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Вмикати Bluetooth за кермом"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Автоматично вмикати Bluetooth за кермом"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Переглянути налаштування акумулятора Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-ur/arrays.xml b/res/values-ur/arrays.xml
index 0a9eb86..cd06f68 100644
--- a/res/values-ur/arrays.xml
+++ b/res/values-ur/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 گھنٹہ"</item>
     <item msgid="5198271470953124739">"کبھی ٹائم آؤٹ نہ کریں"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (ڈیفالٹ)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"ناقص"</item>
     <item msgid="2042505933058940139">"ناقص"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"میٹر شدہ کے بطور خیال کریں"</item>
     <item msgid="2266114985518865625">"غیر میٹر شدہ کے بطور خیال کریں"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"خودکار (دن کے وقت کی بنیاد پر)"</item>
+    <item msgid="6620560879508595181">"ہمیشہ آن"</item>
+    <item msgid="6385301106124765323">"ہمیشہ آف"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 8b52059..bc237bb 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ترتیبات کو یاد رکھیں"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"زیادہ سے زیادہ منسلک بلوٹوتھ آڈیو آلات"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"منسلک بلوٹوتھ آڈیو آلات کی زیادہ سے زیادہ تعداد منتخب کریں"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"‏بلوٹوتھ AVDTP میں تاخیر کی رپورٹس کو فعال کریں"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"‏بلوٹوتھ AVDTP میں تاخیر کی رپورٹس موصول کرنے کی اجازت دیں"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"کاسٹ کریں"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"وائرلیس ڈسپلے فعال کریں"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"کوئی قریبی آلات نہیں ملے۔"</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"دفتری پروفائل کیلئے مقام"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"ایپ کی سطح کی اجازتیں"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"حالیہ مقام کی درخواستیں"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"حال میں کسی ایپس نے مقام کی درخواست نہیں کی ہے"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"مقام کی سروسز"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"بیٹری کا زیادہ استعمال"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"سروس استعمال کریں"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"رنگ کی اصلاح استعمال کریں"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"کیپشنز استعمال کریں"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"آن"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"آف"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"آن"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"آف"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"فوری ترتیبات میں دکھائیں"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"اصلاح کی وضع"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"آپ کے اسنادات اسٹوریج استعمال کرنے سے پہلے، آپ کے آلہ میں ایک محفوظ مقفل انسکرین ہونا ضروری ہے"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"لاک سیٹ کریں"</string>
     <string name="usage_access_title" msgid="332333405495457839">"استعمال تک رسائی والی ایپس"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"ہنگامی ٹون"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"ہنگامی کال کرتے وقت برتاؤ سیٹ کریں"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"بیک اپ"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"بیک اپ لیں اور بحال کریں"</string>
@@ -2886,6 +2891,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"نمبر شمار، ہارڈ ویئر کا ورژن"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"‏Android سیکیورٹی پیچ کی سطح، بیس بینڈ ورژن، کرنل ورژن"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"ايمبيئنٹ ڈسپلے، لاک اسکرین ڈسپلے"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"فنگر پرنٹ"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏Wi-Fi NFC ٹیگ ترتیب دیں"</string>
     <string name="write_tag" msgid="8571858602896222537">"تحریر کریں"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"لکھنے کیلئے ایک ٹیگ کو تھپتھپائیں…"</string>
@@ -2919,9 +2925,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"خاموش"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"الرٹ"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"وائبریٹ"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"آوازیں آن کریں"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"کبھی نہیں"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3168,7 +3177,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> تک کیلئے صرف الارمز میں تبدیل کریں"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"ہمیشہ مداخلت کریں میں تبدیل کریں"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"اسکرین آن ہونے پر"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"\'ڈسٹرب نہ کریں\' کے ذریعے خاموش کردہ اطلاعات کو اسکرین پر نظر آنے دیں"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"\'ڈسٹرب نہ کریں\' کے ذریعے خاموش کردہ اطلاعات کو اسکرین پر نظر آنے دیں اور اسٹیٹس بار آئیکن دکھائیں"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"اسکرین آف ہونے پر"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"\'ڈسٹرب نہ کریں\' کے ذریعے خاموش کردہ اطلاعات کو اسکرین آن کر کے روشنی جھپکانے دیں"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"\'ڈسٹرب نہ کریں\' کے ذریعے خاموش کردہ اطلاعات کو اسکرین آن کرنے دیں"</string>
@@ -3356,10 +3365,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"‏اس آلہ کو بطور MIDI استعمال کریں"</string>
     <string name="usb_use" msgid="3372728031108932425">"‏اس کیلئے USB استعمال کریں"</string>
     <string name="usb_use_also" msgid="557340935190819370">"‏درجہ ذیل کے لئے بھی USB استعمال کریں"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"‏ڈیفالٹ USB کنفیگریشن"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"کسی اور آلہ کے منسلک ہونے اور آپ کے فون کے غیر مقفل ہونے پر، یہ ترتیبات لاگو ہوں گی۔ صرف قابل اعتماد آلات سے منسلک کریں۔"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"اس آلہ کو چارج کر رہی ہے"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"منسلک آلہ چارج ہو رہا ہے"</string>
@@ -3480,8 +3487,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> میں سے اوسط <xliff:g id="USED_MEMORY">%1$s</xliff:g> میموری استعمال ہوئی"</string>
     <string name="users_summary" msgid="1674864467098487328">"بطور <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> ڈیفالٹ ہے"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"آن"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"آف"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"آن"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"آف"</string>
     <string name="backup_disabled" msgid="485189128759595412">"بیک اپ غیر فعال ہے"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"‏Android <xliff:g id="VERSION">%1$s</xliff:g> پر اپ ڈیٹ کردہ"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"اپ ڈیٹ دستیاب ہے"</string>
@@ -3655,9 +3662,10 @@
     <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">"‏سسٹم UI ڈیمو موڈ"</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="window_trace_quick_settings_title" msgid="3839917000546526898">"ونڈو ٹریس"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"سطح کا ٹریس"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"دفتری پروفائل کی ترتیبات"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"رابطہ تلاش"</string>
@@ -3853,4 +3861,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"ڈرائیونگ کرتے وقت بلوٹوتھ استعمال کریں"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"ڈرائیونگ کرتے وقت خودکار طور بلوٹوتھ آن کریں"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"‏Android 8.0 کی بیٹری کی ترتیبات دیکھیں"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml
index b278c78..1ce3046 100644
--- a/res/values-uz/arrays.xml
+++ b/res/values-uz/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 soat"</item>
     <item msgid="5198271470953124739">"Doim yoniq tursin"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (standart)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Juda past"</item>
     <item msgid="2042505933058940139">"Juda past"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Pulli"</item>
     <item msgid="2266114985518865625">"Bepul"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Avtomatik (kunning vaqtiga qarab)"</item>
+    <item msgid="6620560879508595181">"Har doim yoniq"</item>
+    <item msgid="6385301106124765323">"Har doim o‘chiq"</item>
+  </string-array>
 </resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 241134d..d42ab7d 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Sozlamalarni eslab qolish"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Maksimum ulangan Bluetooth audio qurilmalar"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Maksimum nechta Bluetooth audio qurilma ulash mumkinligi belgilang"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Bluetooth AVDTP kechikishlariga oid hisobotlarni yoqish"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Bluetooth AVDTP kechikishiga oid hisobotlarni olishga ruxsat berish"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Translatsiya"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Simsiz monitorni yoqish"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Hech qanday qurilma topilmadi."</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Ishchi profil joyi"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Ilovalar uchun ruxsatlar"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Joylashuv axboroti so‘rovlari"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Hech qanday ilova yaqin vaqtda joylashuv ma‘lumotini so‘ramadi"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Joylashuv axboroti xizmatlari"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Yuqori batareya sarfi"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Xizmatdan foydalanish"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Rangni tuzatish funksiyasidan foydalanish"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Taglavhalardan foydalanish"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"YONIQ"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"O‘CHIQ"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Yoniq"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"O‘chiq"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Tezkor sozlamalarda ko‘rsatish"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Tuzatish rejimi"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2333,7 +2337,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Hisob ma’lumotlari omboridan foydalanishdan oldin qurilmaning ekraniga qulf o‘rnatishingiz lozim"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"QULF O‘RNATISH"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Ruxsati bor ilovalar"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Favqulodda vaziyat tovushi"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Zaxira nusxa va qayta tiklash"</string>
@@ -2908,6 +2913,7 @@
     <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>
     <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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi’ni sozlash u-n NFC yorliq"</string>
     <string name="write_tag" msgid="8571858602896222537">"Yozish"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Yozish uchun yorliq ustiga bosing…"</string>
@@ -2941,9 +2947,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Taglik karnay bilan ijro etish"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Barcha audio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Faqat media audiosi"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Ovozsiz"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Signal"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Tebranish"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Ovozni yoqish"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Hech qachon"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3190,7 +3199,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"“Faqat signallar” rejimini <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> gacha faol bo‘ladigan qilib yoqish"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Har doim bezovta qilinaversin"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Ekran yoniqligida"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"“Bezovta qilinmasin” rejimi orqali bildirishnomalar o‘chirib qo‘yilganda ular ekranda qalqib chiqishiga ruxsat berish"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Bezovta qilinmasin orqali o‘chirilgan bildirishnomalar qalqib chiqishiga ruxsat berish va holat paneli ikonkasini ko‘rsatish"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Ekran o‘chiqligida"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"“Bezovta qilinmasin” funksiyasi orqali ovozsiz qilingan bildirishnomalar tomonidan ekran va indikator yoqilishiga ruxsat berish"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"“Bezovta qilinmasin” funksiyasi orqali ovozsiz qilingan bildirishnomalar tomonidan ekranning yoqilishiga ruxsat berish"</string>
@@ -3378,10 +3387,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Bu qurilmadan MIDI sifatida foydalanish"</string>
     <string name="usb_use" msgid="3372728031108932425">"USBdan foydalanish"</string>
     <string name="usb_use_also" msgid="557340935190819370">"USB ulanish maqsadi"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Asosiy USB konfiguratsiyasi"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Agar boshqa qurilma ulangan va telefoningiz qulfdan chiqarilgan bo‘lsa, mazkur sozlamalar qo‘llaniladi. Faqat ishonchli qurilmalarga ulaning."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Shu qurilmani quvvatlash"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Ulangan qurilma quvvatlanmoqda"</string>
@@ -3502,8 +3509,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"O‘rtacha <xliff:g id="USED_MEMORY">%1$s</xliff:g> ishlatilmoqda, jami: <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"Siz <xliff:g id="USER_NAME">%1$s</xliff:g> sifatida kirgansiz"</string>
     <string name="payment_summary" msgid="3472482669588561110">"Birlamchi ilova: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"YONIQ"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"O‘CHIQ"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Yoniq"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"O‘chiq"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Zaxiralash o‘chirilgan"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Android <xliff:g id="VERSION">%1$s</xliff:g> versiyasiga yangilandi"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Yangilanish chiqdi"</string>
@@ -3677,9 +3684,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> qurilmasiga ulangan"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Bir nechta qurilmaga ulangan"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Tizim interfeysi demo rejimi"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Tungi rejim"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Tungi rejimni sozlash"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Tezkor sozlamalarning dasturchi tugmalari"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Oyna trassirovkasi"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Yuza trassirovkasi"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope trassirovkasi"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Ishchi profil sozlamalari"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontaktlarni qidirish"</string>
@@ -3875,4 +3883,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Avtomobilda Bluetoothni yoqish"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Avtomobilda harakatlanayotganda Bluetooth aloqasini avtomatik ravishda yoqish"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 batareya sozlamalari"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index f35e3c9..2b3f553 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 giờ"</item>
     <item msgid="5198271470953124739">"Không bao giờ hết thời gian chờ"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (Mặc định)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Kém"</item>
     <item msgid="2042505933058940139">"Kém"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Xử lý như là mạng có đo lượng dữ liệu"</item>
     <item msgid="2266114985518865625">"Xử lý như là mạng không đo lượng dữ liệu"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Tự động (dựa vào thời gian trong ngày)"</item>
+    <item msgid="6620560879508595181">"Luôn bật"</item>
+    <item msgid="6385301106124765323">"Luôn tắt"</item>
+  </string-array>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 42ae0c5..c3d4d21 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -482,8 +482,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Bảo vệ máy tính bảng của bạn"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Bảo vệ thiết bị của bạn"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Bảo vệ điện thoại của bạn"</string>
-    <!-- no translation found for lock_settings_picker_fingerprint_added_security_message (5008939545428518367) -->
-    <skip />
+    <string name="lock_settings_picker_fingerprint_added_security_message" msgid="5008939545428518367">"Để tăng cường bảo mật, hãy đặt khóa màn hình dự phòng"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Ngăn người khác sử dụng máy tính bảng này mà không có sự cho phép của bạn bằng cách kích hoạt tính năng bảo vệ thiết bị. Chọn khóa màn hình bạn muốn sử dụng."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Ngăn người khác sử dụng thiết bị này mà không có sự cho phép của bạn bằng cách kích hoạt tính năng bảo vệ thiết bị. Chọn khóa màn hình bạn muốn sử dụng."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Ngăn người khác sử dụng điện thoại này mà không có sự cho phép của bạn bằng cách kích hoạt tính năng bảo vệ thiết bị. Chọn khóa màn hình bạn muốn sử dụng."</string>
@@ -708,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Nhớ cài đặt"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Số thiết bị âm thanh được kết nối qua Bluetooth tối đa"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Chọn số thiết bị âm thanh được kết nối qua Bluetooth tối đa"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Bật báo cáo độ trễ AVDTP của Bluetooth"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Cho phép nhận báo cáo độ trễ AVDTP của Bluetooth"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Truyền"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Bật hiển thị không dây"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Không tìm thấy thiết bị lân cận nào."</string>
@@ -924,8 +925,7 @@
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Thiết lập điểm phát sóng Wi‑Fi"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Điểm phát sóng AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
-    <!-- no translation found for wifi_tether_disabled_by_airplane (414480185654767932) -->
-    <skip />
+    <string name="wifi_tether_disabled_by_airplane" msgid="414480185654767932">"Không sử dụng được vì chế độ trên máy bay đang bật"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Gọi qua Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="7766895085362824508">"Mở rộng vùng phủ sóng cuộc gọi bằng Wi‑Fi"</string>
     <string name="wifi_calling_suggestion_summary" msgid="6460250990899143406">"Bật tính năng gọi qua Wi‑Fi"</string>
@@ -1443,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Vị trí của hồ sơ công việc"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Quyền cấp ứng dụng"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Yêu cầu vị trí gần đây"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Không có ứng dụng nào yêu cầu vị trí gần đây"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Dịch vụ vị trí"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Mức sử dụng pin cao"</string>
@@ -1491,17 +1493,13 @@
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Thông tin an toàn"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="142307697309858185">"Bạn chưa có kết nối dữ liệu. Để xem thông tin này ngay bây giờ, hãy truy cập %s từ máy tính bất kỳ đã kết nối với Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Đang tải…"</string>
-    <!-- no translation found for lockpassword_choose_your_screen_lock_header (2942199737559900752) -->
-    <skip />
-    <!-- no translation found for lockpassword_choose_your_password_message (5377842480961577542) -->
-    <skip />
+    <string name="lockpassword_choose_your_screen_lock_header" msgid="2942199737559900752">"Đặt khóa màn hình"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="5377842480961577542">"Để bảo mật, hãy đặt mật khẩu"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Để dùng vân tay, đặt mật khẩu"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Để dùng vân tay, đặt hình m.khóa"</string>
-    <!-- no translation found for lockpassword_choose_your_pin_message (6658264750811929338) -->
-    <skip />
+    <string name="lockpassword_choose_your_pin_message" msgid="6658264750811929338">"Để bảo mật, hãy đặt mã PIN"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Để dùng vân tay, đặt mã PIN"</string>
-    <!-- no translation found for lockpassword_choose_your_pattern_message (8631545254345759087) -->
-    <skip />
+    <string name="lockpassword_choose_your_pattern_message" msgid="8631545254345759087">"Để bảo mật, hãy đặt hình mở khóa"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="1266027268220850931">"Nhập lại mật khẩu của bạn"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Xác nhận hình của bạn"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Nhập lại mã PIN của bạn"</string>
@@ -1886,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Sử dụng dịch vụ"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Sử dụng tính năng sửa màu"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Sử dụng phụ đề"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"BẬT"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"TẮT"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Bật"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Tắt"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Hiển thị trong Cài đặt nhanh"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Chế độ sửa"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2319,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Trước khi bạn có thể sử dụng vùng lưu trữ thông tin xác thực, thiết bị của bạn cần có màn hình khóa bản mật"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"THIẾT LẬP KHÓA"</string>
     <string name="usage_access_title" msgid="332333405495457839">"ƯD có quyền tr.cập s.dụng"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Âm khẩn cấp"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Sao lưu &amp; khôi phục"</string>
@@ -2894,6 +2893,7 @@
     <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>
     <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>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Thiết lập thẻ NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Ghi"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Nhấn vào một thẻ để ghi..."</string>
@@ -2927,9 +2927,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Phát âm đế kết nối"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Tất cả âm thanh"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Chỉ âm thanh phương tiện"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Im lặng"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Thông báo"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Rung"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Âm thanh bật nguồn"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Không bao giờ"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3176,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Đổi sang báo thức chỉ đến khi <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Đổi sang luôn làm gián đoạn"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Khi màn hình bật"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Cho phép thông báo đã bị tắt tiếng bằng tính năng Không làm phiền hiển thị trên màn hình"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Cho phép thông báo đã bị tắt tiếng bằng tính năng Không làm phiền bật lên màn hình và hiển thị biểu tượng thanh trạng thái"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Khi màn hình tắt"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Cho phép thông báo đã bị tắt tiếng bằng tính năng Không làm phiền bật màn hình và đèn"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Cho phép thông báo đã bị tắt tiếng bằng tính năng Không làm phiền bật màn hình"</string>
@@ -3364,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Sử dụng thiết bị này làm MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Sử dụng USB cho"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Ngoài ra, sử dụng USB để"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Cấu hình USB mặc định"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Sẽ áp dụng những cài đặt này khi có một thiết bị khác được kết nối và điện thoại của bạn được mở khóa. Bạn chỉ nên kết nối với các thiết bị đáng tin cậy."</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Sạc thiết bị này"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Sạc thiết bị được kết nối"</string>
@@ -3488,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Trung bình <xliff:g id="USED_MEMORY">%1$s</xliff:g>/<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> bộ nhớ được sử dụng"</string>
     <string name="users_summary" msgid="1674864467098487328">"Đã đăng nhập với tên <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> là mặc định"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"BẬT"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"TẮT"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Bật"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Tắt"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Đã tắt sao lưu"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Đã cập nhật lên Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Đã có bản cập nhật"</string>
@@ -3663,9 +3664,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Được kết nối với <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Được kết nối với nhiều thiết bị"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Chế độ trình diễn giao diện người dùng hệ thống"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Chế độ ban đêm"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Đặt chế độ ban đêm"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Ô nhà phát triển cài đặt nhanh"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Theo dõi cửa sổ"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Hiển thị dấu vết"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Dấu vết 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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Cài đặt hồ sơ công việc"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Tìm kiếm liên hệ"</string>
@@ -3861,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Sử dụng Bluetooth khi đang lái xe"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Tự động bật Bluetooth khi đang lái xe"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Xem cài đặt pin trong Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index b31d67f..bc43c9d 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1小时"</item>
     <item msgid="5198271470953124739">"永不超时"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1（默认）"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"弱"</item>
     <item msgid="2042505933058940139">"微弱"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"视为按流量计费"</item>
     <item msgid="2266114985518865625">"视为不按流量计费"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"自动（根据一天中的时段）"</item>
+    <item msgid="6620560879508595181">"始终开启"</item>
+    <item msgid="6385301106124765323">"始终关闭"</item>
+  </string-array>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 1e947f5..51325f4 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"记住设置"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"已连接蓝牙音频设备的数量上限"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"选择已连接蓝牙音频设备的数量上限"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"启用蓝牙 AVDTP 延迟报告"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"允许接收蓝牙 AVDTP 延迟报告"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"投射"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"开启无线显示"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"未在附近找到设备。"</string>
@@ -1441,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"工作资料位置信息"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"应用级权限"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"最近的位置信息请求"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"最近没有任何应用申请使用位置信息"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"位置信息服务"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"高电耗"</string>
@@ -1880,8 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"使用服务"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"使用色彩校正"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"使用字幕"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"开启"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"关闭"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"开启"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"关闭"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"在“快捷设置”中显示"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"校正模式"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -1945,18 +1949,18 @@
     <string name="color_cyan" msgid="7033027180641173211">"青色"</string>
     <string name="color_yellow" msgid="9112680561610873529">"黄色"</string>
     <string name="color_magenta" msgid="5059212823607815549">"紫红色"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"要启用<xliff:g id="SERVICE">%1$s</xliff:g>吗？"</string>
-    <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>需要："</string>
+    <string name="enable_service_title" msgid="3061307612673835592">"要使用 <xliff:g id="SERVICE">%1$s</xliff:g> 吗？"</string>
+    <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> 需要："</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"由于某个应用遮挡了权限请求界面，因此“设置”应用无法验证您的回应。"</string>
-    <string name="enable_service_encryption_warning" msgid="3064686622453974606">"如果您开启<xliff:g id="SERVICE">%1$s</xliff:g>，您的设备将无法使用屏幕锁定来增强数据加密。"</string>
+    <string name="enable_service_encryption_warning" msgid="3064686622453974606">"如果您开启 <xliff:g id="SERVICE">%1$s</xliff:g>，您的设备将无法使用屏幕锁定来增强数据加密。"</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"由于您已开启无障碍服务，因此您的设备将无法使用屏幕锁定来增强数据加密。"</string>
-    <string name="enable_service_pattern_reason" msgid="777577618063306751">"由于开启<xliff:g id="SERVICE">%1$s</xliff:g>会影响数据加密，因此您需要确认您的解锁图案。"</string>
-    <string name="enable_service_pin_reason" msgid="7882035264853248228">"由于开启<xliff:g id="SERVICE">%1$s</xliff:g>会影响数据加密，因此您需要确认您的 PIN 码。"</string>
-    <string name="enable_service_password_reason" msgid="1224075277603097951">"由于开启<xliff:g id="SERVICE">%1$s</xliff:g>会影响数据加密，因此您需要确认您的密码。"</string>
+    <string name="enable_service_pattern_reason" msgid="777577618063306751">"由于开启 <xliff:g id="SERVICE">%1$s</xliff:g> 会影响数据加密，因此您需要确认您的解锁图案。"</string>
+    <string name="enable_service_pin_reason" msgid="7882035264853248228">"由于开启 <xliff:g id="SERVICE">%1$s</xliff:g> 会影响数据加密，因此您需要确认您的 PIN 码。"</string>
+    <string name="enable_service_password_reason" msgid="1224075277603097951">"由于开启 <xliff:g id="SERVICE">%1$s</xliff:g> 会影响数据加密，因此您需要确认您的密码。"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"监测您的操作"</string>
     <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"在您与应用互动时接收通知。"</string>
-    <string name="disable_service_title" msgid="3624005212728512896">"要停用<xliff:g id="SERVICE">%1$s</xliff:g>吗？"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"点按“确定”会让“<xliff:g id="SERVICE">%1$s</xliff:g>”停止运行。"</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"要停用 <xliff:g id="SERVICE">%1$s</xliff:g> 吗？"</string>
+    <string name="disable_service_message" msgid="2247101878627941561">"点按“确定”将会停用 <xliff:g id="SERVICE">%1$s</xliff:g>。"</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"未安装任何服务"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"未选择任何服务"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"没有提供说明。"</string>
@@ -2313,7 +2317,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"您的设备必须启用安全锁定屏幕功能，才能使用凭据存储"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"设置锁定方式"</string>
     <string name="usage_access_title" msgid="332333405495457839">"有权查看使用情况的应用"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"紧急提示音"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"设置进行紧急呼救时的行为"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"备份"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"备份和还原"</string>
@@ -2888,6 +2893,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"序列号, 硬件版本"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"Android 安全补丁程序级别, 基带版本, 内核版本"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"主动显示, 锁定屏幕显示"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"指纹"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"设置WLAN NFC标签"</string>
     <string name="write_tag" msgid="8571858602896222537">"写入"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"点按标签即可写入…"</string>
@@ -2921,9 +2927,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"静音"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"警示音"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"振动"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"开机音效"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"永不"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3170,7 +3179,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"更改为仅限闹钟（到<xliff:g id="FORMATTEDTIME">%1$s</xliff:g>）"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"更改为一律允许打扰"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"当屏幕开启时"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"允许在“勿扰”模式下被静音的通知在屏幕上弹出"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"允许在“勿扰”模式下被静音的通知在屏幕上弹出，并显示状态栏图标"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"当屏幕关闭时"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"允许在“勿扰”模式下被静音的通知开启屏幕并闪烁指示灯"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"允许在“勿扰”模式下被静音的通知开启屏幕"</string>
@@ -3358,10 +3367,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"将此设备用作 MIDI 设备"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB 的用途"</string>
     <string name="usb_use_also" msgid="557340935190819370">"同时将 USB 用于以下用途："</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"默认 USB 配置"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"连接到其他设备且您的手机处于解锁状态时，系统就会应用这些设置。请只连接到可信设备。"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"为此设备充电"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"为连接的设备充电"</string>
@@ -3482,8 +3489,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"平均内存用量为 <xliff:g id="USED_MEMORY">%1$s</xliff:g>，共 <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"目前登录的用户为：<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>"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"开启"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"关闭"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"开启"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"关闭"</string>
     <string name="backup_disabled" msgid="485189128759595412">"备份功能已停用"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"已更新至 Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"有新版本可用"</string>
@@ -3657,9 +3664,10 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"快捷设置开发者图块"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"窗口跟踪"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"表面跟踪"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"工作资料设置"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"联系人搜索"</string>
@@ -3855,4 +3863,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"开车时使用蓝牙"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"开车时自动开启蓝牙"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"请查看 Android 8.0 电池设置"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index b58004d..e64f2b7 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 小時"</item>
     <item msgid="5198271470953124739">"永不逾時"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (預設)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"低"</item>
     <item msgid="2042505933058940139">"弱"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"設定為按數據用量收費"</item>
     <item msgid="2266114985518865625">"設定為不限數據用量收費"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"自動 (根據時間)"</item>
+    <item msgid="6620560879508595181">"永遠開啟"</item>
+    <item msgid="6385301106124765323">"一律關閉"</item>
+  </string-array>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index f7fe9dc..7232524 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"記住設定"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"已連接藍牙音訊裝置的數量上限"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"選取已連接藍牙音訊裝置的數量上限"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"啟用藍牙 AVDTP 延遲報告"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"允許接收藍牙 AVDTP 延遲報告"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"投放"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"啟用無線螢幕分享"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"找不到附近的裝置。"</string>
@@ -1442,6 +1444,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"工作設定檔的位置"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"應用程式層級權限"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"最近的位置資訊要求"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"最近沒有應用程式要求存取位置資料"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"位置資訊服務"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"高耗電量"</string>
@@ -1881,8 +1885,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"使用服務"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"使用色彩校正"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"使用字幕"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"開啟"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"關閉"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"開啟"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"關閉"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"在「快速設定」中顯示"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"校正模式"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2316,7 +2320,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"您的裝置必須設有安全螢幕鎖定功能，才能使用認證儲存空間"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"設定上鎖方式"</string>
     <string name="usage_access_title" msgid="332333405495457839">"可存取使用狀況的應用程式"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"緊急警示音"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"設定撥打緊急電話時的運作方式"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"備份"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"備份與還原"</string>
@@ -2891,6 +2896,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"序號, 硬件版本"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"Android 安全性修補程式等級, 基頻版本, 核心版本"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"環境顯示，上鎖畫面顯示"</string>
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"指紋"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"設定 Wi-Fi NFC 標籤"</string>
     <string name="write_tag" msgid="8571858602896222537">"寫入"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"輕按標籤即可寫入…"</string>
@@ -2924,9 +2930,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"靜音"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"警示"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"震動"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"開機聲音"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"永不"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3173,7 +3182,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"響 <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>前改為只允許鬧鐘"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"變更為永遠允許干擾"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"螢幕開啟時"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"允許「請勿騷擾」模式設為靜音的通知在螢幕上彈出"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"允許「請勿騷擾」模式設為靜音的通知在畫面上彈出通知，並顯示狀態列圖示"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"螢幕關閉時"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"允許「請勿騷擾」模式設為靜音的通知開啟螢幕及閃燈"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"允許「請勿騷擾」模式設為靜音的通知開啟螢幕"</string>
@@ -3361,10 +3370,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"在 MIDI 模式下使用此裝置"</string>
     <string name="usb_use" msgid="3372728031108932425">"使用 USB 於"</string>
     <string name="usb_use_also" msgid="557340935190819370">"使用 USB 時同時開啟以下模式"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"預設 USB 設定"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"連接至其他裝置且您的手機處於解鎖狀態時，系統便會套用這些設定。請務必只連接至信任的裝置。"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"為此裝置充電"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"正在為連接的裝置充電"</string>
@@ -3485,8 +3492,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"平均記憶體用量為 <xliff:g id="USED_MEMORY">%1$s</xliff:g> (共 <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>)"</string>
     <string name="users_summary" msgid="1674864467098487328">"已使用<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>」"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"開啟"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"關閉"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"開啟"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"關閉"</string>
     <string name="backup_disabled" msgid="485189128759595412">"已停用備份功能"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"已更新至 Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"有可用的更新"</string>
@@ -3660,9 +3667,10 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"快速設定開發人員圖塊"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"視窗追蹤"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"表層追蹤"</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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"工作設定檔設定"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"聯絡人搜尋"</string>
@@ -3858,4 +3866,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"駕駛時使用藍牙"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"駕駛時自動開啟藍牙"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"請查看 Android 8.0 電池設定"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 831218d..226796c 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 小時"</item>
     <item msgid="5198271470953124739">"無時限"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 (預設)"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"差"</item>
     <item msgid="2042505933058940139">"差"</item>
@@ -497,7 +489,9 @@
     <item msgid="8745603368609022803">"視為計量付費"</item>
     <item msgid="2266114985518865625">"視為非計量付費"</item>
   </string-array>
-    <!-- no translation found for dark_ui_mode_entries:0 (146804192658443142) -->
-    <!-- no translation found for dark_ui_mode_entries:1 (6620560879508595181) -->
-    <!-- no translation found for dark_ui_mode_entries:2 (6385301106124765323) -->
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"自動 (依照時段)"</item>
+    <item msgid="6620560879508595181">"一律開啟"</item>
+    <item msgid="6385301106124765323">"一律關閉"</item>
+  </string-array>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index e8200f4..7680b15 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -707,10 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"記住設定"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"已連線藍牙音訊裝置的數量上限"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"選取已連線藍牙音訊裝置的數量上限"</string>
-    <!-- no translation found for bluetooth_enable_avdtp_delay_reports (5101903170688399944) -->
-    <skip />
-    <!-- no translation found for bluetooth_enable_avdtp_delay_reports_summary (7052797876020616399) -->
-    <skip />
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"啟用藍牙 AVDTP 延遲報告"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"允許接收藍牙 AVDTP 延遲報告"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"投放"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"啟用無線螢幕分享"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"找不到附近的裝置。"</string>
@@ -1445,6 +1443,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Work 設定檔位置資訊"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"應用程式層級權限"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"最近的定位要求"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"最近沒有應用程式要求存取位置資訊"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"定位服務"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"耗電量高"</string>
@@ -1884,10 +1884,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"使用服務"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"使用色彩校正"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"使用字幕"</string>
-    <!-- no translation found for accessibility_summary_state_enabled (7914278500885887763) -->
-    <skip />
-    <!-- no translation found for accessibility_summary_state_disabled (2984230257590246745) -->
-    <skip />
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"開啟"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"關閉"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"在快速設定中顯示"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"校正模式"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2323,7 +2321,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"你必須啟用裝置的安全螢幕鎖定功能，才能使用憑證儲存空間"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"設定鎖定功能"</string>
     <string name="usage_access_title" msgid="332333405495457839">"有權查看使用情況的應用程式"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"緊急警示音"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <string name="emergency_tone_summary" msgid="722259232924572153">"設定撥打緊急電話時的運作方式"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"備份"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"備份與還原"</string>
@@ -2898,8 +2897,7 @@
     <string name="keywords_model_and_hardware" msgid="1459248377212829642">"序號、硬體版本"</string>
     <string name="keywords_android_version" msgid="9069747153590902819">"Android 安全性修補程式等級、基頻版本、核心版本"</string>
     <string name="keywords_ambient_display_screen" msgid="5874969496073249362">"微光螢幕, 螢幕鎖定畫面"</string>
-    <!-- no translation found for keywords_fingerprint_settings (239222512315619538) -->
-    <skip />
+    <string name="keywords_fingerprint_settings" msgid="239222512315619538">"指紋"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"設定 Wi-Fi NFC 標記"</string>
     <string name="write_tag" msgid="8571858602896222537">"寫入"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"輕觸標記即可寫入..."</string>
@@ -2933,9 +2931,12 @@
     <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>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"靜音"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"警示"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"震動"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"啟動音效"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"永不"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3182,8 +3183,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"變更為僅允許鬧鐘模式，結束時間為 <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"變更為一律允許干擾模式"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"螢幕開啟時"</string>
-    <!-- no translation found for zen_mode_screen_on_summary (2208664848367443505) -->
-    <skip />
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"允許「零打擾」模式設為靜音的通知在畫面上彈出通知並顯示狀態列圖示"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"螢幕關閉時"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"允許「零打擾」模式設為靜音的通知開啟螢幕及閃爍燈光"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"允許「零打擾」模式設為靜音的通知開啟螢幕"</string>
@@ -3371,10 +3371,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"將這個裝置用做 MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"USB 用途"</string>
     <string name="usb_use_also" msgid="557340935190819370">"使用 USB 時一併開啟以下模式"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"預設 USB 設定"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"連接至其他裝置且你的手機處於解鎖狀態時，這些設定就會生效。請務必只連接至信任的裝置。"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"為這個裝置充電"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"正在為連接的裝置充電"</string>
@@ -3495,10 +3493,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"平均記憶體用量為 <xliff:g id="USED_MEMORY">%1$s</xliff:g> (共 <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>)"</string>
     <string name="users_summary" msgid="1674864467098487328">"登入身分：<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>」"</string>
-    <!-- no translation found for location_on_summary (3637699010986988970) -->
-    <skip />
-    <!-- no translation found for location_off_summary (7217264690673949107) -->
-    <skip />
+    <string name="location_on_summary" msgid="3637699010986988970">"開啟"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"關閉"</string>
     <string name="backup_disabled" msgid="485189128759595412">"備份功能已停用"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"已更新至 Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"有可用的更新"</string>
@@ -3672,13 +3668,10 @@
     <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">"系統 UI 示範模式"</string>
-    <!-- no translation found for dark_ui_mode (2112241426441807273) -->
-    <skip />
-    <!-- no translation found for dark_ui_mode_title (975299966259850992) -->
-    <skip />
+    <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>
-    <!-- no translation found for winscope_trace_quick_settings_title (1294290008255732032) -->
-    <skip />
+    <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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Work 設定檔設定"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"聯絡人搜尋"</string>
@@ -3874,4 +3867,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"開車時使用藍牙"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"開車時自動開啟藍牙"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"請查看 Android 8.0 電池設定"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index dfd6f9f..4078c03 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -138,20 +138,12 @@
     <item msgid="477015974247590543">"1 ihora"</item>
     <item msgid="5198271470953124739">"Ayiphelelwa isikhathi"</item>
   </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="60897909354162249">"1 Okuzenzakalelayo"</item>
-    <item msgid="7584056855393485416">"2"</item>
-    <item msgid="844570832050176311">"3"</item>
-    <item msgid="1896812737336024220">"4"</item>
-    <item msgid="2664420770707984266">"5"</item>
-  </string-array>
-  <string-array name="bluetooth_max_connected_audio_devices_values">
-    <item msgid="1992185266918208754">"1"</item>
-    <item msgid="2731443086402670729">"2"</item>
-    <item msgid="74627748729027880">"3"</item>
-    <item msgid="2654447223197666662">"4"</item>
-    <item msgid="7026157954713482328">"5"</item>
-  </string-array>
+    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
+    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Akukuhle"</item>
     <item msgid="2042505933058940139">"Akukuhle"</item>
@@ -497,4 +489,9 @@
     <item msgid="8745603368609022803">"Phatha njengokulinganisiwe"</item>
     <item msgid="2266114985518865625">"Phatha njengokungalinganisiwe"</item>
   </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="146804192658443142">"Okuzenzakalelayo (kusukela kusikhathi sosuku)"</item>
+    <item msgid="6620560879508595181">"Ihlala ivuliwe"</item>
+    <item msgid="6385301106124765323">"Ihlala ivaliwe"</item>
+  </string-array>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index cd05e61..8a27ad2 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -707,6 +707,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Khumbula izilungiselelo"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6752690395207847881">"Amadivayisi omsindo e-Bluetooth axhumekile"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="5936561749790095473">"Khetha inombolo enkulu yamadivayisi omsindo we-Bluetooth axhumekile"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports" msgid="5101903170688399944">"Nika amandla imibiko yokulibaziseka kwe-Bluetooth AVDTP"</string>
+    <string name="bluetooth_enable_avdtp_delay_reports_summary" msgid="7052797876020616399">"Vumela ukwamukela imibiko yokulibaziseka kwe-Bluetooth AVDTP"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Abalingisi"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Nika amandla ukubukeka okungenantambo "</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Awekho amadivayisi aseduze atholakele."</string>
@@ -1442,6 +1444,8 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Indawo yephrofayela yokusebenza"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Izimvume zeleveli yohlelo lokusebenza"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Izicelo zendawo zakamuva"</string>
+    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
+    <skip />
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Azikho izinhlelo zokusebenza ezicele indawo kamuva nje"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Amasevisi wendawo"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Ukusebenzisa ibhethri okuphezulu"</string>
@@ -1881,8 +1885,8 @@
     <string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Sebeenzisa isevisi"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Sebenzisa ukulungisa kombala"</string>
     <string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Sebenzisa amagama-ncazo"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"VULIWE"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"VALIWE"</string>
+    <string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Vuliwe"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Valiwe"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Bonisa Kuzilungiselelo Ezisheshayo"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Imodi yokulungisa"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -2314,7 +2318,8 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Ngaphambi kokuthi usebenzise isitoreji sezitifiketi, idivayisi yakho kumele ibe nokukhiya isikrini okuvikelekile"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"SETHA UKUKHIYA"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Izinhlelo zokusebenza ezinokufinyelela kokusebenza"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Ithoni ephuthumayo"</string>
+    <!-- no translation found for emergency_tone_title (254495218194925271) -->
+    <skip />
     <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_section_title" msgid="7952232291452882740">"Isipele ukubuyiselwa"</string>
@@ -2889,6 +2894,7 @@
     <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>
     <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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Setha umaka we-Wi-Fi NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"Bhala"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Thepha umaki ukuze ubhale..."</string>
@@ -2922,9 +2928,12 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Isipikha sedokhu sidlala"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Wonke umsindo"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Umsindo wemidiya kuphela"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Thulile"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Isaziso"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Dlidliza"</string>
+    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
+    <skip />
+    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
+    <skip />
+    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
+    <skip />
     <string name="boot_sounds_title" msgid="567029107382343709">"Amandla kumisindo"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Soze"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3171,7 +3180,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Guqulela kuma-alamu kuphela kuze kube ngumhla ka-<xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Guqulela kuhlala uphazamisa"</string>
     <string name="zen_mode_screen_on" msgid="8774571998575673502">"Uma isikrini sivulekile"</string>
-    <string name="zen_mode_screen_on_summary" msgid="5385338884695802115">"Vumela izaziso zithuliswe ngesigelekeqe sokuthi ungaphazamisi esikrinini"</string>
+    <string name="zen_mode_screen_on_summary" msgid="2208664848367443505">"Vumela izaziso ezithuliswe okuzivelelayo kokungaphazamisi kusikrini uphinde ubonise isithonjana sebha yesimo"</string>
     <string name="zen_mode_screen_off" msgid="3144446765110327937">"Uma isikrini sivalekile"</string>
     <string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"Vumela izaziso ukuthi zithuliswe ngokuthi Ungaphazamisi kuvule isikrini futhi kukhanyisa isibani"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Vumela izaziso zithuliswe ngokuthi Ungaphazamisi kuvule isikrini"</string>
@@ -3359,10 +3368,8 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Sebenzisa le divayisi njenge-MIDI"</string>
     <string name="usb_use" msgid="3372728031108932425">"Sebenzisela i-USB i-"</string>
     <string name="usb_use_also" msgid="557340935190819370">"Phinda usebenzise i-USB ku-"</string>
-    <!-- no translation found for usb_default_label (4217189967858707974) -->
-    <skip />
-    <!-- no translation found for usb_default_info (8864535445796200695) -->
-    <skip />
+    <string name="usb_default_label" msgid="4217189967858707974">"Ukulungiswa kwe-USB okuzenzakalelayo"</string>
+    <string name="usb_default_info" msgid="8864535445796200695">"Uma enye idivayisi ixhunyiwe futhi ifoni yakho ivulekile, lesi zilungiselelo zizosebenza. Kuxhumeke kuphela kumadivayisi athembekile."</string>
     <string name="usb_pref" msgid="1400617804525116158">"I-USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Ishaja le divayisi"</string>
     <string name="usb_summary_power_only" msgid="1996391096369798526">"Ishaja idivayisi exhunyiwe"</string>
@@ -3483,8 +3490,8 @@
     <string name="memory_summary" msgid="8080825904671961872">"Okumaphakathi okungu-<xliff:g id="USED_MEMORY">%1$s</xliff:g> kokungu-<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> imemori esetshenzisiwe"</string>
     <string name="users_summary" msgid="1674864467098487328">"Ungene ngemvume njengo-<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> eyokuzenzakalela"</string>
-    <string name="location_on_summary" msgid="4083334422422067511">"KUVULIWE"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"KUCINYIWE"</string>
+    <string name="location_on_summary" msgid="3637699010986988970">"Vuliwe"</string>
+    <string name="location_off_summary" msgid="7217264690673949107">"Valiwe"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Ukwenza isipele kukhutshaziwe"</string>
     <string name="android_version_summary" msgid="2935995161657697278">"Ibuyekezelwe ku-Android engu-<xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="487831391976523090">"Isibuyekezo siyatholakala"</string>
@@ -3658,9 +3665,10 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Ixhumeke ku-<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Ixhumeke kumadivayisi amaningi"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Imodi yedemo ye-UI yesistimu"</string>
+    <string name="dark_ui_mode" msgid="2112241426441807273">"Imodi yasebusuku"</string>
+    <string name="dark_ui_mode_title" msgid="975299966259850992">"Setha imodi yasebusuku"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Othayela bonjiniyela bezilungiselelo ezisheshayo"</string>
-    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Ukulandela kwewindi"</string>
-    <string name="layer_trace_quick_settings_title" msgid="876797401275734018">"Ukulandelela okuphansi"</string>
+    <string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Ukulandelelwa kwe-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>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Izilungiselelo zephrofayela yomsebenzi"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Usesho loxhumana naye"</string>
@@ -3856,4 +3864,14 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Sebenzisa i-Bluetooth uma ushayela"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Vula i-Bluetooth ngokuzenzakalelayo uma ushayela"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Bona izilungiselelo zebhethri ze-Android 8.0"</string>
+    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
+    <skip />
+    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
+    <skip />
+    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
+    <skip />
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 6ede7c6..c684dc6 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -60,6 +60,9 @@
 
     <dimen name="captioning_preview_height">200dp</dimen>
 
+    <dimen name="color_mode_preview_height">320dp</dimen>
+    <dimen name="color_mode_preview_padding_bottom">40dp</dimen>
+
     <dimen name="ring_progress_bar_thickness">4dp</dimen>
     <dimen name="settings_side_margin">0dip</dimen>
 
@@ -304,13 +307,10 @@
 
     <!-- Suggestion cards size and padding -->
     <dimen name="suggestion_card_icon_size">24dp</dimen>
-    <dimen name="suggestion_card_width_multiple_cards">156dp</dimen>
     <dimen name="suggestion_card_outer_margin">14dp</dimen>
     <dimen name="suggestion_card_inner_margin">12dp</dimen>
     <dimen name="suggestion_card_padding_bottom_one_card">16dp</dimen>
     <dimen name="suggestion_card_corner_radius">2dp</dimen>
-    <dimen name="suggestion_card_title_padding_bottom_one_card">6dp</dimen>
-    <dimen name="suggestion_card_title_padding_bottom_multiple_cards">8dp</dimen>
 
     <!-- Padding for the reset screens -->
     <dimen name="reset_checkbox_padding_end">8dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 38a1f6f..2c91942 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7412,15 +7412,9 @@
     <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule dialog button caption -->
     <string name="zen_mode_delete_rule_button">Delete</string>
 
-    <!-- [CHAR LIMIT=40] Zen mode settings: External rule type -->
-    <string name="zen_mode_rule_type">Rule type</string>
-
     <!-- [CHAR LIMIT=40] Zen mode settings: External rule type name if unknown -->
     <string name="zen_mode_rule_type_unknown">Unknown</string>
 
-    <!-- [CHAR LIMIT=40] Zen mode settings: Configure external rule -->
-    <string name="zen_mode_configure_rule">Configure rule</string>
-
     <!-- [CHAR LIMIT=NONE] Zen mode behavior settings footer: footer describing why the user cannot change the current do not disturb behavior settings -->
     <string name="zen_mode_app_set_behavior">These settings can\'t be changed right now. An app (<xliff:g id="app_name" example="Android Services">%1$s</xliff:g>) has automatically turned on Do Not Disturb with custom behavior."</string>
 
@@ -9375,4 +9369,18 @@
 
     <!-- Title for item to go to old battery settings page when clicking [CHAR LIMIT=100] -->
     <string name="dev_android_o_battery_settings_title">See Android 8.0 battery settings</string>
+    <!-- Title for Wifi Access settings [CHAR LIMIT=35] -->
+    <string name="change_wifi_state_title">Toggle wifi on and off</string>
+    <!-- Keywords for Wifi Access settings [CHAR LIMIT=35] -->
+    <string name="keywords_change_wifi_state">toggle wifi on and off</string>
+
+    <!-- Apps > App Details > Advanced section string title. [CHAR LIMIT=35] -->
+    <string name="change_wifi_state_app_detail_title">Toggle wifi on and off</string>
+
+    <!-- Apps > App Details > Wifi access > Switch title. [CHAR LIMIT=NONE] -->
+    <string name="change_wifi_state_app_detail_switch">Allow toggle wifi</string>
+
+    <!-- Apps > App Details > Wifi access > Description. [CHAR LIMIT=NONE] -->
+    <string name="change_wifi_state_app_detail_summary">Allow this app to change wifi state including connecting to wifi and turing wifi on and off.</string>
+
 </resources>
diff --git a/res/xml/app_and_notification.xml b/res/xml/app_and_notification.xml
index 9fc29c3..05739b8 100644
--- a/res/xml/app_and_notification.xml
+++ b/res/xml/app_and_notification.xml
@@ -20,7 +20,7 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="apps_and_notification_screen"
     android:title="@string/app_and_notification_dashboard_title"
-    settings:initialExpandedChildrenCount="8">
+    settings:initialExpandedChildrenCount="9">
 
     <PreferenceCategory
         android:key="recent_apps_category"
diff --git a/res/xml/change_wifi_state_details.xml b/res/xml/change_wifi_state_details.xml
new file mode 100644
index 0000000..6121f00
--- /dev/null
+++ b/res/xml/change_wifi_state_details.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="change_wifi_state"
+    android:title="@string/change_wifi_state_app_detail_title">
+
+  <SwitchPreference
+      android:key="app_ops_settings_switch"
+      android:title="@string/change_wifi_state_app_detail_switch"/>
+
+  <Preference
+      android:key="app_ops_settings_preference"
+      android:summary="@string/change_wifi_state_app_detail_summary"
+      android:selectable="false"/>
+
+</PreferenceScreen>
diff --git a/res/xml/configure_notification_settings.xml b/res/xml/configure_notification_settings.xml
index 9d72441..5447c9c 100644
--- a/res/xml/configure_notification_settings.xml
+++ b/res/xml/configure_notification_settings.xml
@@ -25,17 +25,6 @@
         android:title="@string/lock_screen_notifications_title"
         android:summary="@string/summary_placeholder"/>
 
-    <PreferenceCategory
-        android:key="lock_screen_notifications_profile_header"
-        android:title="@string/profile_section_header">
-
-        <com.android.settings.RestrictedListPreference
-            android:key="lock_screen_notifications_profile"
-            android:title="@string/lock_screen_notifications_title"
-            android:summary="@string/summary_placeholder"/>
-
-    </PreferenceCategory>
-
     <!-- Notification badging -->
     <SwitchPreference
         android:key="notification_badging"
@@ -84,5 +73,19 @@
         </Preference>
     </PreferenceCategory>
 
+    <!-- Place work profile section at the bottom to avoid users thinking that any of the
+         above settings are specific to the work profile -->
+    <PreferenceCategory
+        android:key="lock_screen_notifications_profile_header"
+        android:title="@string/profile_section_header"
+        android:order="23">
+
+        <com.android.settings.RestrictedListPreference
+            android:key="lock_screen_notifications_profile"
+            android:title="@string/lock_screen_notifications_title"
+            android:summary="@string/summary_placeholder"
+            android:order="24"/>
+
+    </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index 3f96c58..d616bb6 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -25,7 +25,7 @@
             android:title="@string/location_category_recent_location_requests"/>
 
         <Preference
-            android:key="recent_location_requests_see_all"
+            android:key="recent_location_requests_see_all_button"
             android:title="@string/location_recent_location_requests_see_all"
             android:icon="@drawable/ic_chevron_right_24dp"
             android:selectable="true"
diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml
index 7205eaf..d1eb623 100644
--- a/res/xml/special_access.xml
+++ b/res/xml/special_access.xml
@@ -121,4 +121,14 @@
             android:value="com.android.settings.Settings$DirectoryAccessSettingsActivity" />
     </Preference>
 
+    <Preference
+        android:key="change_wifi_state"
+        android:title="@string/change_wifi_state_title"
+        android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
+        settings:keywords="@string/keywords_change_wifi_state">
+        <extra
+            android:name="classname"
+            android:value="com.android.settings.Settings$ChangeWifiStateActivity" />
+    </Preference>
+
 </PreferenceScreen>
diff --git a/res/xml/zen_mode_external_rule_settings.xml b/res/xml/zen_mode_external_rule_settings.xml
deleted file mode 100644
index 0869cb0..0000000
--- a/res/xml/zen_mode_external_rule_settings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     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.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:key="zen_mode_external_rule_settings" >
-
-    <!-- Rule name -->
-    <Preference
-        android:key="rule_name"
-        android:title="@string/zen_mode_rule_name"
-        android:persistent="false" />
-
-    <!-- Rule type -->
-    <Preference
-        android:key="type"
-        android:title="@string/zen_mode_rule_type"
-        android:persistent="false" />
-
-    <!-- Configure -->
-    <Preference
-        android:key="configure"
-        android:title="@string/zen_mode_configure_rule"
-        android:persistent="false" />
-
-    <!-- Zen mode -->
-    <DropDownPreference
-        android:key="zen_mode"
-        android:summary="%s"
-        android:title="@string/zen_mode_settings_title" />
-
-</PreferenceScreen>
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index b543581..4baa77b 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -103,7 +103,6 @@
     public static class ZenModeAutomationSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ZenModeScheduleRuleSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ZenModeEventRuleSettingsActivity extends SettingsActivity { /* empty */ }
-    public static class ZenModeExternalRuleSettingsActivity extends SettingsActivity { /* empty */ }
     public static class SoundSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ConfigureNotificationSettingsActivity extends SettingsActivity { /* empty */ }
     public static class AppNotificationSettingsActivity extends SettingsActivity { /* empty */ }
@@ -125,6 +124,7 @@
     public static class AppMemoryUsageActivity extends SettingsActivity { /* empty */ }
     public static class OverlaySettingsActivity extends SettingsActivity { /* empty */ }
     public static class WriteSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class ChangeWifiStateActivity extends SettingsActivity { /* empty */ }
     public static class AppDrawOverlaySettingsActivity extends SettingsActivity { /* empty */ }
     public static class AppWriteSettingsActivity extends SettingsActivity { /* empty */ }
     public static class AdvancedAppsActivity extends SettingsActivity { /* empty */ }
@@ -155,7 +155,6 @@
     // Top level categories for new IA
     public static class NetworkDashboardActivity extends SettingsActivity {}
     public static class ConnectedDeviceDashboardActivity extends SettingsActivity {}
-    public static class ConnectedDeviceDashboardActivityOld extends SettingsActivity {}
     public static class PowerUsageSummaryActivity extends SettingsActivity { /* empty */ }
     public static class PowerUsageSummaryLegacyActivity extends SettingsActivity { /* empty */ }
     public static class AppAndNotificationDashboardActivity extends SettingsActivity {}
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 0f50d71..8b71df1 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -308,8 +308,9 @@
 
         ActionBar actionBar = getActionBar();
         if (actionBar != null) {
-            actionBar.setDisplayHomeAsUpEnabled(true);
-            actionBar.setHomeButtonEnabled(true);
+            boolean deviceProvisioned = Utils.isDeviceProvisioned(this);
+            actionBar.setDisplayHomeAsUpEnabled(deviceProvisioned);
+            actionBar.setHomeButtonEnabled(deviceProvisioned);
             actionBar.setDisplayShowTitleEnabled(!mIsShowingDashboard);
         }
         mSwitchBar = findViewById(R.id.switch_bar);
diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
index d321783..bc164ab 100644
--- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
@@ -20,7 +20,9 @@
 import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
+import android.database.ContentObserver;
 import android.os.Bundle;
+import android.os.Handler;
 import android.os.UserHandle;
 import android.provider.Settings;
 import android.support.v14.preference.SwitchPreference;
@@ -46,6 +48,12 @@
 
     private Preference mServicePreference;
     private SwitchPreference mOnLockScreenSwitchPreference;
+    private final ContentObserver mContentObserver = new ContentObserver(new Handler()) {
+        @Override
+        public void onChange(boolean selfChange) {
+            updatePreferences();
+        }
+    };
 
     @Override
     public int getMetricsCategory() {
@@ -77,6 +85,15 @@
     public void onResume() {
         super.onResume();
         updatePreferences();
+        getContentResolver().registerContentObserver(
+                Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN),
+                false, mContentObserver);
+    }
+
+    @Override
+    public void onPause() {
+        getContentResolver().unregisterContentObserver(mContentObserver);
+        super.onPause();
     }
 
     @Override
@@ -120,8 +137,13 @@
         boolean isEnabled = Settings.Secure
                 .getInt(cr, Settings.Secure.ACCESSIBILITY_SHORTCUT_ENABLED, 1) == 1;
         mSwitchBar.setChecked(isEnabled);
-        mOnLockScreenSwitchPreference.setChecked(Settings.Secure.getInt(
-                cr, Settings.Secure.ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN, 0) == 1);
+        // The shortcut is enabled by default on the lock screen as long as the user has
+        // enabled the shortcut with the warning dialog
+        final int dialogShown = Settings.Secure.getInt(
+                cr, Settings.Secure.ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN, 0);
+        final boolean enabledFromLockScreen = Settings.Secure.getInt(
+                cr, Settings.Secure.ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN, dialogShown) == 1;
+        mOnLockScreenSwitchPreference.setChecked(enabledFromLockScreen);
         // Only enable changing the service and lock screen behavior if the shortcut is on
         mServicePreference.setEnabled(mToggleSwitch.isChecked());
         mOnLockScreenSwitchPreference.setEnabled(mToggleSwitch.isChecked());
diff --git a/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceController.java b/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceController.java
index 1a5a285..130138c 100644
--- a/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceController.java
@@ -16,14 +16,18 @@
 
 package com.android.settings.applications.appinfo;
 
+import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.admin.DevicePolicyManager;
+import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.os.ServiceManager;
@@ -31,6 +35,7 @@
 import android.os.UserManager;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.PreferenceScreen;
+import android.util.Log;
 import android.webkit.IWebViewUpdateService;
 
 import com.android.settings.R;
@@ -66,6 +71,16 @@
     private UserManager mUserManager;
     private PackageManager mPm;
 
+    private final BroadcastReceiver mCheckKillProcessesReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            final boolean enabled = getResultCode() != Activity.RESULT_CANCELED;
+            Log.d(TAG, "Got broadcast response: Restart status for "
+                    + mParent.getAppEntry().info.packageName + " " + enabled);
+            updateForceStopButton(enabled);
+        }
+    };
+
     public AppActionButtonPreferenceController(Context context, AppInfoDashboardFragment parent,
             String packageName) {
         super(context, KEY_ACTION_BUTTONS);
@@ -86,7 +101,9 @@
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
         mActionButtons = ((ActionButtonPreference) screen.findPreference(KEY_ACTION_BUTTONS))
-                .setButton2Visible(false);
+                .setButton2Text(R.string.force_stop)
+                .setButton2Positive(false)
+                .setButton2Enabled(false);
     }
 
     @Override
@@ -123,6 +140,7 @@
             }
         }
 
+        checkForceStop(appEntry, packageInfo);
         initUninstallButtons(appEntry, packageInfo);
     }
 
@@ -251,6 +269,41 @@
         return disableable;
     }
 
+    private void updateForceStopButton(boolean enabled) {
+        final boolean disallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(
+                mContext, UserManager.DISALLOW_APPS_CONTROL, mUserId);
+        mActionButtons
+                .setButton2Enabled(disallowedBySystem ? false : enabled)
+                .setButton2OnClickListener(
+                        disallowedBySystem ? null : v -> mParent.handleForceStopButtonClick());
+    }
+
+    void checkForceStop(AppEntry appEntry, PackageInfo packageInfo) {
+        if (mDpm.packageHasActiveAdmins(packageInfo.packageName)) {
+            // User can't force stop device admin.
+            Log.w(TAG, "User can't force stop device admin");
+            updateForceStopButton(false);
+        } else if (AppUtils.isInstant(packageInfo.applicationInfo)) {
+            updateForceStopButton(false);
+            mActionButtons.setButton2Visible(false);
+        } else if ((appEntry.info.flags & ApplicationInfo.FLAG_STOPPED) == 0) {
+            // If the app isn't explicitly stopped, then always show the
+            // force stop button.
+            Log.w(TAG, "App is not explicitly stopped");
+            updateForceStopButton(true);
+        } else {
+            final Intent intent = new Intent(Intent.ACTION_QUERY_PACKAGE_RESTART,
+                    Uri.fromParts("package", appEntry.info.packageName, null));
+            intent.putExtra(Intent.EXTRA_PACKAGES, new String[] { appEntry.info.packageName });
+            intent.putExtra(Intent.EXTRA_UID, appEntry.info.uid);
+            intent.putExtra(Intent.EXTRA_USER_HANDLE, UserHandle.getUserId(appEntry.info.uid));
+            Log.d(TAG, "Sending broadcast to query restart status for "
+                    + appEntry.info.packageName);
+            mContext.sendOrderedBroadcastAsUser(intent, UserHandle.CURRENT, null,
+                    mCheckKillProcessesReceiver, null, Activity.RESULT_CANCELED, null, null);
+        }
+    }
+
     private boolean signaturesMatch(String pkg1, String pkg2) {
         if (pkg1 != null && pkg2 != null) {
             try {
diff --git a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
index b878bc8..7428e53 100755
--- a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
+++ b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
@@ -19,6 +19,7 @@
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
 import android.app.Activity;
+import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
@@ -44,16 +45,20 @@
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.View;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.DeviceAdminAdd;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
+import com.android.settings.applications.LayoutPreference;
 import com.android.settings.applications.manageapplications.ManageApplications;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.widget.EntityHeaderController;
 import com.android.settings.widget.PreferenceCategoryController;
 import com.android.settings.wrapper.DevicePolicyManagerWrapper;
 import com.android.settingslib.RestrictedLockUtils;
@@ -85,8 +90,7 @@
     // Menu identifiers
     @VisibleForTesting static final int UNINSTALL_ALL_USERS_MENU = 1;
     @VisibleForTesting static final int UNINSTALL_UPDATES = 2;
-    static final int FORCE_STOP_MENU = 3;
-    static final int INSTALL_INSTANT_APP_MENU = 4;
+    static final int INSTALL_INSTANT_APP_MENU = 3;
 
     // Result code identifiers
     @VisibleForTesting
@@ -101,7 +105,7 @@
 
     // Dialog identifiers used in showDialog
     private static final int DLG_BASE = 0;
-    static final int DLG_FORCE_STOP = DLG_BASE + 1;
+    private static final int DLG_FORCE_STOP = DLG_BASE + 1;
     private static final int DLG_DISABLE = DLG_BASE + 2;
     private static final int DLG_SPECIAL_DISABLE = DLG_BASE + 3;
     static final int DLG_CLEAR_INSTANT_APP = DLG_BASE + 4;
@@ -140,7 +144,6 @@
 
     private InstantAppButtonsPreferenceController mInstantAppButtonPreferenceController;
     private AppActionButtonPreferenceController mAppActionButtonPreferenceController;
-    private ForceStopOptionsMenuController mForceStopOptionsMenuController;
 
     /**
      * Callback to invoke when app info has been changed.
@@ -171,9 +174,6 @@
 
         startListeningToPackageRemove();
 
-        mForceStopOptionsMenuController =
-            new ForceStopOptionsMenuController(activity, this /* parent */, mDpm,
-                mMetricsFeatureProvider, getLifecycle());
         setHasOptionsMenu(true);
     }
 
@@ -285,10 +285,6 @@
         return mPackageInfo;
     }
 
-    ApplicationsState getAppState() {
-        return mState;
-    }
-
     @Override
     public void onPackageSizeChanged(String packageName) {
         if (!TextUtils.equals(packageName, mPackageName)) {
@@ -488,10 +484,18 @@
                         })
                         .setNegativeButton(R.string.dlg_cancel, null)
                         .create();
-        }
-        final AlertDialog dialog = mForceStopOptionsMenuController.createDialog(id);
-        if (dialog != null) {
-            return dialog;
+            case DLG_FORCE_STOP:
+                return new AlertDialog.Builder(getActivity())
+                        .setTitle(getActivity().getText(R.string.force_stop_dlg_title))
+                        .setMessage(getActivity().getText(R.string.force_stop_dlg_text))
+                        .setPositiveButton(R.string.dlg_ok, new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                // Force stop
+                                forceStopPackage(mAppEntry.info.packageName);
+                            }
+                        })
+                        .setNegativeButton(R.string.dlg_cancel, null)
+                        .create();
         }
         return mInstantAppButtonPreferenceController.createDialog(id);
     }
@@ -508,6 +512,21 @@
         mDisableAfterUninstall = andDisable;
     }
 
+    private void forceStopPackage(String pkgName) {
+        mMetricsFeatureProvider.action(getContext(), MetricsEvent.ACTION_APP_FORCE_STOP, pkgName);
+        final ActivityManager am = (ActivityManager) getActivity().getSystemService(
+                Context.ACTIVITY_SERVICE);
+        Log.d(TAG, "Stopping package " + pkgName);
+        am.forceStopPackage(pkgName);
+        final int userId = UserHandle.getUserId(mAppEntry.info.uid);
+        mState.invalidatePackage(pkgName, userId);
+        final AppEntry newEnt = mState.getEntry(pkgName, userId);
+        if (newEnt != null) {
+            mAppEntry = newEnt;
+        }
+        mAppActionButtonPreferenceController.checkForceStop(mAppEntry, mPackageInfo);
+    }
+
     public static void startAppInfoFragment(Class<?> fragment, int title, Bundle args,
             SettingsPreferenceFragment caller, AppEntry appEntry) {
         // start new fragment to display extended information
@@ -573,6 +592,20 @@
         }
     }
 
+    void handleForceStopButtonClick() {
+        if (mAppEntry == null) {
+            setIntentAndFinish(true, true);
+            return;
+        }
+        if (mAppsControlDisallowedAdmin != null && !mAppsControlDisallowedBySystem) {
+            RestrictedLockUtils.sendShowAdminSupportDetailsIntent(
+                    getActivity(), mAppsControlDisallowedAdmin);
+        } else {
+            showDialogInner(DLG_FORCE_STOP, 0);
+            //forceStopPackage(mAppInfo.packageName);
+        }
+    }
+
     /** Returns whether there is only one user on this device, not including the system-only user */
     private boolean isSingleUser() {
         final int userCount = mUserManager.getUserCount();
@@ -671,7 +704,7 @@
         }
     }
 
-    void setIntentAndFinish(boolean finish, boolean appChanged) {
+    private void setIntentAndFinish(boolean finish, boolean appChanged) {
         if (localLOGV) Log.i(TAG, "appChanged="+appChanged);
         final Intent intent = new Intent();
         intent.putExtra(ManageApplications.APP_CHG, appChanged);
diff --git a/src/com/android/settings/applications/appinfo/ForceStopOptionsMenuController.java b/src/com/android/settings/applications/appinfo/ForceStopOptionsMenuController.java
deleted file mode 100644
index cf87147..0000000
--- a/src/com/android/settings/applications/appinfo/ForceStopOptionsMenuController.java
+++ /dev/null
@@ -1,198 +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.applications.appinfo;
-
-import static com.android.settings.applications.appinfo.AppInfoDashboardFragment.FORCE_STOP_MENU;
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
-import android.app.Activity;
-import android.app.ActivityManager;
-import android.app.AlertDialog;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.net.Uri;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.support.annotation.VisibleForTesting;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.wrapper.DevicePolicyManagerWrapper;
-import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.applications.AppUtils;
-import com.android.settingslib.applications.ApplicationsState;
-import com.android.settingslib.applications.ApplicationsState.AppEntry;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnCreateOptionsMenu;
-import com.android.settingslib.core.lifecycle.events.OnOptionsItemSelected;
-import com.android.settingslib.core.lifecycle.events.OnPrepareOptionsMenu;
-
-public class ForceStopOptionsMenuController implements LifecycleObserver, OnCreateOptionsMenu,
-        OnPrepareOptionsMenu, OnOptionsItemSelected {
-
-    private static final String TAG = "ForceStopMenuController";
-
-    private final Context mContext;
-    private final AppInfoDashboardFragment mParent;
-    private final DevicePolicyManagerWrapper mDpm;
-    private final MetricsFeatureProvider mMetricsFeatureProvider;
-
-    private int mUserId;
-    private MenuItem mForceStopMenu;
-
-    private final BroadcastReceiver mCheckKillProcessesReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            final boolean enabled = getResultCode() != Activity.RESULT_CANCELED;
-            Log.d(TAG, "Got broadcast response: Restart status for "
-                + mParent.getAppEntry().info.packageName + " " + enabled);
-            enableForceStopMenu(enabled);
-        }
-    };
-
-    public ForceStopOptionsMenuController(Context context, AppInfoDashboardFragment parent,
-            DevicePolicyManagerWrapper devicePolicyManager,
-            MetricsFeatureProvider metricsFeatureProvider, Lifecycle lifecycle) {
-        mContext = context;
-        mParent = parent;
-        mDpm = devicePolicyManager;
-        mMetricsFeatureProvider = metricsFeatureProvider;
-        mUserId = UserHandle.myUserId();
-        if (lifecycle != null) {
-            lifecycle.addObserver(this);
-        }
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        menu.add(0, FORCE_STOP_MENU, 2, R.string.force_stop)
-            .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem menuItem) {
-        if (menuItem.getItemId() == FORCE_STOP_MENU) {
-            handleForceStopMenuClick();
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public void onPrepareOptionsMenu(Menu menu) {
-        mForceStopMenu = menu.findItem(FORCE_STOP_MENU);
-        updateForceStopMenu(mParent.getAppEntry(), mParent.getPackageInfo());
-    }
-
-    @VisibleForTesting
-    void updateForceStopMenu(AppEntry appEntry, PackageInfo packageInfo) {
-        boolean enabled = false;
-        if (mDpm.packageHasActiveAdmins(packageInfo.packageName)) {
-            // User can't force stop device admin.
-            Log.w(TAG, "User can't force stop device admin");
-        } else if (AppUtils.isInstant(packageInfo.applicationInfo)) {
-            // No force stop for instant app
-            if (mForceStopMenu != null) {
-                mForceStopMenu.setVisible(false);
-            }
-        } else if ((appEntry.info.flags & ApplicationInfo.FLAG_STOPPED) == 0) {
-            // If the app isn't explicitly stopped, then always show the
-            // force stop button.
-            Log.w(TAG, "App is not explicitly stopped");
-            enabled = true;
-        } else {
-            final Intent intent = new Intent(Intent.ACTION_QUERY_PACKAGE_RESTART,
-                Uri.fromParts("package", appEntry.info.packageName, null));
-            intent.putExtra(Intent.EXTRA_PACKAGES, new String[] { appEntry.info.packageName });
-            intent.putExtra(Intent.EXTRA_UID, appEntry.info.uid);
-            intent.putExtra(Intent.EXTRA_USER_HANDLE, UserHandle.getUserId(appEntry.info.uid));
-            Log.d(TAG, "Sending broadcast to query restart status for "
-                + appEntry.info.packageName);
-            mContext.sendOrderedBroadcastAsUser(intent, UserHandle.CURRENT, null,
-                mCheckKillProcessesReceiver, null, Activity.RESULT_CANCELED, null, null);
-        }
-        enableForceStopMenu(enabled);
-    }
-
-    private void enableForceStopMenu(boolean enabled) {
-        if (mForceStopMenu != null) {
-            final boolean disallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(
-                mContext, UserManager.DISALLOW_APPS_CONTROL, mUserId);
-            mForceStopMenu.setEnabled(disallowedBySystem ? false : enabled);
-        }
-    }
-
-    @VisibleForTesting
-    void handleForceStopMenuClick() {
-        if (mParent.getAppEntry() == null) {
-            mParent.setIntentAndFinish(true, true);
-            return;
-        }
-        final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
-            mContext, UserManager.DISALLOW_APPS_CONTROL, mUserId);
-        final boolean disallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(
-            mContext, UserManager.DISALLOW_APPS_CONTROL, mUserId);
-        if (admin != null && !disallowedBySystem) {
-            RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mContext, admin);
-        } else {
-            mParent.showDialogInner(mParent.DLG_FORCE_STOP, 0);
-        }
-    }
-
-    private void forceStopPackage(String pkgName) {
-        mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_APP_FORCE_STOP, pkgName);
-        final ActivityManager am = (ActivityManager) mContext.getSystemService(
-            Context.ACTIVITY_SERVICE);
-        Log.d(TAG, "Stopping package " + pkgName);
-        am.forceStopPackage(pkgName);
-        final int userId = UserHandle.getUserId(mParent.getAppEntry().info.uid);
-        final ApplicationsState appState = mParent.getAppState();
-        appState.invalidatePackage(pkgName, userId);
-        final AppEntry newEnt = appState.getEntry(pkgName, userId);
-        if (newEnt != null) {
-            mParent.setAppEntry(newEnt);
-        }
-    }
-
-    public AlertDialog createDialog(int id) {
-        if (id != mParent.DLG_FORCE_STOP) {
-            return null;
-        }
-        return new AlertDialog.Builder(mContext)
-            .setTitle(mContext.getText(R.string.force_stop_dlg_title))
-            .setMessage(mContext.getText(R.string.force_stop_dlg_text))
-            .setPositiveButton(R.string.dlg_ok, new DialogInterface.OnClickListener() {
-                public void onClick(DialogInterface dialog, int which) {
-                    // Force stop
-                    forceStopPackage(mParent.getAppEntry().info.packageName);
-                }
-            })
-            .setNegativeButton(R.string.dlg_cancel, null)
-            .create();
-    }
-
-}
diff --git a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
index fb5caf7..8ebb7a4 100644
--- a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
+++ b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
@@ -26,6 +26,7 @@
 import com.android.settings.applications.AppStateDirectoryAccessBridge;
 import com.android.settings.applications.AppStateUsageBridge;
 import com.android.settings.applications.AppStateWriteSettingsBridge;
+import com.android.settings.wifi.AppStateChangeWifiStateBridge;
 import com.android.settingslib.applications.ApplicationsState;
 
 /**
@@ -67,14 +68,15 @@
     public static final int FILTER_APPS_WRITE_SETTINGS = 11;
     public static final int FILTER_APPS_INSTALL_SOURCES = 12;
     public static final int FILTER_APP_HAS_DIRECTORY_ACCESS = 13;
-    // Next id: 14
+    public static final int FILTER_APP_CAN_CHANGE_WIFI_STATE = 14;
+    // Next id: 15
 
     private static AppFilterRegistry sRegistry;
 
     private final AppFilterItem[] mFilters;
 
     private AppFilterRegistry() {
-        mFilters = new AppFilterItem[14];
+        mFilters = new AppFilterItem[15];
 
         // High power whitelist, on
         mFilters[FILTER_APPS_POWER_WHITELIST] = new AppFilterItem(
@@ -163,6 +165,11 @@
                 AppStateDirectoryAccessBridge.FILTER_APP_HAS_DIRECTORY_ACCESS,
                 FILTER_APP_HAS_DIRECTORY_ACCESS,
                 R.string.filter_install_sources_apps);
+
+        mFilters[FILTER_APP_CAN_CHANGE_WIFI_STATE] = new AppFilterItem(
+                AppStateChangeWifiStateBridge.FILTER_CHANGE_WIFI_STATE,
+                FILTER_APP_CAN_CHANGE_WIFI_STATE,
+                R.string.filter_write_settings_apps);
     }
 
     public static AppFilterRegistry getInstance() {
@@ -187,6 +194,8 @@
                 return FILTER_APPS_INSTALL_SOURCES;
             case ManageApplications.LIST_TYPE_DIRECTORY_ACCESS:
                 return FILTER_APP_HAS_DIRECTORY_ACCESS;
+            case ManageApplications.LIST_TYPE_WIFI_ACCESS:
+                return FILTER_APP_CAN_CHANGE_WIFI_STATE;
             default:
                 return FILTER_APPS_ALL;
         }
diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java
index f9794d2..8f4cbe3 100644
--- a/src/com/android/settings/applications/manageapplications/ManageApplications.java
+++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -96,6 +96,8 @@
 import com.android.settings.applications.appinfo.DrawOverlayDetails;
 import com.android.settings.applications.appinfo.ExternalSourcesDetails;
 import com.android.settings.applications.appinfo.WriteSettingsDetails;
+
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.dashboard.SummaryLoader;
@@ -105,6 +107,8 @@
 import com.android.settings.notification.NotificationBackend;
 import com.android.settings.notification.NotificationBackend.AppRow;
 import com.android.settings.widget.LoadingViewController;
+import com.android.settings.wifi.AppStateChangeWifiStateBridge;
+import com.android.settings.wifi.ChangeWifiStateDetails;
 import com.android.settingslib.HelpUtils;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
@@ -204,6 +208,7 @@
     public static final int LIST_TYPE_MOVIES = 10;
     public static final int LIST_TYPE_PHOTOGRAPHY = 11;
     public static final int LIST_TYPE_DIRECTORY_ACCESS = 12;
+    public static final int LIST_TYPE_WIFI_ACCESS = 13;
 
     // List types that should show instant apps.
     public static final Set<Integer> LIST_TYPES_WITH_INSTANT = new ArraySet<>(Arrays.asList(
@@ -277,6 +282,9 @@
         } else if (className.equals(Settings.DirectoryAccessSettingsActivity.class.getName())) {
             mListType = LIST_TYPE_DIRECTORY_ACCESS;
             screenTitle = R.string.directory_access;
+        } else if (className.equals(Settings.ChangeWifiStateActivity.class.getName())) {
+            mListType = LIST_TYPE_WIFI_ACCESS;
+            screenTitle = R.string.change_wifi_state_title;
         } else {
             mListType = LIST_TYPE_MAIN;
         }
@@ -443,6 +451,8 @@
                 return MetricsEvent.MANAGE_EXTERNAL_SOURCES;
             case LIST_TYPE_DIRECTORY_ACCESS:
                 return MetricsEvent.DIRECTORY_ACCESS;
+            case LIST_TYPE_WIFI_ACCESS:
+                return MetricsEvent.CONFIGURE_WIFI;
             default:
                 return MetricsEvent.VIEW_UNKNOWN;
         }
@@ -540,7 +550,9 @@
             case LIST_TYPE_DIRECTORY_ACCESS:
                 startAppInfoFragment(DirectoryAccessDetails.class, R.string.directory_access);
                 break;
-
+            case LIST_TYPE_WIFI_ACCESS:
+                startAppInfoFragment(ChangeWifiStateDetails.class, R.string.change_wifi_state_title);
+                break;
             // TODO: Figure out if there is a way where we can spin up the profile's settings
             // process ahead of time, to avoid a long load of data when user clicks on a managed
             // app. Maybe when they load the list of apps that contains managed profile apps.
@@ -846,6 +858,8 @@
                 mExtraInfoBridge = new AppStateInstallAppsBridge(mContext, mState, this);
             } else if (mManageApplications.mListType == LIST_TYPE_DIRECTORY_ACCESS) {
                 mExtraInfoBridge = new AppStateDirectoryAccessBridge(mState, this);
+            } else if (mManageApplications.mListType == LIST_TYPE_WIFI_ACCESS) {
+                mExtraInfoBridge = new AppStateChangeWifiStateBridge(mContext, mState, this);
             } else {
                 mExtraInfoBridge = null;
             }
@@ -1251,6 +1265,9 @@
                 case LIST_TYPE_DIRECTORY_ACCESS:
                     holder.setSummary(null);
                     break;
+                case LIST_TYPE_WIFI_ACCESS:
+                    holder.setSummary(ChangeWifiStateDetails.getSummary(mContext, entry));
+                    break;
                 default:
                     holder.updateSizeText(entry, mManageApplications.mInvalidSizeStr, mWhichSize);
                     break;
diff --git a/src/com/android/settings/core/BasePreferenceController.java b/src/com/android/settings/core/BasePreferenceController.java
index 76250fa..9145c3c 100644
--- a/src/com/android/settings/core/BasePreferenceController.java
+++ b/src/com/android/settings/core/BasePreferenceController.java
@@ -20,6 +20,7 @@
 
 import com.android.settings.search.ResultPayload;
 import com.android.settings.search.SearchIndexableRaw;
+import com.android.settings.slices.SliceData;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
@@ -154,6 +155,14 @@
     }
 
     /**
+     * @return the UI type supported by the controller.
+     */
+    @SliceData.SliceType
+    public int getSliceType() {
+        return SliceData.SliceType.INTENT;
+    }
+
+    /**
      * Updates non-indexable keys for search provider.
      *
      * Called by SearchIndexProvider#getNonIndexableKeys
diff --git a/src/com/android/settings/core/TogglePreferenceController.java b/src/com/android/settings/core/TogglePreferenceController.java
index 1cf4289..cd4131d 100644
--- a/src/com/android/settings/core/TogglePreferenceController.java
+++ b/src/com/android/settings/core/TogglePreferenceController.java
@@ -17,6 +17,7 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.TwoStatePreference;
 
+import com.android.settings.slices.SliceData;
 import com.android.settings.widget.MasterSwitchPreference;
 
 /**
@@ -59,4 +60,11 @@
     public final boolean onPreferenceChange(Preference preference, Object newValue) {
         return setChecked((Boolean) newValue);
     }
+
+    @Override
+    @SliceData.SliceType
+    public int getSliceType() {
+        return SliceData.SliceType.SWITCH;
+    }
+
 }
\ No newline at end of file
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 51e151e..f9c7847 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -28,8 +28,6 @@
 import com.android.settings.TestingSettings;
 import com.android.settings.TetherSettings;
 import com.android.settings.TrustedCredentialsSettings;
-import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment;
-import com.android.settings.wifi.calling.WifiCallingSettings;
 import com.android.settings.accessibility.AccessibilitySettings;
 import com.android.settings.accessibility.AccessibilitySettingsForSetupWizard;
 import com.android.settings.accessibility.CaptionPropertiesFragment;
@@ -52,10 +50,12 @@
 import com.android.settings.applications.appinfo.PictureInPictureDetails;
 import com.android.settings.applications.appinfo.PictureInPictureSettings;
 import com.android.settings.applications.appinfo.WriteSettingsDetails;
+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.bluetooth.BluetoothDeviceDetailsFragment;
 import com.android.settings.bluetooth.BluetoothSettings;
+import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment;
 import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
 import com.android.settings.connecteddevice.usb.UsbDetailsFragment;
 import com.android.settings.datausage.DataUsageList;
@@ -69,13 +69,14 @@
 import com.android.settings.deviceinfo.PublicVolumeSettings;
 import com.android.settings.deviceinfo.StorageDashboardFragment;
 import com.android.settings.deviceinfo.StorageSettings;
+import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment;
 import com.android.settings.display.NightDisplaySettings;
 import com.android.settings.dream.DreamSettings;
 import com.android.settings.enterprise.EnterprisePrivacySettings;
 import com.android.settings.fuelgauge.AdvancedPowerUsageDetail;
-import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings;
 import com.android.settings.fuelgauge.PowerUsageSummary;
 import com.android.settings.fuelgauge.PowerUsageSummaryLegacy;
+import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings;
 import com.android.settings.gestures.AssistGestureSettings;
 import com.android.settings.gestures.DoubleTapPowerSettings;
 import com.android.settings.gestures.DoubleTapScreenSettings;
@@ -129,6 +130,7 @@
 import com.android.settings.wifi.WifiAPITest;
 import com.android.settings.wifi.WifiInfo;
 import com.android.settings.wifi.WifiSettings;
+import com.android.settings.wifi.calling.WifiCallingSettings;
 import com.android.settings.wifi.p2p.WifiP2pSettings;
 
 public class SettingsGateway {
@@ -138,6 +140,7 @@
      * security exception if the fragment it needs to display is not in this list.
      */
     public static final String[] ENTRY_FRAGMENTS = {
+            AdvancedConnectedDeviceDashboardFragment.class.getName(),
             WifiSettings.class.getName(),
             ConfigureWifiSettings.class.getName(),
             SavedAccessPointsWifiSettings.class.getName(),
@@ -145,6 +148,7 @@
             SimSettings.class.getName(),
             TetherSettings.class.getName(),
             WifiP2pSettings.class.getName(),
+            BackgroundCheckSummary.class.getName(),
             VpnSettings.class.getName(),
             DateTimeSettings.class.getName(),
             LocaleListEditor.class.getName(),
@@ -257,7 +261,6 @@
             // Home page
             Settings.NetworkDashboardActivity.class.getName(),
             Settings.ConnectedDeviceDashboardActivity.class.getName(),
-            Settings.ConnectedDeviceDashboardActivityOld.class.getName(),
             Settings.AppAndNotificationDashboardActivity.class.getName(),
             Settings.DisplaySettingsActivity.class.getName(),
             Settings.SoundSettingsActivity.class.getName(),
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index f04c3c9..99de73e 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -304,14 +304,7 @@
         // header anymore.
         final List<Suggestion> suggestions =
             (List<Suggestion>) mDashboardData.getItemEntityByPosition(position);
-        final int suggestionCount = suggestions.size();
-        final Typeface fontMedium = Typeface.create(
-            mContext.getString(com.android.internal.R.string.config_headlineFontFamilyMedium),
-            Typeface.NORMAL);
-        holder.title.setTypeface(fontMedium);
-        if (suggestions != null && suggestionCount > 0) {
-            holder.summary.setText("" + suggestionCount);
-            holder.summary.setTypeface(fontMedium);
+        if (suggestions != null && suggestions.size() > 0) {
             mSuggestionAdapter.setSuggestions(suggestions);
             holder.data.setAdapter(mSuggestionAdapter);
         }
diff --git a/src/com/android/settings/dashboard/DashboardData.java b/src/com/android/settings/dashboard/DashboardData.java
index 49de94d..45aab9a 100644
--- a/src/com/android/settings/dashboard/DashboardData.java
+++ b/src/com/android/settings/dashboard/DashboardData.java
@@ -41,7 +41,7 @@
  */
 public class DashboardData {
     public static final int POSITION_NOT_FOUND = -1;
-    public static final int MAX_SUGGESTION_COUNT = 4;
+    public static final int MAX_SUGGESTION_COUNT = 2;
 
     // stable id for different type of items.
     @VisibleForTesting
@@ -443,4 +443,4 @@
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
index 87b3f4b..4c1e939 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
@@ -117,15 +117,13 @@
                     mContext, MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION, id);
             mSuggestionsShownLogged.add(id);
         }
-        mConfig.setCardLayout(holder, suggestionCount, position);
         final Icon icon = suggestion.getIcon();
         final Drawable drawable = mCache.getIcon(icon);
-        if (drawable != null && (suggestion.getFlags() & Suggestion.FLAG_ICON_TINTABLE) != 0) {
+        if (drawable != null) {
             drawable.setTint(Utils.getColorAccent(mContext));
         }
         holder.icon.setImageDrawable(drawable);
         holder.title.setText(suggestion.getTitle());
-        holder.title.setSingleLine(suggestionCount == 1);
         holder.title.setTypeface(Typeface.create(
             mContext.getString(com.android.internal.R.string.config_headlineFontFamily),
             Typeface.NORMAL));
@@ -139,9 +137,7 @@
                 holder.summary.setVisibility(View.GONE);
             }
         } else {
-            // Do not show summary if there are more than 1 suggestions
-            holder.summary.setVisibility(View.GONE);
-            holder.title.setMaxLines(3);
+            mConfig.setCardLayout(holder, position);
         }
 
         final ImageView closeButton = holder.itemView.findViewById(R.id.close_button);
@@ -183,9 +179,11 @@
         final Suggestion suggestion = getSuggestion(position);
         if ((suggestion.getFlags() & Suggestion.FLAG_HAS_BUTTON) != 0) {
             return R.layout.suggestion_tile_with_button;
-        } else {
+        }
+        if (getItemCount() == 1) {
             return R.layout.suggestion_tile;
         }
+        return R.layout.suggestion_tile_two_cards;
     }
 
     @Override
@@ -234,11 +232,6 @@
         // Card start/end margin
         private final int mMarginInner;
         private final int mMarginOuter;
-        // Card width if there are more than 2 cards
-        private final int mWidthMultipleCards;
-        // padding between icon and title
-        private final int mPaddingTitleTopSingleCard;
-        private final int mPaddingTitleTopMultipleCards;
         private final WindowManager mWindowManager;
 
         private static CardConfig sConfig;
@@ -250,12 +243,6 @@
                 res.getDimensionPixelOffset(R.dimen.suggestion_card_inner_margin);
             mMarginOuter =
                 res.getDimensionPixelOffset(R.dimen.suggestion_card_outer_margin);
-            mWidthMultipleCards =
-                res.getDimensionPixelOffset(R.dimen.suggestion_card_width_multiple_cards);
-            mPaddingTitleTopSingleCard =
-                res.getDimensionPixelOffset(R.dimen.suggestion_card_title_padding_bottom_one_card);
-            mPaddingTitleTopMultipleCards = res.getDimensionPixelOffset(
-                R.dimen.suggestion_card_title_padding_bottom_multiple_cards);
         }
 
         public static CardConfig get(Context context) {
@@ -266,20 +253,11 @@
         }
 
         @VisibleForTesting
-        void setCardLayout(DashboardItemHolder holder, int suggestionCount, int position) {
+        void setCardLayout(DashboardItemHolder holder, int position) {
             final LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
-                suggestionCount == 1
-                    ? LinearLayout.LayoutParams.MATCH_PARENT : suggestionCount == 2
-                    ? getWidthForTwoCrads() : mWidthMultipleCards,
-                LinearLayout.LayoutParams.WRAP_CONTENT);
-            if (suggestionCount == 1) {
-                params.setMarginStart(mMarginOuter);
-                params.setMarginEnd(mMarginOuter);
-            } else {
-                params.setMarginStart(
-                    position == 0 ? mMarginOuter : mMarginInner);
-                params.setMarginEnd(position == suggestionCount - 1 ? mMarginOuter : 0);
-            }
+                getWidthForTwoCrads(), LinearLayout.LayoutParams.WRAP_CONTENT);
+            params.setMarginStart(position == 0 ? mMarginOuter : mMarginInner);
+            params.setMarginEnd(position != 0 ? mMarginOuter : 0);
             holder.itemView.setLayoutParams(params);
         }
 
diff --git a/src/com/android/settings/datausage/CellDataPreference.java b/src/com/android/settings/datausage/CellDataPreference.java
index d24c092..b93fe66 100644
--- a/src/com/android/settings/datausage/CellDataPreference.java
+++ b/src/com/android/settings/datausage/CellDataPreference.java
@@ -25,6 +25,7 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.provider.Settings.Global;
+import android.support.annotation.VisibleForTesting;
 import android.support.v4.content.res.TypedArrayUtils;
 import android.support.v7.preference.PreferenceViewHolder;
 import android.telephony.SubscriptionInfo;
@@ -51,7 +52,8 @@
     public boolean mChecked;
     public boolean mMultiSimDialog;
     private TelephonyManager mTelephonyManager;
-    private SubscriptionManager mSubscriptionManager;
+    @VisibleForTesting
+    SubscriptionManager mSubscriptionManager;
 
     public CellDataPreference(Context context, AttributeSet attrs) {
         super(context, attrs, TypedArrayUtils.getAttr(context,
@@ -85,12 +87,19 @@
     @Override
     public void onAttached() {
         super.onAttached();
-        mListener.setListener(true, mSubId, getContext());
+        mDataStateListener.setListener(true, mSubId, getContext());
+        if (mSubscriptionManager!= null) {
+            mSubscriptionManager.addOnSubscriptionsChangedListener(mOnSubscriptionsChangeListener);
+        }
     }
 
     @Override
     public void onDetached() {
-        mListener.setListener(false, mSubId, getContext());
+        mDataStateListener.setListener(false, mSubId, getContext());
+        if (mSubscriptionManager!= null) {
+            mSubscriptionManager.removeOnSubscriptionsChangedListener(
+                    mOnSubscriptionsChangeListener);
+        }
         super.onDetached();
     }
 
@@ -101,10 +110,14 @@
         }
         mSubscriptionManager = SubscriptionManager.from(getContext());
         mTelephonyManager = TelephonyManager.from(getContext());
+
+        mSubscriptionManager.addOnSubscriptionsChangedListener(mOnSubscriptionsChangeListener);
+
         if (mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
             mSubId = subId;
             setKey(getKey() + subId);
         }
+        updateEnabled();
         updateChecked();
     }
 
@@ -112,6 +125,12 @@
         setChecked(mTelephonyManager.getDataEnabled(mSubId));
     }
 
+    private void updateEnabled() {
+        // If this subscription is not active, for example, SIM card is taken out, we disable
+        // the button.
+        setEnabled(mSubscriptionManager.getActiveSubscriptionInfo(mSubId) != null);
+    }
+
     @Override
     protected void performClick(View view) {
         final Context context = getContext();
@@ -237,7 +256,19 @@
         }
     }
 
-    private final DataStateListener mListener = new DataStateListener() {
+    @VisibleForTesting
+    final SubscriptionManager.OnSubscriptionsChangedListener mOnSubscriptionsChangeListener
+            = new SubscriptionManager.OnSubscriptionsChangedListener() {
+        @Override
+        public void onSubscriptionsChanged() {
+            if (DataUsageSummary.LOGD) {
+                Log.d(TAG, "onSubscriptionsChanged");
+            }
+            updateEnabled();
+        }
+    };
+
+    private final DataStateListener mDataStateListener = new DataStateListener() {
         @Override
         public void onChange(boolean selfChange) {
             updateChecked();
diff --git a/src/com/android/settings/datetime/timezone/OWNERS b/src/com/android/settings/datetime/timezone/OWNERS
new file mode 100644
index 0000000..eac0604
--- /dev/null
+++ b/src/com/android/settings/datetime/timezone/OWNERS
@@ -0,0 +1,7 @@
+# Default reviewers for this and subdirectories.
+vichang@google.com
+nfuller@google.com
+
+# Emergency approvers in case the above are not available
+pszczepaniak@google.com
+narayan@google.com
diff --git a/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java b/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java
index 171dd6a..e00d88d 100644
--- a/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java
+++ b/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java
@@ -147,16 +147,6 @@
         mBluetoothA2dp = null;
     }
 
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchDisabled() {
-        mPreference.setEnabled(false);
-    }
-
     /**
      * @return an array of string values that correspond to the current {@link ListPreference}.
      */
diff --git a/src/com/android/settings/development/AdbPreferenceController.java b/src/com/android/settings/development/AdbPreferenceController.java
index cf23fe0..7be3213 100644
--- a/src/com/android/settings/development/AdbPreferenceController.java
+++ b/src/com/android/settings/development/AdbPreferenceController.java
@@ -59,14 +59,9 @@
     }
 
     @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
-    }
-
-    @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         writeAdbSetting(false);
-        mPreference.setEnabled(false);
         mPreference.setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java b/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java
index c3b527f..5a28477 100644
--- a/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java
+++ b/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java
@@ -21,14 +21,12 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
-public class AllowAppsOnExternalPreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        PreferenceControllerMixin {
+public class AllowAppsOnExternalPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String FORCE_ALLOW_ON_EXTERNAL_KEY = "force_allow_on_external";
 
@@ -37,8 +35,6 @@
     @VisibleForTesting
     static final int SETTING_VALUE_ON = 1;
 
-    private SwitchPreference mPreference;
-
     public AllowAppsOnExternalPreferenceController(Context context) {
         super(context);
     }
@@ -49,13 +45,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         Settings.Global.putInt(mContext.getContentResolver(),
@@ -69,19 +58,14 @@
         final int mode = Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.FORCE_ALLOW_ON_EXTERNAL, SETTING_VALUE_OFF);
 
-        mPreference.setChecked(mode != SETTING_VALUE_OFF);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         Settings.Global.putInt(mContext.getContentResolver(),
                 Settings.Global.FORCE_ALLOW_ON_EXTERNAL, SETTING_VALUE_OFF);
-        mPreference.setEnabled(false);
-        mPreference.setChecked(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java b/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java
index 4d8d4ee..de66150 100644
--- a/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java
+++ b/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java
@@ -22,16 +22,14 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 import android.view.IWindowManager;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
-public class AnimatorDurationScalePreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        PreferenceControllerMixin {
+public class AnimatorDurationScalePreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String ANIMATOR_DURATION_SCALE_KEY = "animator_duration_scale";
 
@@ -44,8 +42,6 @@
     private final String[] mListValues;
     private final String[] mListSummaries;
 
-    private ListPreference mPreference;
-
     public AnimatorDurationScalePreferenceController(Context context) {
         super(context);
 
@@ -62,13 +58,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         writeAnimationScaleOption(newValue);
         return true;
@@ -80,14 +69,9 @@
     }
 
     @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
-    }
-
-    @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         writeAnimationScaleOption(null);
-        mPreference.setEnabled(false);
     }
 
     private void writeAnimationScaleOption(Object newValue) {
@@ -111,8 +95,9 @@
                     break;
                 }
             }
-            mPreference.setValue(mListValues[index]);
-            mPreference.setSummary(mListSummaries[index]);
+            final ListPreference listPreference = (ListPreference) mPreference;
+            listPreference.setValue(mListValues[index]);
+            listPreference.setSummary(mListSummaries[index]);
         } catch (RemoteException e) {
             // intentional no-op
         }
diff --git a/src/com/android/settings/development/AppsNotRespondingPreferenceController.java b/src/com/android/settings/development/AppsNotRespondingPreferenceController.java
index 98d7fa5..6d43eee 100644
--- a/src/com/android/settings/development/AppsNotRespondingPreferenceController.java
+++ b/src/com/android/settings/development/AppsNotRespondingPreferenceController.java
@@ -20,14 +20,12 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
-public class AppsNotRespondingPreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        PreferenceControllerMixin {
+public class AppsNotRespondingPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String SHOW_ALL_ANRS_KEY = "show_all_anrs";
 
@@ -36,8 +34,6 @@
     @VisibleForTesting
     static final int SETTING_VALUE_OFF = 0;
 
-    private SwitchPreference mPreference;
-
     public AppsNotRespondingPreferenceController(Context context) {
         super(context);
     }
@@ -48,13 +44,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         Settings.Secure.putInt(mContext.getContentResolver(),
@@ -67,19 +56,14 @@
     public void updateState(Preference preference) {
         final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
                 Settings.Secure.ANR_SHOW_BACKGROUND, SETTING_VALUE_OFF);
-        mPreference.setChecked(mode != SETTING_VALUE_OFF);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         Settings.Secure.putInt(mContext.getContentResolver(),
                 Settings.Secure.ANR_SHOW_BACKGROUND, SETTING_VALUE_OFF);
-        mPreference.setEnabled(false);
-        mPreference.setChecked(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java b/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java
index 9f962ca..9049959 100644
--- a/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java
+++ b/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java
@@ -23,7 +23,6 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
@@ -37,7 +36,6 @@
 
     private final String[] mListValues;
     private final String[] mListSummaries;
-    private ListPreference mPreference;
 
     public BackgroundProcessLimitPreferenceController(Context context) {
         super(context);
@@ -52,13 +50,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         writeAppProcessLimitOptions(newValue);
         updateAppProcessLimitOptions();
@@ -71,14 +62,9 @@
     }
 
     @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
-    }
-
-    @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         writeAppProcessLimitOptions(null);
-        mPreference.setEnabled(false);
     }
 
     private void updateAppProcessLimitOptions() {
@@ -92,8 +78,9 @@
                     break;
                 }
             }
-            mPreference.setValue(mListValues[index]);
-            mPreference.setSummary(mListSummaries[index]);
+            final ListPreference listPreference = (ListPreference) mPreference;
+            listPreference.setValue(mListValues[index]);
+            listPreference.setSummary(mListSummaries[index]);
         } catch (RemoteException e) {
             // intentional no-op
         }
diff --git a/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java b/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java
index 64f6440..e55e9de 100644
--- a/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java
+++ b/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java
@@ -21,7 +21,6 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -36,8 +35,6 @@
     static final String BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY =
             "persist.bluetooth.disableabsvol";
 
-    private SwitchPreference mPreference;
-
     public BluetoothAbsoluteVolumePreferenceController(Context context) {
         super(context);
     }
@@ -48,13 +45,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         SystemProperties.set(BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY,
@@ -66,18 +56,13 @@
     public void updateState(Preference preference) {
         final boolean isEnabled = SystemProperties.getBoolean(
                 BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY, false /* default */);
-        mPreference.setChecked(isEnabled);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(isEnabled);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         SystemProperties.set(BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY, "false");
-        mPreference.setChecked(false);
-        mPreference.setEnabled(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java b/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java
index a56f5ea..ba75b35 100644
--- a/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java
+++ b/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java
@@ -21,16 +21,14 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
-public class BluetoothAvrcpVersionPreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        PreferenceControllerMixin {
+public class BluetoothAvrcpVersionPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String BLUETOOTH_SELECT_AVRCP_VERSION_KEY =
             "bluetooth_select_avrcp_version";
@@ -40,7 +38,6 @@
 
     private final String[] mListValues;
     private final String[] mListSummaries;
-    private ListPreference mPreference;
 
     public BluetoothAvrcpVersionPreferenceController(Context context) {
         super(context);
@@ -55,13 +52,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         SystemProperties.set(BLUETOOTH_AVRCP_VERSION_PROPERTY, newValue.toString());
         updateState(mPreference);
@@ -70,6 +60,7 @@
 
     @Override
     public void updateState(Preference preference) {
+        final ListPreference listPreference = (ListPreference) preference;
         final String currentValue = SystemProperties.get(BLUETOOTH_AVRCP_VERSION_PROPERTY);
         int index = 0; // Defaults to AVRCP 1.4
         for (int i = 0; i < mListValues.length; i++) {
@@ -78,17 +69,7 @@
                 break;
             }
         }
-        mPreference.setValue(mListValues[index]);
-        mPreference.setSummary(mListSummaries[index]);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchDisabled() {
-        mPreference.setEnabled(false);
+        listPreference.setValue(mListValues[index]);
+        listPreference.setSummary(mListSummaries[index]);
     }
 }
diff --git a/src/com/android/settings/development/BluetoothDelayReportsPreferenceController.java b/src/com/android/settings/development/BluetoothDelayReportsPreferenceController.java
index 5dc6e52..0858555 100644
--- a/src/com/android/settings/development/BluetoothDelayReportsPreferenceController.java
+++ b/src/com/android/settings/development/BluetoothDelayReportsPreferenceController.java
@@ -21,14 +21,12 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
-public class BluetoothDelayReportsPreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        PreferenceControllerMixin {
+public class BluetoothDelayReportsPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String BLUETOOTH_ENABLE_AVDTP_DELAY_REPORT_KEY =
             "bluetooth_enable_avdtp_delay_reports";
@@ -36,8 +34,6 @@
     static final String BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY =
             "persist.bluetooth.enabledelayreports";
 
-    private SwitchPreference mPreference;
-
     public BluetoothDelayReportsPreferenceController(Context context) {
         super(context);
     }
@@ -48,13 +44,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         SystemProperties.set(BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY,
@@ -66,19 +55,14 @@
     public void updateState(Preference preference) {
         final boolean isEnabled = SystemProperties.getBoolean(
                 BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY, false /* default */);
-        mPreference.setChecked(isEnabled);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(isEnabled);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
-        mPreference.setEnabled(false);
+        super.onDeveloperOptionsSwitchDisabled();
         // the default setting for this preference is the disabled state
-        mPreference.setChecked(false);
+        ((SwitchPreference) mPreference).setChecked(false);
         SystemProperties.set(BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY, "false");
     }
 
diff --git a/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java b/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java
index 654a531..5a9977b 100644
--- a/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java
+++ b/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java
@@ -21,7 +21,6 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -36,8 +35,6 @@
     static final String BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY =
             "persist.bluetooth.showdeviceswithoutnames";
 
-    private SwitchPreference mPreference;
-
     public BluetoothDeviceNoNamePreferenceController(Context context) {
         super(context);
     }
@@ -48,13 +45,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         SystemProperties.set(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY,
@@ -66,18 +56,13 @@
     public void updateState(Preference preference) {
         final boolean isEnabled = SystemProperties.getBoolean(
                 BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false /* default */);
-        mPreference.setChecked(isEnabled);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(isEnabled);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         SystemProperties.set(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, "false");
-        mPreference.setChecked(false);
-        mPreference.setEnabled(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/BluetoothInbandRingingPreferenceController.java b/src/com/android/settings/development/BluetoothInbandRingingPreferenceController.java
index 809db19..c64ac11 100644
--- a/src/com/android/settings/development/BluetoothInbandRingingPreferenceController.java
+++ b/src/com/android/settings/development/BluetoothInbandRingingPreferenceController.java
@@ -22,14 +22,12 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
-public class BluetoothInbandRingingPreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        PreferenceControllerMixin {
+public class BluetoothInbandRingingPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String BLUETOOTH_DISABLE_INBAND_RINGING_KEY =
             "bluetooth_disable_inband_ringing";
@@ -37,8 +35,6 @@
     static final String BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY =
             "persist.bluetooth.disableinbandringing";
 
-    private SwitchPreference mPreference;
-
     public BluetoothInbandRingingPreferenceController(Context context) {
         super(context);
     }
@@ -54,13 +50,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isChecked = (Boolean) newValue;
         SystemProperties.set(BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY,
@@ -72,18 +61,13 @@
     public void updateState(Preference preference) {
         final boolean isEnabled = SystemProperties.getBoolean(
                 BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY, false /* default */);
-        mPreference.setChecked(isEnabled);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(isEnabled);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
-        mPreference.setEnabled(false);
-        mPreference.setChecked(false);
+        super.onDeveloperOptionsSwitchDisabled();
+        ((SwitchPreference) mPreference).setChecked(false);
         SystemProperties.set(BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY, "false");
     }
 
diff --git a/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java b/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java
index 79187f5..9737b67 100644
--- a/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java
+++ b/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java
@@ -38,7 +38,6 @@
             "persist.bluetooth.maxconnectedaudiodevices";
 
     private final int mDefaultMaxConnectedAudioDevices;
-    private ListPreference mPreference;
 
     public BluetoothMaxConnectedAudioDevicesPreferenceController(Context context) {
         super(context);
@@ -54,10 +53,10 @@
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
-        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
-        final CharSequence[] entries = mPreference.getEntries();
+        final ListPreference listPreference = (ListPreference) mPreference;
+        final CharSequence[] entries = listPreference.getEntries();
         entries[0] = String.format(entries[0].toString(), mDefaultMaxConnectedAudioDevices);
-        mPreference.setEntries(entries);
+        listPreference.setEntries(entries);
     }
 
     @Override
@@ -93,13 +92,13 @@
 
     @Override
     protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        super.onDeveloperOptionsSwitchEnabled();
         updateState(mPreference);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
-        mPreference.setEnabled(false);
+        super.onDeveloperOptionsSwitchDisabled();
         SystemProperties.set(MAX_CONNECTED_AUDIO_DEVICES_PROPERTY, "");
         updateState(mPreference);
     }
diff --git a/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java b/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java
index 56cfd73..0dd5d26 100644
--- a/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java
+++ b/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java
@@ -21,22 +21,18 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
-public class BluetoothSnoopLogPreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        PreferenceControllerMixin {
+public class BluetoothSnoopLogPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String PREFERENCE_KEY = "bt_hci_snoop_log";
     @VisibleForTesting
     static final String BLUETOOTH_BTSNOOP_ENABLE_PROPERTY =
             "persist.bluetooth.btsnoopenable";
 
-    private SwitchPreference mPreference;
-
     public BluetoothSnoopLogPreferenceController(Context context) {
         super(context);
     }
@@ -47,12 +43,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean enableBtSnoopLog = (Boolean) newValue;
         SystemProperties.set(BLUETOOTH_BTSNOOP_ENABLE_PROPERTY, Boolean.toString(enableBtSnoopLog));
@@ -64,18 +54,13 @@
         super.updateState(preference);
         final boolean enableBtSnoopLog = SystemProperties.getBoolean(
                 BLUETOOTH_BTSNOOP_ENABLE_PROPERTY, false /* def */);
-        mPreference.setChecked(enableBtSnoopLog);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(enableBtSnoopLog);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         SystemProperties.set(BLUETOOTH_BTSNOOP_ENABLE_PROPERTY, Boolean.toString(false));
-        mPreference.setChecked(false);
-        mPreference.setEnabled(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/BugReportInPowerPreferenceController.java b/src/com/android/settings/development/BugReportInPowerPreferenceController.java
index d7c5434..0adce37 100644
--- a/src/com/android/settings/development/BugReportInPowerPreferenceController.java
+++ b/src/com/android/settings/development/BugReportInPowerPreferenceController.java
@@ -16,14 +16,12 @@
 
 package com.android.settings.development;
 
-import android.content.ComponentName;
 import android.content.Context;
 import android.os.UserManager;
 import android.provider.Settings;
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -40,7 +38,6 @@
     static int SETTING_VALUE_OFF = 0;
 
     private final UserManager mUserManager;
-    private SwitchPreference mPreference;
 
     public BugReportInPowerPreferenceController(Context context) {
         super(context);
@@ -58,13 +55,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(KEY_BUGREPORT_IN_POWER);
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         Settings.Secure.putInt(mContext.getContentResolver(),
@@ -77,18 +67,14 @@
     public void updateState(Preference preference) {
         final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
                 Settings.Global.BUGREPORT_IN_POWER_MENU, SETTING_VALUE_OFF);
-        mPreference.setChecked(mode != SETTING_VALUE_OFF);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        // no-op because this preference can never be disabled
+        ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         Settings.Secure.putInt(mContext.getContentResolver(),
                 Settings.Global.BUGREPORT_IN_POWER_MENU, SETTING_VALUE_OFF);
-        mPreference.setChecked(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/CameraLaserSensorPreferenceController.java b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java
index 3f09513..bc94e73 100644
--- a/src/com/android/settings/development/CameraLaserSensorPreferenceController.java
+++ b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java
@@ -14,14 +14,12 @@
  * limitations under the License.
  */
 
-
 package com.android.settings.development;
 
 import android.content.Context;
 import android.os.SystemProperties;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 
 import com.android.internal.annotations.VisibleForTesting;
@@ -29,9 +27,8 @@
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
-public class CameraLaserSensorPreferenceController extends
-        DeveloperOptionsPreferenceController implements
-        Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+public class CameraLaserSensorPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String KEY_CAMERA_LASER_SENSOR_SWITCH = "camera_laser_sensor_switch";
     @VisibleForTesting
@@ -49,8 +46,6 @@
     @VisibleForTesting
     static final String USER_BUILD = "user";
 
-    private SwitchPreference mPreference;
-
     public CameraLaserSensorPreferenceController(Context context) {
         super(context);
     }
@@ -66,13 +61,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         String value = Integer.toString(isEnabled ? ENABLED : DISABLED);
@@ -83,19 +71,14 @@
     @Override
     public void updateState(Preference preference) {
         final boolean enabled = isLaserSensorEnabled();
-        mPreference.setChecked(enabled);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(enabled);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         SystemProperties.set(PROPERTY_CAMERA_LASER_SENSOR, Integer.toString(DISABLED));
-        mPreference.setChecked(false);
-        mPreference.setEnabled(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 
     private boolean isLaserSensorEnabled() {
diff --git a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java
index b512757..d168df6 100644
--- a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java
+++ b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java
@@ -32,8 +32,8 @@
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
-public class ClearAdbKeysPreferenceController extends
-        DeveloperOptionsPreferenceController implements PreferenceControllerMixin {
+public class ClearAdbKeysPreferenceController extends DeveloperOptionsPreferenceController
+        implements PreferenceControllerMixin {
 
     private static final String TAG = "ClearAdbPrefCtrl";
     private static final String CLEAR_ADB_KEYS = "clear_adb_keys";
@@ -44,8 +44,6 @@
     private final IUsbManager mUsbManager;
     private final DevelopmentSettingsDashboardFragment mFragment;
 
-    private Preference mPreference;
-
     public ClearAdbKeysPreferenceController(Context context,
             DevelopmentSettingsDashboardFragment fragment) {
         super(context);
@@ -68,7 +66,6 @@
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
 
-        mPreference = screen.findPreference(getPreferenceKey());
         if (mPreference != null && !isAdminUser()) {
             mPreference.setEnabled(false);
         }
@@ -94,11 +91,6 @@
         }
     }
 
-    @Override
-    protected void onDeveloperOptionsSwitchDisabled() {
-        mPreference.setEnabled(false);
-    }
-
     public void onClearAdbKeysConfirmed() {
         try {
             mUsbManager.clearUsbDebuggingKeys();
diff --git a/src/com/android/settings/development/ConnectivityMonitorPreferenceController.java b/src/com/android/settings/development/ConnectivityMonitorPreferenceController.java
index 075af2b..85b562d 100644
--- a/src/com/android/settings/development/ConnectivityMonitorPreferenceController.java
+++ b/src/com/android/settings/development/ConnectivityMonitorPreferenceController.java
@@ -20,7 +20,6 @@
 import android.os.SystemProperties;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.widget.Toast;
 
@@ -29,9 +28,8 @@
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
-public class ConnectivityMonitorPreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        PreferenceControllerMixin {
+public class ConnectivityMonitorPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String KEY_CONNECTIVITY_MONITOR_SWITCH = "connectivity_monitor_switch";
     @VisibleForTesting
@@ -53,20 +51,11 @@
     @VisibleForTesting
     static final String ENG_BUILD = "eng";
 
-    private SwitchPreference mPreference;
-
     public ConnectivityMonitorPreferenceController(Context context) {
         super(context);
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(KEY_CONNECTIVITY_MONITOR_SWITCH);
-    }
-
-    @Override
     public String getPreferenceKey() {
         return KEY_CONNECTIVITY_MONITOR_SWITCH;
     }
@@ -92,19 +81,14 @@
     @Override
     public void updateState(Preference preference) {
         final boolean enabled = isConnectivityMonitorEnabled();
-        mPreference.setChecked(enabled);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(enabled);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         SystemProperties.set(PROPERTY_CONNECTIVITY_MONITOR, USER_DISABLED_STATUS);
-        mPreference.setChecked(false);
-        mPreference.setEnabled(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 
     private boolean isConnectivityMonitorEnabled() {
diff --git a/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java b/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java
index aa954c0..0c26e58 100644
--- a/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java
+++ b/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java
@@ -21,7 +21,6 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 import android.widget.Toast;
 
 import com.android.settings.R;
@@ -29,17 +28,14 @@
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 import com.android.settingslib.development.SystemPropPoker;
 
-public class CoolColorTemperaturePreferenceController extends
-        DeveloperOptionsPreferenceController implements
-        Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+public class CoolColorTemperaturePreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String COLOR_TEMPERATURE_KEY = "color_temperature";
 
     @VisibleForTesting
     static final String COLOR_TEMPERATURE_PROPERTY = "persist.sys.debug.color_temp";
 
-    private SwitchPreference mPreference;
-
     public CoolColorTemperaturePreferenceController(Context context) {
         super(context);
     }
@@ -55,12 +51,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isColorTemperatureEnabled = (Boolean) newValue;
         SystemProperties.set(COLOR_TEMPERATURE_PROPERTY,
@@ -74,19 +64,14 @@
     public void updateState(Preference preference) {
         final boolean enableColorTemperature = SystemProperties.getBoolean(
                 COLOR_TEMPERATURE_PROPERTY, false /* default */);
-        mPreference.setChecked(enableColorTemperature);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(enableColorTemperature);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         SystemProperties.set(COLOR_TEMPERATURE_PROPERTY, Boolean.toString(false));
-        mPreference.setChecked(false);
-        mPreference.setEnabled(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/development/DarkUIPreferenceController.java b/src/com/android/settings/development/DarkUIPreferenceController.java
index a35397b..a2c928c 100644
--- a/src/com/android/settings/development/DarkUIPreferenceController.java
+++ b/src/com/android/settings/development/DarkUIPreferenceController.java
@@ -26,9 +26,8 @@
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
-public class DarkUIPreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        PreferenceControllerMixin {
+public class DarkUIPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String DARK_UI_KEY = "dark_ui_mode";
     private final UiModeManager mUiModeManager;
diff --git a/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java b/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java
index 5e0baa8..f0fd8f9 100644
--- a/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java
+++ b/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java
@@ -20,7 +20,6 @@
 import android.os.SystemProperties;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.view.ThreadedRenderer;
 
@@ -37,7 +36,6 @@
 
     private final String[] mListValues;
     private final String[] mListSummaries;
-    private ListPreference mPreference;
 
     public DebugGpuOverdrawPreferenceController(Context context) {
         super(context);
@@ -52,13 +50,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         writeDebugHwOverdrawOptions(newValue);
         updateDebugHwOverdrawOptions();
@@ -70,16 +61,6 @@
         updateDebugHwOverdrawOptions();
     }
 
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchDisabled() {
-        mPreference.setEnabled(false);
-    }
-
     private void writeDebugHwOverdrawOptions(Object newValue) {
         SystemProperties.set(ThreadedRenderer.DEBUG_OVERDRAW_PROPERTY,
                 newValue == null ? "" : newValue.toString());
@@ -97,7 +78,8 @@
                 break;
             }
         }
-        mPreference.setValue(mListValues[index]);
-        mPreference.setSummary(mListSummaries[index]);
+        final ListPreference listPreference = (ListPreference) mPreference;
+        listPreference.setValue(mListValues[index]);
+        listPreference.setSummary(mListSummaries[index]);
     }
 }
diff --git a/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java b/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java
index bd4577a..6dd9412 100644
--- a/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java
+++ b/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java
@@ -20,7 +20,6 @@
 import android.os.SystemProperties;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.view.ThreadedRenderer;
 
@@ -37,7 +36,6 @@
 
     private final String[] mListValues;
     private final String[] mListSummaries;
-    private ListPreference mPreference;
 
     public DebugNonRectClipOperationsPreferenceController(Context context) {
         super(context);
@@ -52,13 +50,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         writeShowNonRectClipOptions(newValue);
         updateShowNonRectClipOptions();
@@ -70,16 +61,6 @@
         updateShowNonRectClipOptions();
     }
 
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchDisabled() {
-        mPreference.setEnabled(false);
-    }
-
     private void writeShowNonRectClipOptions(Object newValue) {
         SystemProperties.set(ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY,
                 newValue == null ? "" : newValue.toString());
@@ -97,7 +78,8 @@
                 break;
             }
         }
-        mPreference.setValue(mListValues[index]);
-        mPreference.setSummary(mListSummaries[index]);
+        final ListPreference listPreference = (ListPreference) mPreference;
+        listPreference.setValue(mListValues[index]);
+        listPreference.setSummary(mListSummaries[index]);
     }
 }
diff --git a/src/com/android/settings/development/DebugViewAttributesPreferenceController.java b/src/com/android/settings/development/DebugViewAttributesPreferenceController.java
index caf23fa..fccfe28 100644
--- a/src/com/android/settings/development/DebugViewAttributesPreferenceController.java
+++ b/src/com/android/settings/development/DebugViewAttributesPreferenceController.java
@@ -21,7 +21,6 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -37,8 +36,6 @@
     @VisibleForTesting
     static final int SETTING_VALUE_OFF = 0;
 
-    private SwitchPreference mPreference;
-
     public DebugViewAttributesPreferenceController(Context context) {
         super(context);
     }
@@ -49,13 +46,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean showViewAttr = (Boolean) newValue;
         Settings.Global.putInt(mContext.getContentResolver(),
@@ -68,19 +58,14 @@
     public void updateState(Preference preference) {
         final int debugViewAttrMode = Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.DEBUG_VIEW_ATTRIBUTES, 0 /* default */);
-        mPreference.setChecked(debugViewAttrMode != SETTING_VALUE_OFF);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(debugViewAttrMode != SETTING_VALUE_OFF);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         Settings.Global.putInt(mContext.getContentResolver(),
                 Settings.Global.DEBUG_VIEW_ATTRIBUTES, SETTING_VALUE_OFF);
-        mPreference.setChecked(false);
-        mPreference.setEnabled(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/DefaultLaunchPreferenceController.java b/src/com/android/settings/development/DefaultLaunchPreferenceController.java
new file mode 100644
index 0000000..e76dbeb
--- /dev/null
+++ b/src/com/android/settings/development/DefaultLaunchPreferenceController.java
@@ -0,0 +1,45 @@
+/*
+ * 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 android.content.Context;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+/**
+ * This controller is used for preference that has fragment or launch intent defined in the
+ * preference xml, and do not need any handling to update the preference state, except when the
+ * master developer options switch is turned on/off, the preference needs to be enabled/disabled.
+ *
+ */
+public class DefaultLaunchPreferenceController extends DeveloperOptionsPreferenceController
+        implements PreferenceControllerMixin {
+
+    private final String mPreferenceKey;
+
+    public DefaultLaunchPreferenceController(Context context, String preferenceKey) {
+        super(context);
+
+        mPreferenceKey = preferenceKey;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return mPreferenceKey;
+    }
+}
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index e2495f0..9666a6c 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -449,6 +449,17 @@
         controllers.add(new FreeformWindowsPreferenceController(context));
         controllers.add(new ShortcutManagerThrottlingPreferenceController(context));
         controllers.add(new EnableGnssRawMeasFullTrackingPreferenceController(context));
+        controllers.add(new DefaultLaunchPreferenceController(context, "running_apps"));
+        controllers.add(
+            new DefaultLaunchPreferenceController(context, "android_o_battery_settings"));
+        controllers.add(new DefaultLaunchPreferenceController(context, "demo_mode"));
+        controllers.add(new DefaultLaunchPreferenceController(context, "quick_settings_tiles"));
+        controllers.add(new DefaultLaunchPreferenceController(context, "feature_flags_dashboard"));
+        controllers.add(
+            new DefaultLaunchPreferenceController(context, "default_usb_configuration"));
+        controllers.add(new DefaultLaunchPreferenceController(context, "density"));
+        controllers.add(new DefaultLaunchPreferenceController(context, "background_check"));
+        controllers.add(new DefaultLaunchPreferenceController(context, "inactive_apps"));
         return controllers;
     }
 
diff --git a/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java b/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java
index 4090462..d45e6b4 100644
--- a/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java
+++ b/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java
@@ -21,7 +21,6 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -32,8 +31,6 @@
 
     private static final String OTA_DISABLE_AUTOMATIC_UPDATE_KEY = "ota_disable_automatic_update";
 
-    private SwitchPreference mPreference;
-
     // We use the "disabled status" in code, but show the opposite text
     // "Automatic system updates" on screen. So a value 0 indicates the
     // automatic update is enabled.
@@ -52,13 +49,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean updatesEnabled = (Boolean) newValue;
         Settings.Global.putInt(mContext.getContentResolver(),
@@ -72,19 +62,14 @@
         final int updatesEnabled = Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE, 0 /* default */);
 
-        mPreference.setChecked(updatesEnabled != DISABLE_UPDATES_SETTING);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(updatesEnabled != DISABLE_UPDATES_SETTING);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         Settings.Global.putInt(mContext.getContentResolver(),
                 Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE, DISABLE_UPDATES_SETTING);
-        mPreference.setChecked(false);
-        mPreference.setEnabled(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java b/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java
index 34b3996..9fa323a 100644
--- a/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java
+++ b/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java
@@ -157,15 +157,10 @@
     }
 
     @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
-    }
-
-    @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         setEmulationOverlay("");
         updateState(mPreference);
-        mPreference.setEnabled(false);
     }
 
 }
diff --git a/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java b/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java
index 09770f6..cb02a40 100644
--- a/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java
+++ b/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java
@@ -21,7 +21,6 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -36,8 +35,6 @@
     static final int SETTING_VALUE_ON = 1;
     static final int SETTING_VALUE_OFF = 0;
 
-    private SwitchPreference mPreference;
-
     public EnableGnssRawMeasFullTrackingPreferenceController(Context context) {
         super(context);
     }
@@ -48,13 +45,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         Settings.Global.putInt(mContext.getContentResolver(),
@@ -69,19 +59,14 @@
         final int enableGnssRawMeasFullTrackingMode =
                 Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING, SETTING_VALUE_OFF);
-        mPreference.setChecked(enableGnssRawMeasFullTrackingMode != SETTING_VALUE_OFF);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(enableGnssRawMeasFullTrackingMode != SETTING_VALUE_OFF);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         Settings.Global.putInt(mContext.getContentResolver(),
                 Settings.Global.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING, SETTING_VALUE_OFF);
-        mPreference.setEnabled(false);
-        mPreference.setChecked(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java b/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java
index 9cea8c8..58b6392 100644
--- a/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java
+++ b/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java
@@ -21,14 +21,12 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
-public class EnableGpuDebugLayersPreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        PreferenceControllerMixin {
+public class EnableGpuDebugLayersPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String ENABLE_GPU_DEBUG_LAYERS_KEY = "enable_gpu_debug_layers";
 
@@ -37,8 +35,6 @@
     @VisibleForTesting
     static final int SETTING_VALUE_OFF = 0;
 
-    private SwitchPreference mPreference;
-
     public EnableGpuDebugLayersPreferenceController(Context context) {
         super(context);
     }
@@ -49,13 +45,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         Settings.Global.putInt(mContext.getContentResolver(),
@@ -68,19 +57,14 @@
     public void updateState(Preference preference) {
         final int enableGpuDebugLayersMode = Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.ENABLE_GPU_DEBUG_LAYERS, SETTING_VALUE_OFF);
-        mPreference.setChecked(enableGpuDebugLayersMode != SETTING_VALUE_OFF);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(enableGpuDebugLayersMode != SETTING_VALUE_OFF);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         Settings.Global.putInt(mContext.getContentResolver(),
                 Settings.Global.ENABLE_GPU_DEBUG_LAYERS, SETTING_VALUE_OFF);
-        mPreference.setEnabled(false);
-        mPreference.setChecked(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/FileEncryptionPreferenceController.java b/src/com/android/settings/development/FileEncryptionPreferenceController.java
index 3249bcf..263b9da 100644
--- a/src/com/android/settings/development/FileEncryptionPreferenceController.java
+++ b/src/com/android/settings/development/FileEncryptionPreferenceController.java
@@ -23,15 +23,14 @@
 import android.os.storage.IStorageManager;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
-public class FileEncryptionPreferenceController extends
-        DeveloperOptionsPreferenceController implements PreferenceControllerMixin {
+public class FileEncryptionPreferenceController extends DeveloperOptionsPreferenceController
+        implements PreferenceControllerMixin {
 
     private static final String KEY_CONVERT_FBE = "convert_to_file_encryption";
     private static final String KEY_STORAGE_MANAGER = "mount";
@@ -41,8 +40,6 @@
 
     private final IStorageManager mStorageManager;
 
-    private Preference mPreference;
-
     public FileEncryptionPreferenceController(Context context) {
         super(context);
 
@@ -68,13 +65,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public void updateState(Preference preference) {
         if (!TextUtils.equals("file",
                 SystemProperties.get(FILE_ENCRYPTION_PROPERTY_KEY, "none" /* default */))) {
diff --git a/src/com/android/settings/development/ForceGpuRenderingPreferenceController.java b/src/com/android/settings/development/ForceGpuRenderingPreferenceController.java
index 83f7930..72074cb 100644
--- a/src/com/android/settings/development/ForceGpuRenderingPreferenceController.java
+++ b/src/com/android/settings/development/ForceGpuRenderingPreferenceController.java
@@ -21,23 +21,19 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 import com.android.settingslib.development.SystemPropPoker;
 
-public class ForceGpuRenderingPreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        PreferenceControllerMixin {
+public class ForceGpuRenderingPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String FORCE_HARDWARE_UI_KEY = "force_hw_ui";
 
     @VisibleForTesting
     static final String HARDWARE_UI_PROPERTY = "persist.sys.ui.hw";
 
-    private SwitchPreference mPreference;
-
     public ForceGpuRenderingPreferenceController(Context context) {
         super(context);
     }
@@ -48,13 +44,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         SystemProperties.set(HARDWARE_UI_PROPERTY,
@@ -67,18 +56,13 @@
     public void updateState(Preference preference) {
         final boolean isEnabled = SystemProperties.getBoolean(HARDWARE_UI_PROPERTY,
                 false /* default */);
-        mPreference.setChecked(isEnabled);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(isEnabled);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         SystemProperties.set(HARDWARE_UI_PROPERTY, Boolean.toString(false));
-        mPreference.setEnabled(false);
-        mPreference.setChecked(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/ForceMSAAPreferenceController.java b/src/com/android/settings/development/ForceMSAAPreferenceController.java
index 2d2fd95..4fd1f3b 100644
--- a/src/com/android/settings/development/ForceMSAAPreferenceController.java
+++ b/src/com/android/settings/development/ForceMSAAPreferenceController.java
@@ -21,7 +21,6 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -35,8 +34,6 @@
     @VisibleForTesting
     static final String MSAA_PROPERTY = "debug.egl.force_msaa";
 
-    private SwitchPreference mPreference;
-
     public ForceMSAAPreferenceController(Context context) {
         super(context);
     }
@@ -47,13 +44,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         SystemProperties.set(MSAA_PROPERTY,
@@ -65,18 +55,13 @@
     @Override
     public void updateState(Preference preference) {
         final boolean isEnabled = SystemProperties.getBoolean(MSAA_PROPERTY, false /* default */);
-        mPreference.setChecked(isEnabled);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(isEnabled);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         SystemProperties.set(MSAA_PROPERTY, Boolean.toString(false));
-        mPreference.setChecked(false);
-        mPreference.setEnabled(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/FreeformWindowsPreferenceController.java b/src/com/android/settings/development/FreeformWindowsPreferenceController.java
index 8b847f6..90aad28 100644
--- a/src/com/android/settings/development/FreeformWindowsPreferenceController.java
+++ b/src/com/android/settings/development/FreeformWindowsPreferenceController.java
@@ -22,15 +22,13 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
-public class FreeformWindowsPreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        PreferenceControllerMixin {
+public class FreeformWindowsPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String ENABLE_FREEFORM_SUPPORT_KEY = "enable_freeform_support";
 
@@ -41,8 +39,6 @@
     @VisibleForTesting
     static final String USER_BUILD_TYPE = "user";
 
-    private SwitchPreference mPreference;
-
     public FreeformWindowsPreferenceController(Context context) {
         super(context);
     }
@@ -58,13 +54,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         Settings.Global.putInt(mContext.getContentResolver(),
@@ -77,20 +66,15 @@
     public void updateState(Preference preference) {
         final int mode = Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, SETTING_VALUE_OFF);
-        mPreference.setChecked(mode != SETTING_VALUE_OFF);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         Settings.Global.putInt(mContext.getContentResolver(),
                 Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, SETTING_VALUE_OFF);
-        mPreference.setEnabled(false);
-        mPreference.setChecked(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java b/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java
new file mode 100644
index 0000000..10455eb
--- /dev/null
+++ b/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java
@@ -0,0 +1,78 @@
+/*
+ * 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 android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+/**
+ * Base controller for Switch preference that maps to a specific value in Settings.Global.
+ */
+public abstract class GlobalSettingSwitchPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final int SETTING_VALUE_OFF = 0;
+    private static final int SETTING_VALUE_ON = 1;
+
+    private final String mSettingsKey;
+    private final int mOn;
+    private final int mOff;
+    private final int mDefault;
+
+    public GlobalSettingSwitchPreferenceController(Context context, String globalSettingsKey) {
+        this(context, globalSettingsKey, SETTING_VALUE_ON, SETTING_VALUE_OFF, SETTING_VALUE_OFF);
+    }
+
+    /**
+     * Use different on/off/default vaules other than the standard 1/0/0.
+     */
+    public GlobalSettingSwitchPreferenceController(Context context, String globalSettingsKey,
+            int valueOn, int valueOff, int valueDefault) {
+        super(context);
+        mSettingsKey = globalSettingsKey;
+        mOn = valueOn;
+        mOff = valueOff;
+        mDefault = valueDefault;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        Settings.Global.putInt(mContext.getContentResolver(), mSettingsKey, isEnabled ? mOn : mOff);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final int mode =
+            Settings.Global.getInt(mContext.getContentResolver(), mSettingsKey, mDefault);
+        ((SwitchPreference) mPreference).setChecked(mode != mOff);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
+        Settings.Global.putInt(mContext.getContentResolver(), mSettingsKey, mOff);
+        ((SwitchPreference) mPreference).setChecked(false);
+    }
+}
diff --git a/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java b/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java
index cccb38b..d52bb69 100644
--- a/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java
+++ b/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java
@@ -20,21 +20,17 @@
 import android.os.SystemProperties;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 import android.view.ThreadedRenderer;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 import com.android.settingslib.development.SystemPropPoker;
 
-public class GpuViewUpdatesPreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        PreferenceControllerMixin {
+public class GpuViewUpdatesPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String SHOW_HW_SCREEN_UPDATES_KEY = "show_hw_screen_updates";
 
-    private SwitchPreference mPreference;
-
     public GpuViewUpdatesPreferenceController(Context context) {
         super(context);
     }
@@ -45,13 +41,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         SystemProperties.set(ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY,
@@ -64,18 +53,13 @@
     public void updateState(Preference preference) {
         final boolean isEnabled = SystemProperties.getBoolean(
                 ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, false /* default */);
-        mPreference.setChecked(isEnabled);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(isEnabled);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         SystemProperties.set(ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, null);
-        mPreference.setEnabled(false);
-        mPreference.setChecked(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java b/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java
index 967839e..77cca91 100644
--- a/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java
+++ b/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java
@@ -20,21 +20,17 @@
 import android.os.SystemProperties;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 import android.view.ThreadedRenderer;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 import com.android.settingslib.development.SystemPropPoker;
 
-public class HardwareLayersUpdatesPreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        PreferenceControllerMixin {
+public class HardwareLayersUpdatesPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String SHOW_HW_LAYERS_UPDATES_KEY = "show_hw_layers_updates";
 
-    private SwitchPreference mPreference;
-
     public HardwareLayersUpdatesPreferenceController(Context context) {
         super(context);
     }
@@ -45,13 +41,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         SystemProperties.set(ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY,
@@ -64,18 +53,13 @@
     public void updateState(Preference preference) {
         final boolean isEnabled = SystemProperties.getBoolean(
                 ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, false /* default */);
-        mPreference.setChecked(isEnabled);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(isEnabled);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         SystemProperties.set(ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, null);
-        mPreference.setEnabled(false);
-        mPreference.setChecked(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/HardwareOverlaysPreferenceController.java b/src/com/android/settings/development/HardwareOverlaysPreferenceController.java
index c2f7c54..51cde9e 100644
--- a/src/com/android/settings/development/HardwareOverlaysPreferenceController.java
+++ b/src/com/android/settings/development/HardwareOverlaysPreferenceController.java
@@ -24,7 +24,6 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -45,7 +44,6 @@
     private static final String SURFACE_COMPOSER_INTERFACE_KEY = "android.ui.ISurfaceComposer";
 
     private final IBinder mSurfaceFlinger;
-    private SwitchPreference mPreference;
 
     public HardwareOverlaysPreferenceController(Context context) {
         super(context);
@@ -58,13 +56,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         writeHardwareOverlaysSetting(isEnabled);
@@ -77,19 +68,15 @@
     }
 
     @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
-    }
-
-    @Override
     protected void onDeveloperOptionsSwitchDisabled() {
-        if (mPreference.isChecked()) {
+        super.onDeveloperOptionsSwitchDisabled();
+        final SwitchPreference switchPreference = (SwitchPreference) mPreference;
+        if (switchPreference.isChecked()) {
             // Writing false to the preference when the setting is already off will have a
             // side effect of turning on the preference that we wish to avoid
             writeHardwareOverlaysSetting(false);
-            mPreference.setChecked(false);
+            switchPreference.setChecked(false);
         }
-        mPreference.setEnabled(false);
     }
 
     @VisibleForTesting
@@ -108,7 +95,7 @@
             @SuppressWarnings("unused") final int showUpdates = reply.readInt();
             @SuppressWarnings("unused") final int showBackground = reply.readInt();
             final int disableOverlays = reply.readInt();
-            mPreference.setChecked(disableOverlays != SETTING_VALUE_OFF);
+            ((SwitchPreference) mPreference).setChecked(disableOverlays != SETTING_VALUE_OFF);
             reply.recycle();
             data.recycle();
         } catch (RemoteException ex) {
diff --git a/src/com/android/settings/development/HdcpCheckingPreferenceController.java b/src/com/android/settings/development/HdcpCheckingPreferenceController.java
index 60264ef..4c5b1e2 100644
--- a/src/com/android/settings/development/HdcpCheckingPreferenceController.java
+++ b/src/com/android/settings/development/HdcpCheckingPreferenceController.java
@@ -22,7 +22,6 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 
 import com.android.settings.R;
@@ -30,9 +29,8 @@
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 import com.android.settingslib.development.SystemPropPoker;
 
-public class HdcpCheckingPreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        PreferenceControllerMixin {
+public class HdcpCheckingPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String HDCP_CHECKING_KEY = "hdcp_checking";
 
@@ -43,7 +41,6 @@
 
     private final String[] mListValues;
     private final String[] mListSummaries;
-    private ListPreference mPreference;
 
     public HdcpCheckingPreferenceController(Context context) {
         super(context);
@@ -63,36 +60,19 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         SystemProperties.set(HDCP_CHECKING_PROPERTY, newValue.toString());
-        updateHdcpValues();
+        updateHdcpValues((ListPreference) mPreference);
         SystemPropPoker.getInstance().poke();
         return true;
     }
 
     @Override
     public void updateState(Preference preference) {
-        updateHdcpValues();
+        updateHdcpValues((ListPreference) mPreference);
     }
 
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchDisabled() {
-        mPreference.setEnabled(false);
-    }
-
-    private void updateHdcpValues() {
+    private void updateHdcpValues(ListPreference preference) {
         final String currentValue = SystemProperties.get(HDCP_CHECKING_PROPERTY);
         int index = 1; // Defaults to drm-only. Needs to match with R.array.hdcp_checking_values
         for (int i = 0; i < mListValues.length; i++) {
@@ -101,8 +81,8 @@
                 break;
             }
         }
-        mPreference.setValue(mListValues[index]);
-        mPreference.setSummary(mListSummaries[index]);
+        preference.setValue(mListValues[index]);
+        preference.setSummary(mListSummaries[index]);
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/development/KeepActivitiesPreferenceController.java b/src/com/android/settings/development/KeepActivitiesPreferenceController.java
index aab4d1f..169d39b 100644
--- a/src/com/android/settings/development/KeepActivitiesPreferenceController.java
+++ b/src/com/android/settings/development/KeepActivitiesPreferenceController.java
@@ -39,7 +39,6 @@
     static final int SETTING_VALUE_OFF = 0;
 
     private IActivityManager mActivityManager;
-    private SwitchPreference mPreference;
 
     public KeepActivitiesPreferenceController(Context context) {
         super(context);
@@ -54,7 +53,6 @@
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
 
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
         mActivityManager = getActivityManager();
     }
 
@@ -69,19 +67,14 @@
     public void updateState(Preference preference) {
         final int mode = Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.ALWAYS_FINISH_ACTIVITIES, SETTING_VALUE_OFF);
-        mPreference.setChecked(mode != SETTING_VALUE_OFF);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         writeImmediatelyDestroyActivitiesOptions(false);
-        mPreference.setEnabled(false);
-        mPreference.setChecked(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 
     private void writeImmediatelyDestroyActivitiesOptions(boolean isEnabled) {
diff --git a/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java b/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java
index 51690ff..22e2e2e 100644
--- a/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java
+++ b/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java
@@ -23,14 +23,13 @@
 import android.os.UserManager;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
-public class LocalBackupPasswordPreferenceController extends
-        DeveloperOptionsPreferenceController implements PreferenceControllerMixin {
+public class LocalBackupPasswordPreferenceController extends DeveloperOptionsPreferenceController
+        implements PreferenceControllerMixin {
 
     private static final String LOCAL_BACKUP_PASSWORD = "local_backup_password";
 
diff --git a/src/com/android/settings/development/LocalTerminalPreferenceController.java b/src/com/android/settings/development/LocalTerminalPreferenceController.java
index 17a5785..c782400 100644
--- a/src/com/android/settings/development/LocalTerminalPreferenceController.java
+++ b/src/com/android/settings/development/LocalTerminalPreferenceController.java
@@ -12,9 +12,8 @@
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 import com.android.settingslib.wrapper.PackageManagerWrapper;
 
-public class LocalTerminalPreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        PreferenceControllerMixin {
+public class LocalTerminalPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String ENABLE_TERMINAL_KEY = "enable_terminal";
 
@@ -22,7 +21,6 @@
     static final String TERMINAL_APP_PACKAGE = "com.android.terminal";
 
     private PackageManagerWrapper mPackageManager;
-    private SwitchPreference mPreference;
     private UserManager mUserManager;
 
     public LocalTerminalPreferenceController(Context context) {
@@ -45,7 +43,6 @@
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
 
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
         mPackageManager = getPackageManagerWrapper();
 
         if (isAvailable() && !isEnabled()) {
@@ -66,7 +63,7 @@
     public void updateState(Preference preference) {
         final boolean isTerminalEnabled = mPackageManager.getApplicationEnabledSetting(
                 TERMINAL_APP_PACKAGE) == PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
-        mPreference.setChecked(isTerminalEnabled);
+        ((SwitchPreference) mPreference).setChecked(isTerminalEnabled);
     }
 
     @Override
@@ -78,10 +75,10 @@
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         mPackageManager.setApplicationEnabledSetting(TERMINAL_APP_PACKAGE,
                 PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0 /* flags */);
-        mPreference.setEnabled(false);
-        mPreference.setChecked(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/development/LogPersistPreferenceController.java b/src/com/android/settings/development/LogPersistPreferenceController.java
index a958379..8e99a63 100644
--- a/src/com/android/settings/development/LogPersistPreferenceController.java
+++ b/src/com/android/settings/development/LogPersistPreferenceController.java
@@ -18,20 +18,16 @@
 
 import android.content.Context;
 import android.support.annotation.Nullable;
-import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.development.AbstractLogpersistPreferenceController;
 
-public class LogPersistPreferenceController extends
-        AbstractLogpersistPreferenceController implements PreferenceControllerMixin {
+public class LogPersistPreferenceController extends AbstractLogpersistPreferenceController
+        implements PreferenceControllerMixin {
 
     private final DevelopmentSettingsDashboardFragment mFragment;
-    private ListPreference mPreference;
-
 
     public LogPersistPreferenceController(Context context,
             DevelopmentSettingsDashboardFragment fragment, Lifecycle lifecycle) {
@@ -56,26 +52,14 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public void updateState(Preference preference) {
         updateLogpersistValues();
     }
 
     @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
-    }
-
-    @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         writeLogpersistOption(null /* new value */, true);
-        mPreference.setEnabled(false);
     }
 
     public void onDisableLogPersistDialogConfirmed() {
diff --git a/src/com/android/settings/development/LogdSizePreferenceController.java b/src/com/android/settings/development/LogdSizePreferenceController.java
index 6522800..36f07c8 100644
--- a/src/com/android/settings/development/LogdSizePreferenceController.java
+++ b/src/com/android/settings/development/LogdSizePreferenceController.java
@@ -17,9 +17,7 @@
 package com.android.settings.development;
 
 import android.content.Context;
-import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.AbstractLogdSizePreferenceController;
@@ -27,32 +25,18 @@
 public class LogdSizePreferenceController extends AbstractLogdSizePreferenceController implements
         Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
-    private ListPreference mPreference;
-
     public LogdSizePreferenceController(Context context) {
         super(context);
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public void updateState(Preference preference) {
         updateLogdSizeValues();
     }
 
     @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
-    }
-
-    @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         writeLogdSizeOption(null /* new value */);
-        mPreference.setEnabled(false);
     }
 }
diff --git a/src/com/android/settings/development/MemoryUsagePreferenceController.java b/src/com/android/settings/development/MemoryUsagePreferenceController.java
index 9471b90..4b4fa68 100644
--- a/src/com/android/settings/development/MemoryUsagePreferenceController.java
+++ b/src/com/android/settings/development/MemoryUsagePreferenceController.java
@@ -34,7 +34,6 @@
 
     private static final String MEMORY_USAGE_KEY = "memory";
 
-    private Preference mPreference;
     private ProcStatsData mProcStatsData;
 
     public MemoryUsagePreferenceController(Context context) {
@@ -50,7 +49,6 @@
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
 
-        mPreference = screen.findPreference(getPreferenceKey());
         mProcStatsData = getProcStatsData();
         setDuration();
     }
diff --git a/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java b/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java
index eafcb5c..e90deb1 100644
--- a/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java
+++ b/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java
@@ -21,7 +21,6 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -37,8 +36,6 @@
     @VisibleForTesting
     static final int SETTING_VALUE_OFF = 0;
 
-    private SwitchPreference mPreference;
-
     public MobileDataAlwaysOnPreferenceController(Context context) {
         super(context);
     }
@@ -49,13 +46,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.MOBILE_DATA_ALWAYS_ON,
@@ -68,19 +58,14 @@
         final int mobileDataAlwaysOnMode = Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.MOBILE_DATA_ALWAYS_ON, SETTING_VALUE_ON);
 
-        mPreference.setChecked(mobileDataAlwaysOnMode != SETTING_VALUE_OFF);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(mobileDataAlwaysOnMode != SETTING_VALUE_OFF);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.MOBILE_DATA_ALWAYS_ON,
                 SETTING_VALUE_OFF);
-        mPreference.setEnabled(false);
-        mPreference.setChecked(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/MockLocationAppPreferenceController.java b/src/com/android/settings/development/MockLocationAppPreferenceController.java
index 8305a9d..3e342c1 100644
--- a/src/com/android/settings/development/MockLocationAppPreferenceController.java
+++ b/src/com/android/settings/development/MockLocationAppPreferenceController.java
@@ -27,7 +27,6 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 
 import com.android.settings.R;
@@ -37,9 +36,8 @@
 
 import java.util.List;
 
-public class MockLocationAppPreferenceController extends
-        DeveloperOptionsPreferenceController implements PreferenceControllerMixin,
-        OnActivityResultListener {
+public class MockLocationAppPreferenceController extends DeveloperOptionsPreferenceController
+        implements PreferenceControllerMixin, OnActivityResultListener {
 
     private static final String MOCK_LOCATION_APP_KEY = "mock_location_app";
     private static final int[] MOCK_LOCATION_APP_OPS = new int[]{AppOpsManager.OP_MOCK_LOCATION};
@@ -47,7 +45,6 @@
     private final DevelopmentSettingsDashboardFragment mFragment;
     private final AppOpsManager mAppsOpsManager;
     private final PackageManagerWrapper mPackageManager;
-    private Preference mPreference;
 
     public MockLocationAppPreferenceController(Context context,
             DevelopmentSettingsDashboardFragment fragment) {
@@ -64,13 +61,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean handlePreferenceTreeClick(Preference preference) {
         if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
             return false;
@@ -97,16 +87,6 @@
         return true;
     }
 
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchDisabled() {
-        mPreference.setEnabled(false);
-    }
-
     private void updateMockLocation() {
         final String mockLocationApp = getCurrentMockLocationApp();
 
diff --git a/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java b/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java
index 15a1532..e451017 100644
--- a/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java
+++ b/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java
@@ -22,7 +22,6 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -34,8 +33,6 @@
     private static final String SHOW_NOTIFICATION_CHANNEL_WARNINGS_KEY =
             "show_notification_channel_warnings";
 
-    private SwitchPreference mPreference;
-
     @VisibleForTesting
     final static int SETTING_VALUE_ON = 1;
     @VisibleForTesting
@@ -56,13 +53,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         Settings.Global.putInt(mContext.getContentResolver(),
@@ -76,20 +66,15 @@
         final int defaultWarningEnabled = isDebuggable() ? DEBUGGING_ENABLED : DEBUGGING_DISABLED;
         final int mode = Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, defaultWarningEnabled);
-        mPreference.setChecked(mode != SETTING_VALUE_OFF);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         Settings.Global.putInt(mContext.getContentResolver(),
                 Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, SETTING_VALUE_OFF);
-        mPreference.setEnabled(false);
-        mPreference.setChecked(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/development/OemUnlockPreferenceController.java b/src/com/android/settings/development/OemUnlockPreferenceController.java
index c6ba60c..95fe9b5 100644
--- a/src/com/android/settings/development/OemUnlockPreferenceController.java
+++ b/src/com/android/settings/development/OemUnlockPreferenceController.java
@@ -129,11 +129,6 @@
         handleDeveloperOptionsToggled();
     }
 
-    @Override
-    protected void onDeveloperOptionsSwitchDisabled() {
-        handleDeveloperOptionsToggled();
-    }
-
     public void onOemUnlockConfirmed() {
         mOemLockManager.setOemUnlockAllowedByUser(true);
     }
diff --git a/src/com/android/settings/development/PictureColorModePreferenceController.java b/src/com/android/settings/development/PictureColorModePreferenceController.java
index 8fa94af..d6dd363 100644
--- a/src/com/android/settings/development/PictureColorModePreferenceController.java
+++ b/src/com/android/settings/development/PictureColorModePreferenceController.java
@@ -27,9 +27,8 @@
 import com.android.settingslib.core.lifecycle.events.OnResume;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
-public class PictureColorModePreferenceController extends
-        DeveloperOptionsPreferenceController implements
-        LifecycleObserver, OnResume, OnPause, PreferenceControllerMixin {
+public class PictureColorModePreferenceController extends DeveloperOptionsPreferenceController
+        implements LifecycleObserver, OnResume, OnPause, PreferenceControllerMixin {
 
     private static final String KEY_COLOR_MODE = "picture_color_mode";
 
@@ -78,16 +77,6 @@
         }
         mPreference.stopListening();
     }
-    
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchDisabled() {
-        mPreference.setEnabled(false);
-    }
 
     @VisibleForTesting
     boolean isWideColorGamut() {
diff --git a/src/com/android/settings/development/PointerLocationPreferenceController.java b/src/com/android/settings/development/PointerLocationPreferenceController.java
index 98298af..18bc086 100644
--- a/src/com/android/settings/development/PointerLocationPreferenceController.java
+++ b/src/com/android/settings/development/PointerLocationPreferenceController.java
@@ -21,7 +21,6 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -36,8 +35,6 @@
     @VisibleForTesting
     static final int SETTING_VALUE_OFF = 0;
 
-    private SwitchPreference mPreference;
-
     public PointerLocationPreferenceController(Context context) {
         super(context);
     }
@@ -48,13 +45,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         Settings.System.putInt(mContext.getContentResolver(),
@@ -66,19 +56,14 @@
     public void updateState(Preference preference) {
         final int pointerLocationMode = Settings.System.getInt(mContext.getContentResolver(),
                 Settings.System.POINTER_LOCATION, SETTING_VALUE_OFF);
-        mPreference.setChecked(pointerLocationMode != SETTING_VALUE_OFF);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(pointerLocationMode != SETTING_VALUE_OFF);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         Settings.System.putInt(mContext.getContentResolver(), Settings.System.POINTER_LOCATION,
                 SETTING_VALUE_OFF);
-        mPreference.setChecked(false);
-        mPreference.setEnabled(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java b/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java
index d1f4484..a8ee9ae 100644
--- a/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java
+++ b/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java
@@ -20,7 +20,6 @@
 import android.os.SystemProperties;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.view.ThreadedRenderer;
 
@@ -29,15 +28,13 @@
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 import com.android.settingslib.development.SystemPropPoker;
 
-public class ProfileGpuRenderingPreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        PreferenceControllerMixin {
+public class ProfileGpuRenderingPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String TRACK_FRAME_TIME_KEY = "track_frame_time";
 
     private final String[] mListValues;
     private final String[] mListSummaries;
-    private ListPreference mPreference;
 
     public ProfileGpuRenderingPreferenceController(Context context) {
         super(context);
@@ -52,13 +49,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         writeTrackFrameTimeOptions(newValue);
         updateTrackFrameTimeOptions();
@@ -70,16 +60,6 @@
         updateTrackFrameTimeOptions();
     }
 
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchDisabled() {
-        mPreference.setEnabled(false);
-    }
-
     private void writeTrackFrameTimeOptions(Object newValue) {
         SystemProperties.set(ThreadedRenderer.PROFILE_PROPERTY,
                 newValue == null ? "" : newValue.toString());
@@ -96,7 +76,8 @@
                 break;
             }
         }
-        mPreference.setValue(mListValues[index]);
-        mPreference.setSummary(mListSummaries[index]);
+        final ListPreference listPreference = (ListPreference) mPreference;
+        listPreference.setValue(mListValues[index]);
+        listPreference.setSummary(mListSummaries[index]);
     }
 }
diff --git a/src/com/android/settings/development/ResizableActivityPreferenceController.java b/src/com/android/settings/development/ResizableActivityPreferenceController.java
index d192e11..4748cdb 100644
--- a/src/com/android/settings/development/ResizableActivityPreferenceController.java
+++ b/src/com/android/settings/development/ResizableActivityPreferenceController.java
@@ -21,14 +21,12 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
-public class ResizableActivityPreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        PreferenceControllerMixin {
+public class ResizableActivityPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String FORCE_RESIZABLE_KEY = "force_resizable_activities";
 
@@ -37,8 +35,6 @@
     @VisibleForTesting
     final static int SETTING_VALUE_OFF = 0;
 
-    private SwitchPreference mPreference;
-
     public ResizableActivityPreferenceController(Context context) {
         super(context);
     }
@@ -49,13 +45,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         Settings.Global.putInt(mContext.getContentResolver(),
@@ -68,19 +57,14 @@
     public void updateState(Preference preference) {
         final int mode = Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES, SETTING_VALUE_OFF);
-        mPreference.setChecked(mode != SETTING_VALUE_OFF);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         Settings.Global.putInt(mContext.getContentResolver(),
                 Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES, SETTING_VALUE_OFF);
-        mPreference.setChecked(false);
-        mPreference.setEnabled(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/RtlLayoutPreferenceController.java b/src/com/android/settings/development/RtlLayoutPreferenceController.java
index 6729e76..7d6100c 100644
--- a/src/com/android/settings/development/RtlLayoutPreferenceController.java
+++ b/src/com/android/settings/development/RtlLayoutPreferenceController.java
@@ -22,7 +22,6 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.internal.app.LocalePicker;
 import com.android.settings.core.PreferenceControllerMixin;
@@ -38,8 +37,6 @@
     @VisibleForTesting
     static final int SETTING_VALUE_OFF = 0;
 
-    private SwitchPreference mPreference;
-
     public RtlLayoutPreferenceController(Context context) {
         super(context);
     }
@@ -50,13 +47,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         writeToForceRtlLayoutSetting(isEnabled);
@@ -68,20 +58,15 @@
     public void updateState(Preference preference) {
         int rtlLayoutMode = Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.DEVELOPMENT_FORCE_RTL, SETTING_VALUE_OFF);
-        mPreference.setChecked(rtlLayoutMode != SETTING_VALUE_OFF);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(rtlLayoutMode != SETTING_VALUE_OFF);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         writeToForceRtlLayoutSetting(false);
         updateLocales();
-        mPreference.setChecked(false);
-        mPreference.setEnabled(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/development/SecondaryDisplayPreferenceController.java b/src/com/android/settings/development/SecondaryDisplayPreferenceController.java
index 0e34148..24b44e2 100644
--- a/src/com/android/settings/development/SecondaryDisplayPreferenceController.java
+++ b/src/com/android/settings/development/SecondaryDisplayPreferenceController.java
@@ -20,22 +20,19 @@
 import android.provider.Settings;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
-public class SecondaryDisplayPreferenceController extends
-        DeveloperOptionsPreferenceController implements
-        Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+public class SecondaryDisplayPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String OVERLAY_DISPLAY_DEVICES_KEY = "overlay_display_devices";
 
     private final String[] mListValues;
     private final String[] mListSummaries;
-    private ListPreference mPreference;
 
     public SecondaryDisplayPreferenceController(Context context) {
         super(context);
@@ -51,13 +48,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         writeSecondaryDisplayDevicesOption(newValue.toString());
         return true;
@@ -69,14 +59,9 @@
     }
 
     @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
-    }
-
-    @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         writeSecondaryDisplayDevicesOption(null);
-        mPreference.setEnabled(false);
     }
 
     private void updateSecondaryDisplayDevicesOptions() {
@@ -89,8 +74,9 @@
                 break;
             }
         }
-        mPreference.setValue(mListValues[index]);
-        mPreference.setSummary(mListSummaries[index]);
+        final ListPreference listPreference = (ListPreference) mPreference;
+        listPreference.setValue(mListValues[index]);
+        listPreference.setSummary(mListSummaries[index]);
     }
 
     private void writeSecondaryDisplayDevicesOption(String newValue) {
diff --git a/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java b/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java
new file mode 100644
index 0000000..38bfc98
--- /dev/null
+++ b/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java
@@ -0,0 +1,65 @@
+/*
+ * 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 android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+/**
+ * Base controller for Switch preference that maps to a specific value in Settings.Secure.
+ */
+public abstract class SecureSettingSwitchPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final int SETTING_VALUE_OFF = 0;
+    private static final int SETTING_VALUE_ON = 1;
+
+    private final String mSettingsKey;
+
+    public SecureSettingSwitchPreferenceController(Context context, String secureSettingsKey) {
+        super(context);
+        mSettingsKey = secureSettingsKey;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        Settings.Secure.putInt(mContext.getContentResolver(), mSettingsKey,
+            isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final int mode = Settings.Secure.getInt(
+            mContext.getContentResolver(), mSettingsKey, SETTING_VALUE_OFF);
+        ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
+        Settings.Secure.putInt(mContext.getContentResolver(), mSettingsKey, SETTING_VALUE_OFF);
+        ((SwitchPreference) mPreference).setChecked(false);
+    }
+}
diff --git a/src/com/android/settings/development/SelectDebugAppPreferenceController.java b/src/com/android/settings/development/SelectDebugAppPreferenceController.java
index 1037f91..9ea90be 100644
--- a/src/com/android/settings/development/SelectDebugAppPreferenceController.java
+++ b/src/com/android/settings/development/SelectDebugAppPreferenceController.java
@@ -27,24 +27,20 @@
 import android.provider.Settings;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 import com.android.settingslib.wrapper.PackageManagerWrapper;
 
-public class SelectDebugAppPreferenceController extends
-        DeveloperOptionsPreferenceController implements PreferenceControllerMixin,
-        OnActivityResultListener {
+public class SelectDebugAppPreferenceController extends DeveloperOptionsPreferenceController
+        implements PreferenceControllerMixin, OnActivityResultListener {
 
     private static final String DEBUG_APP_KEY = "debug_app";
 
     private final DevelopmentSettingsDashboardFragment mFragment;
     private final PackageManagerWrapper mPackageManager;
 
-    private Preference mPreference;
-
     public SelectDebugAppPreferenceController(Context context,
             DevelopmentSettingsDashboardFragment fragment) {
         super(context);
@@ -58,13 +54,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean handlePreferenceTreeClick(Preference preference) {
         if (DEBUG_APP_KEY.equals(preference.getKey())) {
             final Intent intent = getActivityStartIntent();
@@ -92,13 +81,8 @@
     }
 
     @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
-    }
-
-    @Override
     protected void onDeveloperOptionsSwitchDisabled() {
-        mPreference.setEnabled(false);
+        super.onDeveloperOptionsSwitchDisabled();
         mPreference.setSummary(mContext.getResources().getString(R.string.debug_app_not_set));
     }
 
diff --git a/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java b/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java
index e1f9b32..e18943b 100644
--- a/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java
+++ b/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java
@@ -21,14 +21,12 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
-public class ShowFirstCrashDialogPreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        PreferenceControllerMixin {
+public class ShowFirstCrashDialogPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String SHOW_FIRST_CRASH_DIALOG_KEY = "show_first_crash_dialog";
 
@@ -37,8 +35,6 @@
     @VisibleForTesting
     static final int SETTING_VALUE_OFF = 0;
 
-    private SwitchPreference mPreference;
-
     public ShowFirstCrashDialogPreferenceController(Context context) {
         super(context);
     }
@@ -57,13 +53,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         Settings.Secure.putInt(mContext.getContentResolver(),
@@ -76,19 +65,14 @@
     public void updateState(Preference preference) {
         final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
                 Settings.Secure.SHOW_FIRST_CRASH_DIALOG_DEV_OPTION, SETTING_VALUE_OFF);
-        mPreference.setChecked(mode != SETTING_VALUE_OFF);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         Settings.Secure.putInt(mContext.getContentResolver(),
                 Settings.Secure.SHOW_FIRST_CRASH_DIALOG_DEV_OPTION, SETTING_VALUE_OFF);
-        mPreference.setEnabled(false);
-        mPreference.setChecked(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java
index ad4a44e..e4a3dca 100644
--- a/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java
+++ b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java
@@ -20,7 +20,6 @@
 import android.os.SystemProperties;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 import android.view.View;
 
 import com.android.settings.core.PreferenceControllerMixin;
@@ -32,8 +31,6 @@
 
     private static final String DEBUG_LAYOUT_KEY = "debug_layout";
 
-    private SwitchPreference mPreference;
-
     public ShowLayoutBoundsPreferenceController(Context context) {
         super(context);
     }
@@ -44,13 +41,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         SystemProperties.set(View.DEBUG_LAYOUT_PROPERTY,
@@ -63,18 +53,13 @@
     public void updateState(Preference preference) {
         final boolean isEnabled = SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY,
                 false /* default */);
-        mPreference.setChecked(isEnabled);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(isEnabled);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         SystemProperties.set(View.DEBUG_LAYOUT_PROPERTY, Boolean.toString(false));
-        mPreference.setChecked(false);
-        mPreference.setEnabled(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java b/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java
index 1202759..fd0b9a5 100644
--- a/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java
+++ b/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java
@@ -24,7 +24,6 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -46,7 +45,6 @@
     private static final String SURFACE_COMPOSER_INTERFACE_KEY = "android.ui.ISurfaceComposer";
 
     private final IBinder mSurfaceFlinger;
-    private SwitchPreference mPreference;
 
     public ShowSurfaceUpdatesPreferenceController(Context context) {
         super(context);
@@ -59,13 +57,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         writeShowUpdatesSetting(isEnabled);
@@ -78,19 +69,15 @@
     }
 
     @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
-    }
-
-    @Override
     protected void onDeveloperOptionsSwitchDisabled() {
-        if (mPreference.isChecked()) {
+        super.onDeveloperOptionsSwitchDisabled();
+        final SwitchPreference preference = (SwitchPreference) mPreference;
+        if (preference.isChecked()) {
             // Writing false to the preference when the setting is already off will have a
             // side effect of turning on the preference that we wish to avoid
             writeShowUpdatesSetting(false);
-            mPreference.setChecked(false);
+            preference.setChecked(false);
         }
-        mPreference.setEnabled(false);
     }
 
     @VisibleForTesting
@@ -105,7 +92,7 @@
                 @SuppressWarnings("unused") final int showCpu = reply.readInt();
                 @SuppressWarnings("unused") final int enableGL = reply.readInt();
                 final int showUpdates = reply.readInt();
-                mPreference.setChecked(showUpdates != SETTING_VALUE_OFF);
+                ((SwitchPreference) mPreference).setChecked(showUpdates != SETTING_VALUE_OFF);
                 reply.recycle();
                 data.recycle();
             }
diff --git a/src/com/android/settings/development/ShowTapsPreferenceController.java b/src/com/android/settings/development/ShowTapsPreferenceController.java
index ce7d4bd..818d048 100644
--- a/src/com/android/settings/development/ShowTapsPreferenceController.java
+++ b/src/com/android/settings/development/ShowTapsPreferenceController.java
@@ -21,7 +21,6 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -36,8 +35,6 @@
     @VisibleForTesting
     static final int SETTING_VALUE_OFF = 0;
 
-    private SwitchPreference mPreference;
-
     public ShowTapsPreferenceController(Context context) {
         super(context);
     }
@@ -48,13 +45,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         Settings.System.putInt(mContext.getContentResolver(),
@@ -66,19 +56,14 @@
     public void updateState(Preference preference) {
         int showTapsMode = Settings.System.getInt(mContext.getContentResolver(),
                 Settings.System.SHOW_TOUCHES, SETTING_VALUE_OFF);
-        mPreference.setChecked(showTapsMode != SETTING_VALUE_OFF);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(showTapsMode != SETTING_VALUE_OFF);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         Settings.System.putInt(mContext.getContentResolver(), Settings.System.SHOW_TOUCHES,
                 SETTING_VALUE_OFF);
-        mPreference.setChecked(false);
-        mPreference.setEnabled(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/SimulateColorSpacePreferenceController.java b/src/com/android/settings/development/SimulateColorSpacePreferenceController.java
index 985e878..aa3dcde 100644
--- a/src/com/android/settings/development/SimulateColorSpacePreferenceController.java
+++ b/src/com/android/settings/development/SimulateColorSpacePreferenceController.java
@@ -23,16 +23,14 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 import android.view.accessibility.AccessibilityManager;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
-public class SimulateColorSpacePreferenceController extends
-        DeveloperOptionsPreferenceController implements
-        Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+public class SimulateColorSpacePreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String SIMULATE_COLOR_SPACE = "simulate_color_space";
 
@@ -41,8 +39,6 @@
     @VisibleForTesting
     static final int SETTING_VALUE_ON = 1;
 
-    private ListPreference mPreference;
-
     public SimulateColorSpacePreferenceController(Context context) {
         super(context);
     }
@@ -53,13 +49,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         writeSimulateColorSpace(newValue);
         return true;
@@ -71,16 +60,11 @@
     }
 
     @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
-    }
-
-    @Override
     public void onDeveloperOptionsDisabled() {
+        super.onDeveloperOptionsDisabled();
         if (usingDevelopmentColorSpace()) {
             writeSimulateColorSpace(-1);
         }
-        mPreference.setEnabled(false);
     }
 
     private void updateSimulateColorSpace() {
@@ -88,22 +72,23 @@
         final boolean enabled = Settings.Secure.getInt(
                 cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, SETTING_VALUE_OFF)
                 != SETTING_VALUE_OFF;
+        final ListPreference listPreference = (ListPreference) mPreference;
         if (enabled) {
             final String mode = Integer.toString(Settings.Secure.getInt(
                     cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER,
                     AccessibilityManager.DALTONIZER_DISABLED));
-            mPreference.setValue(mode);
-            final int index = mPreference.findIndexOfValue(mode);
+            listPreference.setValue(mode);
+            final int index = listPreference.findIndexOfValue(mode);
             if (index < 0) {
                 final Resources res = mContext.getResources();
                 // We're using a mode controlled by accessibility preferences.
-                mPreference.setSummary(res.getString(R.string.daltonizer_type_overridden,
+                listPreference.setSummary(res.getString(R.string.daltonizer_type_overridden,
                         res.getString(R.string.accessibility_display_daltonizer_preference_title)));
             } else {
-                mPreference.setSummary("%s");
+                listPreference.setSummary("%s");
             }
         } else {
-            mPreference.setValue(
+            listPreference.setValue(
                     Integer.toString(AccessibilityManager.DALTONIZER_DISABLED));
         }
     }
@@ -134,7 +119,7 @@
             final String mode = Integer.toString(Settings.Secure.getInt(
                     cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER,
                     AccessibilityManager.DALTONIZER_DISABLED));
-            final int index = mPreference.findIndexOfValue(mode);
+            final int index = ((ListPreference) mPreference).findIndexOfValue(mode);
             if (index >= 0) {
                 // We're using a mode controlled by developer preferences.
                 return true;
diff --git a/src/com/android/settings/development/StayAwakePreferenceController.java b/src/com/android/settings/development/StayAwakePreferenceController.java
index c2e8a17..cb8bd88 100644
--- a/src/com/android/settings/development/StayAwakePreferenceController.java
+++ b/src/com/android/settings/development/StayAwakePreferenceController.java
@@ -37,9 +37,9 @@
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
 
-public class StayAwakePreferenceController extends DeveloperOptionsPreferenceController implements
-        Preference.OnPreferenceChangeListener, LifecycleObserver,
-        OnResume, OnPause, PreferenceControllerMixin {
+public class StayAwakePreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, LifecycleObserver,  OnResume, OnPause,
+        PreferenceControllerMixin {
 
     private static final String TAG = "StayAwakeCtrl";
     private static final String PREFERENCE_KEY = "keep_screen_on";
@@ -116,16 +116,11 @@
     }
 
     @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
-    }
-
-    @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         Settings.Global.putInt(mContext.getContentResolver(),
                 Settings.Global.STAY_ON_WHILE_PLUGGED_IN, SETTING_VALUE_OFF);
         mPreference.setChecked(false);
-        mPreference.setEnabled(false);
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/development/StrictModePreferenceController.java b/src/com/android/settings/development/StrictModePreferenceController.java
index 7a4a069..c2e3248 100644
--- a/src/com/android/settings/development/StrictModePreferenceController.java
+++ b/src/com/android/settings/development/StrictModePreferenceController.java
@@ -24,7 +24,6 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 import android.view.IWindowManager;
 
 import com.android.settings.core.PreferenceControllerMixin;
@@ -43,8 +42,6 @@
 
     private final IWindowManager mWindowManager;
 
-    private SwitchPreference mPreference;
-
     public StrictModePreferenceController(Context context) {
         super(context);
 
@@ -58,13 +55,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         writeStrictModeVisualOptions(isEnabled);
@@ -73,19 +63,14 @@
 
     @Override
     public void updateState(Preference preference) {
-        mPreference.setChecked(isStrictModeEnabled());
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(isStrictModeEnabled());
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         writeStrictModeVisualOptions(false);
-        mPreference.setEnabled(false);
-        mPreference.setChecked(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 
     private boolean isStrictModeEnabled() {
diff --git a/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java b/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java
new file mode 100644
index 0000000..539319d
--- /dev/null
+++ b/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java
@@ -0,0 +1,65 @@
+/*
+ * 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 android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+/**
+ * Base controller for Switch preference that maps to a specific value in Settings.System.
+ */
+public abstract class SystemSettingSwitchPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final int SETTING_VALUE_OFF = 0;
+    private static final int SETTING_VALUE_ON = 1;
+
+    private final String mSettingsKey;
+
+    public SystemSettingSwitchPreferenceController(Context context, String systemSettingsKey) {
+        super(context);
+        mSettingsKey = systemSettingsKey;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        Settings.System.putInt(mContext.getContentResolver(), mSettingsKey,
+            isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final int mode = Settings.System.getInt(
+            mContext.getContentResolver(), mSettingsKey, SETTING_VALUE_OFF);
+        ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
+        Settings.System.putInt(mContext.getContentResolver(), mSettingsKey, SETTING_VALUE_OFF);
+        ((SwitchPreference) mPreference).setChecked(false);
+    }
+}
diff --git a/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java b/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java
index ed14382..22fbe5b 100644
--- a/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java
+++ b/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java
@@ -21,14 +21,12 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
-public class TetheringHardwareAccelPreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        PreferenceControllerMixin {
+public class TetheringHardwareAccelPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String TETHERING_HARDWARE_OFFLOAD = "tethering_hardware_offload";
 
@@ -39,8 +37,6 @@
     @VisibleForTesting
     static final int SETTING_VALUE_OFF = 1;
 
-    private SwitchPreference mPreference;
-
     public TetheringHardwareAccelPreferenceController(Context context) {
         super(context);
     }
@@ -51,13 +47,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         Settings.Global.putInt(mContext.getContentResolver(),
@@ -71,19 +60,14 @@
         final int tetheringMode = Settings.Global.getInt(
                 mContext.getContentResolver(),
                 Settings.Global.TETHER_OFFLOAD_DISABLED, 0 /* default */);
-        mPreference.setChecked(tetheringMode != SETTING_VALUE_OFF);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(tetheringMode != SETTING_VALUE_OFF);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         Settings.Global.putInt(mContext.getContentResolver(),
                 Settings.Global.TETHER_OFFLOAD_DISABLED, SETTING_VALUE_OFF);
-        mPreference.setEnabled(false);
-        mPreference.setChecked(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java b/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java
index dceb712..d8e7250 100644
--- a/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java
+++ b/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java
@@ -22,7 +22,6 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 import android.view.IWindowManager;
 
 import com.android.settings.R;
@@ -43,7 +42,6 @@
     private final IWindowManager mWindowManager;
     private final String[] mListValues;
     private final String[] mListSummaries;
-    private ListPreference mPreference;
 
     public TransitionAnimationScalePreferenceController(Context context) {
         super(context);
@@ -62,13 +60,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         writeAnimationScaleOption(newValue);
         return true;
@@ -80,14 +71,9 @@
     }
 
     @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
-    }
-
-    @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         writeAnimationScaleOption(null);
-        mPreference.setEnabled(false);
     }
 
     private void writeAnimationScaleOption(Object newValue) {
@@ -112,8 +98,9 @@
                     break;
                 }
             }
-            mPreference.setValue(mListValues[index]);
-            mPreference.setSummary(mListSummaries[index]);
+            final ListPreference listPreference = (ListPreference) mPreference;
+            listPreference.setValue(mListValues[index]);
+            listPreference.setSummary(mListSummaries[index]);
         } catch (RemoteException e) {
             // intentional no-op
         }
diff --git a/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java b/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java
index 1e5febd..067f1c7 100644
--- a/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java
+++ b/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java
@@ -21,7 +21,6 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -36,8 +35,6 @@
     @VisibleForTesting
     static final int SETTING_VALUE_OFF = 0;
 
-    private SwitchPreference mPreference;
-
     public UsbAudioRoutingPreferenceController(Context context) {
         super(context);
     }
@@ -48,13 +45,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         Settings.Secure.putInt(mContext.getContentResolver(),
@@ -67,19 +57,14 @@
     public void updateState(Preference preference) {
         final int usbAudioRoutingMode = Settings.Secure.getInt(mContext.getContentResolver(),
                 Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, SETTING_VALUE_OFF);
-        mPreference.setChecked(usbAudioRoutingMode != SETTING_VALUE_OFF);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(usbAudioRoutingMode != SETTING_VALUE_OFF);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         Settings.Secure.putInt(mContext.getContentResolver(),
                 Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, SETTING_VALUE_OFF);
-        mPreference.setChecked(false);
-        mPreference.setEnabled(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java
index f01da0d..064d8f6 100644
--- a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java
+++ b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java
@@ -24,7 +24,6 @@
 import android.provider.Settings;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.RestrictedLockUtils;
@@ -38,14 +37,12 @@
 /**
  * Controller to manage the state of "Verify apps over USB" toggle.
  */
-public class VerifyAppsOverUsbPreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        AdbOnChangeListener, PreferenceControllerMixin {
+public class VerifyAppsOverUsbPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, AdbOnChangeListener,
+        PreferenceControllerMixin {
     private static final String VERIFY_APPS_OVER_USB_KEY = "verify_apps_over_usb";
     private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive";
 
-    private RestrictedSwitchPreference mPreference;
-
     @VisibleForTesting
     static final int SETTING_VALUE_ON = 1;
     @VisibleForTesting
@@ -88,12 +85,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        mPreference = (RestrictedSwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         Settings.Global.putInt(mContext.getContentResolver(),
@@ -104,26 +95,28 @@
 
     @Override
     public void updateState(Preference preference) {
+        final RestrictedSwitchPreference restrictedPreference =
+            (RestrictedSwitchPreference) preference;
         if (!shouldBeEnabled()) {
-            mPreference.setChecked(false);
-            mPreference.setDisabledByAdmin(null);
-            mPreference.setEnabled(false);
+            restrictedPreference.setChecked(false);
+            restrictedPreference.setDisabledByAdmin(null);
+            restrictedPreference.setEnabled(false);
             return;
         }
 
         final EnforcedAdmin enforcingAdmin = mRestrictedLockUtils.checkIfRestrictionEnforced(
                 mContext, UserManager.ENSURE_VERIFY_APPS, UserHandle.myUserId());
         if (enforcingAdmin != null) {
-            mPreference.setChecked(true);
-            mPreference.setDisabledByAdmin(enforcingAdmin);
+            restrictedPreference.setChecked(true);
+            restrictedPreference.setDisabledByAdmin(enforcingAdmin);
             return;
         }
 
-        mPreference.setEnabled(true);
+        restrictedPreference.setEnabled(true);
         final boolean checked = Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, SETTING_VALUE_ON)
                 != SETTING_VALUE_OFF;
-        mPreference.setChecked(checked);
+        restrictedPreference.setChecked(checked);
     }
 
     @Override
@@ -135,15 +128,10 @@
 
     @Override
     protected void onDeveloperOptionsSwitchEnabled() {
+        super.onDeveloperOptionsSwitchEnabled();
         updateState(mPreference);
     }
 
-    @Override
-    protected void onDeveloperOptionsSwitchDisabled() {
-        // intentional no-op
-        // We can rely on onAdbSettingChanged() to update this controller.
-    }
-
     /**
      * Checks whether the toggle should be enabled depending on whether verify apps over USB is
      * possible currently. If ADB is disabled or if package verifier does not exist, the toggle
diff --git a/src/com/android/settings/development/WaitForDebuggerPreferenceController.java b/src/com/android/settings/development/WaitForDebuggerPreferenceController.java
index ec259be..e5f5e9f 100644
--- a/src/com/android/settings/development/WaitForDebuggerPreferenceController.java
+++ b/src/com/android/settings/development/WaitForDebuggerPreferenceController.java
@@ -29,15 +29,14 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
-public class WaitForDebuggerPreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        PreferenceControllerMixin, OnActivityResultListener {
+public class WaitForDebuggerPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin,
+        OnActivityResultListener {
 
     private static final String WAIT_FOR_DEBUGGER_KEY = "wait_for_debugger";
 
@@ -46,8 +45,6 @@
     @VisibleForTesting
     static final int SETTING_VALUE_OFF = 0;
 
-    private SwitchPreference mPreference;
-
     public WaitForDebuggerPreferenceController(Context context) {
         super(context);
     }
@@ -58,13 +55,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean debuggerEnabled = (Boolean) newValue;
         final String debugApp = Settings.Global.getString(
@@ -75,13 +65,8 @@
 
     @Override
     public void updateState(Preference preference) {
-        final String debugApp = Settings.Global.getString(
-                mContext.getContentResolver(), Settings.Global.DEBUG_APP);
-        final boolean debuggerEnabled = Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.WAIT_FOR_DEBUGGER, SETTING_VALUE_OFF) != SETTING_VALUE_OFF;
-        writeDebuggerAppOptions(debugApp, debuggerEnabled, true /* persistent */);
-        mPreference.setChecked(debuggerEnabled);
-        mPreference.setEnabled(!TextUtils.isEmpty(debugApp));
+        updateState(mPreference, Settings.Global.getString(
+            mContext.getContentResolver(), Settings.Global.DEBUG_APP));
     }
 
     @Override
@@ -89,26 +74,25 @@
         if (requestCode != REQUEST_CODE_DEBUG_APP || resultCode != Activity.RESULT_OK) {
             return false;
         }
-        final boolean debuggerEnabled = Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.WAIT_FOR_DEBUGGER, SETTING_VALUE_OFF) != SETTING_VALUE_OFF;
-        final String debugApp = data.getAction();
-        writeDebuggerAppOptions(debugApp, debuggerEnabled, true /* persistent */);
-        mPreference.setChecked(debuggerEnabled);
-        mPreference.setEnabled(!TextUtils.isEmpty(debugApp));
+        updateState(mPreference, data.getAction());
         return true;
     }
 
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+    private void updateState(Preference preference, String debugApp) {
+        final SwitchPreference switchPreference = (SwitchPreference) preference;
+        final boolean debuggerEnabled = Settings.Global.getInt(mContext.getContentResolver(),
+            Settings.Global.WAIT_FOR_DEBUGGER, SETTING_VALUE_OFF) != SETTING_VALUE_OFF;
+        writeDebuggerAppOptions(debugApp, debuggerEnabled, true /* persistent */);
+        switchPreference.setChecked(debuggerEnabled);
+        switchPreference.setEnabled(!TextUtils.isEmpty(debugApp));
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         writeDebuggerAppOptions(null /* package name */,
                 false /* waitForDebugger */, false /* persistent */);
-        mPreference.setChecked(false);
-        mPreference.setEnabled(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/development/WebViewAppPreferenceController.java b/src/com/android/settings/development/WebViewAppPreferenceController.java
index 4f35910..db891b2 100644
--- a/src/com/android/settings/development/WebViewAppPreferenceController.java
+++ b/src/com/android/settings/development/WebViewAppPreferenceController.java
@@ -20,7 +20,6 @@
 import android.content.pm.PackageInfo;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -31,8 +30,8 @@
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 import com.android.settingslib.wrapper.PackageManagerWrapper;
 
-public class WebViewAppPreferenceController extends
-        DeveloperOptionsPreferenceController implements PreferenceControllerMixin {
+public class WebViewAppPreferenceController extends DeveloperOptionsPreferenceController implements
+        PreferenceControllerMixin {
 
     private static final String TAG = "WebViewAppPrefCtrl";
     private static final String WEBVIEW_APP_KEY = "select_webview_provider";
@@ -40,8 +39,6 @@
     private final PackageManagerWrapper mPackageManager;
     private final WebViewUpdateServiceWrapper mWebViewUpdateServiceWrapper;
 
-    private Preference mPreference;
-
     public WebViewAppPreferenceController(Context context) {
         super(context);
 
@@ -55,13 +52,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public void updateState(Preference preference) {
         final CharSequence defaultAppLabel = getDefaultAppLabel();
         if (!TextUtils.isEmpty(defaultAppLabel)) {
@@ -72,16 +62,6 @@
         }
     }
 
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchDisabled() {
-        mPreference.setEnabled(false);
-    }
-
     @VisibleForTesting
     DefaultAppInfo getDefaultAppInfo() {
         final PackageInfo currentPackage = mWebViewUpdateServiceWrapper.getCurrentWebViewPackage();
diff --git a/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java b/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java
index eae2355..e07c328 100644
--- a/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java
+++ b/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java
@@ -21,7 +21,6 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
@@ -39,8 +38,6 @@
     @VisibleForTesting
     static final int SETTING_VALUE_OFF = 0;
 
-    private SwitchPreference mPreference;
-
     public WifiConnectedMacRandomizationPreferenceController(Context context) {
         super(context);
     }
@@ -57,12 +54,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         Settings.Global.putInt(mContext.getContentResolver(),
@@ -75,19 +66,14 @@
     public void updateState(Preference preference) {
         final int enableMode = Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.WIFI_CONNECTED_MAC_RANDOMIZATION_ENABLED, SETTING_VALUE_OFF);
-        mPreference.setChecked(enableMode != SETTING_VALUE_OFF);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(enableMode != SETTING_VALUE_OFF);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         Settings.Global.putInt(mContext.getContentResolver(),
                 Settings.Global.WIFI_CONNECTED_MAC_RANDOMIZATION_ENABLED, SETTING_VALUE_OFF);
-        mPreference.setChecked(false);
-        mPreference.setEnabled(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java b/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java
index 5de3071..a3e1a60 100644
--- a/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java
+++ b/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java
@@ -21,7 +21,6 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -37,8 +36,6 @@
     @VisibleForTesting
     static final int SETTING_VALUE_OFF = 0;
 
-    private SwitchPreference mPreference;
-
     public WifiDisplayCertificationPreferenceController(Context context) {
         super(context);
     }
@@ -49,13 +46,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         Settings.Global.putInt(mContext.getContentResolver(),
@@ -69,19 +59,15 @@
         final int wifiDisplayCertificationMode = Settings.Global.getInt(
                 mContext.getContentResolver(), Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON,
                 SETTING_VALUE_OFF);
-        mPreference.setChecked(wifiDisplayCertificationMode != SETTING_VALUE_OFF);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
+        ((SwitchPreference) mPreference).setChecked(
+            wifiDisplayCertificationMode != SETTING_VALUE_OFF);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         Settings.Global.putInt(mContext.getContentResolver(),
                 Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, SETTING_VALUE_OFF);
-        mPreference.setEnabled(false);
-        mPreference.setChecked(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java
index ad2b7eb..701dfec 100644
--- a/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java
+++ b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java
@@ -21,14 +21,12 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
-public class WifiVerboseLoggingPreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        PreferenceControllerMixin {
+public class WifiVerboseLoggingPreferenceController extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
 
     private static final String WIFI_VERBOSE_LOGGING_KEY = "wifi_verbose_logging";
 
@@ -38,7 +36,6 @@
     static final int SETTING_VALUE_OFF = 0;
 
     private final WifiManager mWifiManager;
-    private SwitchPreference mPreference;
 
     public WifiVerboseLoggingPreferenceController(Context context) {
         super(context);
@@ -52,13 +49,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
         mWifiManager.enableVerboseLogging(isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
@@ -68,19 +58,14 @@
     @Override
     public void updateState(Preference preference) {
         final boolean enabled = mWifiManager.getVerboseLoggingLevel() > 0;
-        mPreference.setChecked(enabled);
+        ((SwitchPreference) mPreference).setChecked(enabled);
 
     }
 
     @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
-    }
-
-    @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         mWifiManager.enableVerboseLogging(SETTING_VALUE_OFF);
-        mPreference.setEnabled(false);
-        mPreference.setChecked(false);
+        ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/WindowAnimationScalePreferenceController.java b/src/com/android/settings/development/WindowAnimationScalePreferenceController.java
index 1a17fd2..c841295 100644
--- a/src/com/android/settings/development/WindowAnimationScalePreferenceController.java
+++ b/src/com/android/settings/development/WindowAnimationScalePreferenceController.java
@@ -22,7 +22,6 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 import android.view.IWindowManager;
 
 import com.android.settings.R;
@@ -44,8 +43,6 @@
     private final String[] mListValues;
     private final String[] mListSummaries;
 
-    private ListPreference mPreference;
-
     public WindowAnimationScalePreferenceController(Context context) {
         super(context);
 
@@ -62,13 +59,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         writeAnimationScaleOption(newValue);
         return true;
@@ -80,14 +70,9 @@
     }
 
     @Override
-    protected void onDeveloperOptionsSwitchEnabled() {
-        mPreference.setEnabled(true);
-    }
-
-    @Override
     protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
         writeAnimationScaleOption(null);
-        mPreference.setEnabled(false);
     }
 
     private void writeAnimationScaleOption(Object newValue) {
@@ -111,8 +96,9 @@
                     break;
                 }
             }
-            mPreference.setValue(mListValues[index]);
-            mPreference.setSummary(mListSummaries[index]);
+            final ListPreference listPreference = (ListPreference) mPreference;
+            listPreference.setValue(mListValues[index]);
+            listPreference.setSummary(mListSummaries[index]);
         } catch (RemoteException e) {
             // intentional no-op
         }
diff --git a/src/com/android/settings/display/ColorModePreferenceFragment.java b/src/com/android/settings/display/ColorModePreferenceFragment.java
index ea8dd6a..f1bb6e1 100644
--- a/src/com/android/settings/display/ColorModePreferenceFragment.java
+++ b/src/com/android/settings/display/ColorModePreferenceFragment.java
@@ -16,10 +16,12 @@
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.PreferenceScreen;
 
 import com.android.internal.app.ColorDisplayController;
 import com.android.internal.logging.nano.MetricsProto;
 
+import com.android.settings.applications.LayoutPreference;
 import com.android.settings.R;
 import com.android.settings.widget.RadioButtonPickerFragment;
 import com.android.settingslib.widget.CandidateInfo;
@@ -50,6 +52,19 @@
         return R.xml.color_mode_settings;
     }
 
+    @VisibleForTesting
+    void configureAndInstallPreview(LayoutPreference preview, PreferenceScreen screen) {
+        preview.setSelectable(false);
+        screen.addPreference(preview);
+    }
+
+    @Override
+    protected void addStaticPreferences(PreferenceScreen screen) {
+        final LayoutPreference preview = new LayoutPreference(screen.getContext(),
+                R.layout.color_mode_preview);
+        configureAndInstallPreview(preview, screen);
+    }
+
     @Override
     protected List<? extends CandidateInfo> getCandidates() {
         Context c = getContext();
diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java
index 645ba16..10858c6 100644
--- a/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java
+++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java
@@ -34,7 +34,7 @@
     private static final String TAG = "BatteryDatabaseHelper";
 
     private static final String DATABASE_NAME = "battery_settings.db";
-    private static final int DATABASE_VERSION = 2;
+    private static final int DATABASE_VERSION = 3;
 
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({State.NEW,
@@ -56,6 +56,10 @@
          */
         String PACKAGE_NAME = "package_name";
         /**
+         * The uid of the anomaly app
+         */
+        String UID = "uid";
+        /**
          * The type of the anomaly app
          * @see Anomaly.AnomalyType
          */
@@ -74,6 +78,8 @@
     private static final String CREATE_ANOMALY_TABLE =
             "CREATE TABLE " + Tables.TABLE_ANOMALY +
                     "(" +
+                    AnomalyColumns.UID +
+                    " INTEGER, " +
                     AnomalyColumns.PACKAGE_NAME +
                     " TEXT, " +
                     AnomalyColumns.ANOMALY_TYPE +
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index a6feacc..13ba8f5 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -23,7 +23,6 @@
 import android.provider.SearchIndexableResource;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceGroup;
-
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
@@ -35,7 +34,6 @@
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.location.RecentLocationApps;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -67,16 +65,6 @@
     private LocationSwitchBarController mSwitchBarController;
 
     @Override
-    public int getInitialExpandedChildCount() {
-        final RecentLocationApps recentLocationApps = new RecentLocationApps(getActivity());
-        final int locationRequestsApps = recentLocationApps.getAppList().size();
-        final int locationRequestsPrefs =
-                locationRequestsApps == 0
-                        ? 1 : (locationRequestsApps > 3 ? 4 : locationRequestsApps);
-        return locationRequestsPrefs + 1;
-    }
-
-    @Override
     public int getMetricsCategory() {
         return MetricsEvent.LOCATION;
     }
@@ -89,6 +77,7 @@
         switchBar.setSwitchBarText(R.string.location_settings_master_switch_title,
                 R.string.location_settings_master_switch_title);
         mSwitchBarController = new LocationSwitchBarController(activity, switchBar, getLifecycle());
+        switchBar.show();
     }
 
     @Override
diff --git a/src/com/android/settings/location/LocationSwitchBarController.java b/src/com/android/settings/location/LocationSwitchBarController.java
index ca1932f..70ecc1e 100644
--- a/src/com/android/settings/location/LocationSwitchBarController.java
+++ b/src/com/android/settings/location/LocationSwitchBarController.java
@@ -16,7 +16,6 @@
 import android.content.Context;
 import android.os.UserHandle;
 import android.widget.Switch;
-
 import com.android.settings.widget.SwitchBar;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -48,12 +47,10 @@
             mSwitchBar.addOnSwitchChangeListener(this);
             mValidListener = true;
         }
-        mSwitchBar.show();
     }
 
     @Override
     public void onStop() {
-        mSwitchBar.hide();
         if (mValidListener) {
             mSwitchBar.removeOnSwitchChangeListener(this);
             mValidListener = false;
diff --git a/src/com/android/settings/location/RecentLocationRequestPreferenceController.java b/src/com/android/settings/location/RecentLocationRequestPreferenceController.java
index b017ec1..b2a648f 100644
--- a/src/com/android/settings/location/RecentLocationRequestPreferenceController.java
+++ b/src/com/android/settings/location/RecentLocationRequestPreferenceController.java
@@ -34,7 +34,7 @@
     /** Key for preference category "Recent location requests" */
     private static final String KEY_RECENT_LOCATION_REQUESTS = "recent_location_requests";
     @VisibleForTesting
-    static final String KEY_SEE_ALL = "recent_location_requests_see_all";
+    static final String KEY_SEE_ALL_BUTTON = "recent_location_requests_see_all_button";
     private final LocationSettings mFragment;
     private final RecentLocationApps mRecentLocationApps;
     private PreferenceCategory mCategoryRecentLocationRequests;
@@ -93,7 +93,7 @@
         super.displayPreference(screen);
         mCategoryRecentLocationRequests =
                 (PreferenceCategory) screen.findPreference(KEY_RECENT_LOCATION_REQUESTS);
-        mSeeAllButton = screen.findPreference(KEY_SEE_ALL);
+        mSeeAllButton = screen.findPreference(KEY_SEE_ALL_BUTTON);
 
     }
 
diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java
index 433bdf3..d8ba991 100644
--- a/src/com/android/settings/slices/SettingsSliceProvider.java
+++ b/src/com/android/settings/slices/SettingsSliceProvider.java
@@ -35,6 +35,7 @@
 
 import androidx.app.slice.Slice;
 import androidx.app.slice.SliceProvider;
+import androidx.app.slice.builders.SliceAction;
 import androidx.app.slice.builders.ListBuilder;
 
 /**
@@ -173,8 +174,9 @@
                         .setTitle(getContext().getString(R.string.wifi_settings))
                         .setTitleItem(Icon.createWithResource(getContext(), R.drawable.wifi_signal))
                         .setSubtitle(state)
-                        .addToggle(getBroadcastIntent(ACTION_WIFI_CHANGED), finalWifiEnabled)
-                        .setContentIntent(getIntent(Intent.ACTION_MAIN)))
+                        .addEndItem(new SliceAction(getBroadcastIntent(ACTION_WIFI_CHANGED),
+                                null, finalWifiEnabled))
+                        .setPrimaryAction(new SliceAction(getIntent(Intent.ACTION_MAIN), null, null)))
                 .build();
     }
 
diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java
index 35bc07e..e94ee56 100644
--- a/src/com/android/settings/slices/SliceBuilderUtils.java
+++ b/src/com/android/settings/slices/SliceBuilderUtils.java
@@ -23,7 +23,6 @@
 import android.content.Intent;
 import android.graphics.drawable.Icon;
 import android.text.TextUtils;
-import android.util.Log;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
@@ -34,6 +33,7 @@
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import androidx.app.slice.Slice;
+import androidx.app.slice.builders.SliceAction;
 import androidx.app.slice.builders.ListBuilder;
 import androidx.app.slice.builders.ListBuilder.RowBuilder;
 
@@ -63,11 +63,11 @@
                 .setTitle(sliceData.getTitle())
                 .setTitleItem(icon)
                 .setSubtitle(subtitleText)
-                .setContentIntent(contentIntent);
+                .setPrimaryAction(new SliceAction(contentIntent, null, null));
 
         // TODO (b/71640747) Respect setting availability.
 
-        if (controller instanceof TogglePreferenceController) {
+        if (sliceData.getSliceType() == SliceData.SliceType.SWITCH) {
             addToggleAction(context, builder, ((TogglePreferenceController) controller).isChecked(),
                     sliceData.getKey());
         }
@@ -78,29 +78,42 @@
     }
 
     /**
+     * @return the {@link SliceData.SliceType} for the {@param controllerClassName} and key.
+     */
+    @SliceData.SliceType
+    public static int getSliceType(Context context, String controllerClassName,
+            String controllerKey) {
+        BasePreferenceController controller = getPreferenceController(context, controllerClassName,
+                controllerKey);
+        return controller.getSliceType();
+    }
+
+    /**
      * Looks at the {@link SliceData#preferenceController} from {@param sliceData} and attempts to
      * build an {@link AbstractPreferenceController}.
      */
     public static BasePreferenceController getPreferenceController(Context context,
             SliceData sliceData) {
+        return getPreferenceController(context, sliceData.getPreferenceController(),
+                sliceData.getKey());
+    }
+
+    private static BasePreferenceController getPreferenceController(Context context,
+            String controllerClassName, String controllerKey) {
         try {
-            return BasePreferenceController.createInstance(context,
-                    sliceData.getPreferenceController());
+            return BasePreferenceController.createInstance(context, controllerClassName);
         } catch (IllegalStateException e) {
             // Do nothing
-            Log.d(TAG, "Could not find Context-only controller for preference controller: "
-                    + sliceData.getKey());
         }
 
-        return BasePreferenceController.createInstance(context, sliceData.getPreferenceController(),
-                sliceData.getKey());
+        return BasePreferenceController.createInstance(context, controllerClassName, controllerKey);
     }
 
     private static void addToggleAction(Context context, RowBuilder builder, boolean isChecked,
             String key) {
         PendingIntent actionIntent = getActionIntent(context,
                 SettingsSliceProvider.ACTION_TOGGLE_CHANGED, key);
-        builder.addToggle(actionIntent, isChecked);
+        builder.addEndItem(new SliceAction(actionIntent, null, isChecked));
     }
 
     private static PendingIntent getActionIntent(Context context, String action, String key) {
diff --git a/src/com/android/settings/slices/SliceData.java b/src/com/android/settings/slices/SliceData.java
index f72add7..a7c9a11 100644
--- a/src/com/android/settings/slices/SliceData.java
+++ b/src/com/android/settings/slices/SliceData.java
@@ -16,76 +16,111 @@
 
 package com.android.settings.slices;
 
+import android.annotation.IntDef;
 import android.net.Uri;
 import android.text.TextUtils;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
 /**
  * Data class representing a slice stored by {@link SlicesIndexer}.
- * Note that {@link #key} is treated as a primary key for this class and determines equality.
+ * Note that {@link #mKey} is treated as a primary key for this class and determines equality.
  */
 public class SliceData {
 
-    private final String key;
+    /**
+     * Flags indicating the UI type of the Slice.
+     */
+    @IntDef({SliceType.INTENT, SliceType.SWITCH, SliceType.SLIDER})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface SliceType {
+        /**
+         * Only supports content intent.
+         */
+        int INTENT = 0;
 
-    private final String title;
+        /**
+         * Supports toggle action.
+         */
+        int SWITCH = 1;
 
-    private final String summary;
+        /**
+         * Supports progress bar.
+         */
+        int SLIDER = 2;
+    }
 
-    private final String screenTitle;
+    private final String mKey;
 
-    private final int iconResource;
+    private final String mTitle;
 
-    private final String fragmentClassName;
+    private final String mSummary;
 
-    private final Uri uri;
+    private final String mScreenTitle;
 
-    private final String preferenceController;
+    private final int mIconResource;
+
+    private final String mFragmentClassName;
+
+    private final Uri mUri;
+
+    private final String mPreferenceController;
+
+    @SliceType
+    private final int mSliceType;
 
     public String getKey() {
-        return key;
+        return mKey;
     }
 
     public String getTitle() {
-        return title;
+        return mTitle;
     }
 
     public String getSummary() {
-        return summary;
+        return mSummary;
     }
 
     public String getScreenTitle() {
-        return screenTitle;
+        return mScreenTitle;
     }
 
     public int getIconResource() {
-        return iconResource;
+        return mIconResource;
     }
 
     public String getFragmentClassName() {
-        return fragmentClassName;
+        return mFragmentClassName;
     }
 
     public Uri getUri() {
-        return uri;
+        return mUri;
     }
 
     public String getPreferenceController() {
-        return preferenceController;
+        return mPreferenceController;
+    }
+
+    public int getSliceType() {
+        return mSliceType;
     }
 
     private SliceData(Builder builder) {
-        key = builder.mKey;
-        title = builder.mTitle;
-        summary = builder.mSummary;
-        screenTitle = builder.mScreenTitle;
-        iconResource = builder.mIconResource;
-        fragmentClassName = builder.mFragmentClassName;
-        uri = builder.mUri;
-        preferenceController = builder.mPrefControllerClassName;
+        mKey = builder.mKey;
+        mTitle = builder.mTitle;
+        mSummary = builder.mSummary;
+        mScreenTitle = builder.mScreenTitle;
+        mIconResource = builder.mIconResource;
+        mFragmentClassName = builder.mFragmentClassName;
+        mUri = builder.mUri;
+        mPreferenceController = builder.mPrefControllerClassName;
+        mSliceType = builder.mSliceType;
     }
 
     @Override
     public int hashCode() {
-        return key.hashCode();
+        return mKey.hashCode();
     }
 
     @Override
@@ -94,7 +129,7 @@
             return false;
         }
         SliceData newObject = (SliceData) obj;
-        return TextUtils.equals(key, newObject.key);
+        return TextUtils.equals(mKey, newObject.mKey);
     }
 
     static class Builder {
@@ -114,6 +149,8 @@
 
         private String mPrefControllerClassName;
 
+        private int mSliceType;
+
         public Builder setKey(String key) {
             mKey = key;
             return this;
@@ -154,6 +191,11 @@
             return this;
         }
 
+        public Builder setSliceType(@SliceType int sliceType) {
+            mSliceType = sliceType;
+            return this;
+        }
+
         public SliceData build() {
             if (TextUtils.isEmpty(mKey)) {
                 throw new IllegalStateException("Key cannot be empty");
diff --git a/src/com/android/settings/slices/SliceDataConverter.java b/src/com/android/settings/slices/SliceDataConverter.java
index a023b16..d77f427 100644
--- a/src/com/android/settings/slices/SliceDataConverter.java
+++ b/src/com/android/settings/slices/SliceDataConverter.java
@@ -127,11 +127,6 @@
         XmlResourceParser parser = null;
 
         final List<SliceData> xmlSliceData = new ArrayList<>();
-        String key;
-        String title;
-        String summary;
-        @DrawableRes int iconResId;
-        String controllerClassName;
 
         try {
             parser = mContext.getResources().getXml(xmlResId);
@@ -155,30 +150,33 @@
 
             // TODO (b/67996923) Investigate if we need headers for Slices, since they never
             // correspond to an actual setting.
-            SliceData xmlSlice;
+
             while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
                     && (type != XmlPullParser.END_TAG || parser.getDepth() > outerDepth)) {
                 if (type == XmlPullParser.END_TAG || type == XmlPullParser.TEXT) {
                     continue;
                 }
 
-
                 // TODO (b/67996923) Non-controller Slices should become intent-only slices.
                 // Note that without a controller, dynamic summaries are impossible.
                 // TODO (b/67996923) This will not work if preferences have nested intents:
                 // <pref ....>
                 //      <intent action="blab"/> </pref>
-                controllerClassName = PreferenceXmlParserUtils.getController(mContext, attrs);
+                final String controllerClassName = PreferenceXmlParserUtils.getController(mContext,
+                        attrs);
                 if (TextUtils.isEmpty(controllerClassName)) {
                     continue;
                 }
 
-                title = PreferenceXmlParserUtils.getDataTitle(mContext, attrs);
-                key = PreferenceXmlParserUtils.getDataKey(mContext, attrs);
-                iconResId = PreferenceXmlParserUtils.getDataIcon(mContext, attrs);
-                summary = PreferenceXmlParserUtils.getDataSummary(mContext, attrs);
+                final String title = PreferenceXmlParserUtils.getDataTitle(mContext, attrs);
+                final String key = PreferenceXmlParserUtils.getDataKey(mContext, attrs);
+                @DrawableRes final int iconResId = PreferenceXmlParserUtils.getDataIcon(mContext,
+                        attrs);
+                final String summary = PreferenceXmlParserUtils.getDataSummary(mContext, attrs);
+                final int sliceType = SliceBuilderUtils.getSliceType(mContext, controllerClassName,
+                        key);
 
-                xmlSlice = new SliceData.Builder()
+                final SliceData xmlSlice = new SliceData.Builder()
                         .setKey(key)
                         .setTitle(title)
                         .setSummary(summary)
@@ -186,6 +184,7 @@
                         .setScreenTitle(screenTitle)
                         .setPreferenceControllerClassName(controllerClassName)
                         .setFragmentName(fragmentName)
+                        .setSliceType(sliceType)
                         .build();
 
                 xmlSliceData.add(xmlSlice);
diff --git a/src/com/android/settings/widget/RadioButtonPickerFragment.java b/src/com/android/settings/widget/RadioButtonPickerFragment.java
index 069d461..1465c60 100644
--- a/src/com/android/settings/widget/RadioButtonPickerFragment.java
+++ b/src/com/android/settings/widget/RadioButtonPickerFragment.java
@@ -101,6 +101,13 @@
         return false;
     }
 
+    /**
+     * Populate any static preferences, independent of the radio buttons.
+     * These might be used to provide extra information about the choices.
+     **/
+    protected void addStaticPreferences(PreferenceScreen screen) {
+    }
+
     protected CandidateInfo getCandidate(String key) {
         return mCandidates.get(key);
     }
@@ -134,6 +141,7 @@
         final String systemDefaultKey = getSystemDefaultKey();
         final PreferenceScreen screen = getPreferenceScreen();
         screen.removeAll();
+        addStaticPreferences(screen);
 
         final int customLayoutResId = getRadioButtonPreferenceCustomLayoutResId();
         if (shouldShowItemNone()) {
diff --git a/src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java b/src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java
new file mode 100644
index 0000000..23d6b67
--- /dev/null
+++ b/src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java
@@ -0,0 +1,92 @@
+/*
+ * 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.wifi;
+
+import android.Manifest;
+import android.app.AppOpsManager;
+import android.content.Context;
+
+import com.android.settings.applications.AppStateAppOpsBridge;
+import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
+import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+import com.android.settingslib.applications.ApplicationsState.AppFilter;
+
+import java.util.List;
+/*
+ * Connects info of apps that change wifi state to the ApplicationsState. Wraps around the generic
+ * AppStateAppOpsBridge class to tailor to the semantics of CHANGE_WIFI_STATE. Also provides app
+ * filters that can use the info.
+ */
+public class AppStateChangeWifiStateBridge extends AppStateAppOpsBridge {
+
+    private static final String TAG = "AppStateChangeWifiStateBridge";
+    private static final int APP_OPS_OP_CODE = AppOpsManager.OP_CHANGE_WIFI_STATE;
+    private static final String PM_CHANGE_WIFI_STATE = Manifest.permission.CHANGE_WIFI_STATE;
+
+    private static final String[] PM_PERMISSIONS = {
+            PM_CHANGE_WIFI_STATE
+    };
+
+    public AppStateChangeWifiStateBridge(Context context, ApplicationsState appState, Callback
+            callback) {
+        super(context, appState, callback, APP_OPS_OP_CODE, PM_PERMISSIONS);
+    }
+
+    @Override
+    protected void updateExtraInfo(AppEntry app, String pkg, int uid) {
+        app.extraInfo = getWifiSettingsInfo(pkg, uid);
+    }
+
+    @Override
+    protected void loadAllExtraInfo() {
+        final List<AppEntry> allApps = mAppSession.getAllApps();
+        for (AppEntry entry : allApps) {
+            updateExtraInfo(entry, entry.info.packageName, entry.info.uid);
+        }
+    }
+
+    public WifiSettingsState getWifiSettingsInfo(String pkg, int uid) {
+        PermissionState permissionState = super.getPermissionInfo(pkg, uid);
+        return new WifiSettingsState(permissionState);
+    }
+
+    public static class WifiSettingsState extends AppStateAppOpsBridge.PermissionState {
+        public WifiSettingsState(PermissionState permissionState) {
+            super(permissionState.packageName, permissionState.userHandle);
+            this.packageInfo = permissionState.packageInfo;
+            this.appOpMode = permissionState.appOpMode;
+            this.permissionDeclared = permissionState.permissionDeclared;
+            this.staticPermissionGranted = permissionState.staticPermissionGranted;
+        }
+    }
+
+    public static final AppFilter FILTER_CHANGE_WIFI_STATE = new AppFilter() {
+        @Override
+        public void init() {
+        }
+
+        @Override
+        public boolean filterApp(AppEntry info) {
+            if (info == null || info.extraInfo == null) {
+                return false;
+            }
+            WifiSettingsState wifiSettingsState = (WifiSettingsState) info.extraInfo;
+            return wifiSettingsState.permissionDeclared;
+        }
+    };
+}
diff --git a/src/com/android/settings/wifi/ChangeWifiStateDetails.java b/src/com/android/settings/wifi/ChangeWifiStateDetails.java
new file mode 100644
index 0000000..1df11e0
--- /dev/null
+++ b/src/com/android/settings/wifi/ChangeWifiStateDetails.java
@@ -0,0 +1,141 @@
+/*
+ * 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.wifi;
+
+import android.Manifest.permission;
+import android.app.AlertDialog;
+import android.app.AppOpsManager;
+import android.content.Context;
+import android.os.Bundle;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.Preference.OnPreferenceChangeListener;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.applications.AppInfoWithHeader;
+import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
+import com.android.settings.R;
+import com.android.settings.overlay.FeatureFactory;
+
+import com.android.settings.wifi.AppStateChangeWifiStateBridge.WifiSettingsState;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+import com.android.settingslib.applications.ApplicationsState.AppFilter;
+
+import static android.app.AppOpsManager.MODE_ALLOWED;
+import static android.app.AppOpsManager.MODE_IGNORED;
+
+public class ChangeWifiStateDetails extends AppInfoWithHeader
+        implements OnPreferenceChangeListener {
+
+    private static final String KEY_APP_OPS_SETTINGS_SWITCH = "app_ops_settings_switch";
+    private static final String LOG_TAG = "ChangeWifiStateDetails";
+
+    private AppStateChangeWifiStateBridge mAppBridge;
+    private AppOpsManager mAppOpsManager;
+    private SwitchPreference mSwitchPref;
+    private WifiSettingsState mWifiSettingsState;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        final Context context = getActivity();
+        mAppBridge = new AppStateChangeWifiStateBridge(context, mState, null);
+        mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
+
+        // find preferences
+        addPreferencesFromResource(R.xml.change_wifi_state_details);
+        mSwitchPref = (SwitchPreference) findPreference(KEY_APP_OPS_SETTINGS_SWITCH);
+
+        // set title/summary for all of them
+        mSwitchPref.setTitle(R.string.change_wifi_state_app_detail_switch);
+
+        // install event listeners
+        mSwitchPref.setOnPreferenceChangeListener(this);
+    }
+
+    @Override
+    protected AlertDialog createDialog(int id, int errorCode) {
+        return null;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.CONFIGURE_WIFI;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (preference == mSwitchPref) {
+            if (mWifiSettingsState != null && (Boolean) newValue
+                    != mWifiSettingsState.isPermissible()) {
+                setCanChangeWifiState(!mWifiSettingsState.isPermissible());
+                refreshUi();
+            }
+            return true;
+        }
+        return false;
+    }
+
+    private void setCanChangeWifiState(boolean newState) {
+        logSpecialPermissionChange(newState, mPackageName);
+        mAppOpsManager.setMode(AppOpsManager.OP_CHANGE_WIFI_STATE,
+                mPackageInfo.applicationInfo.uid, mPackageName, newState
+                        ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_IGNORED);
+    }
+
+    protected void logSpecialPermissionChange(boolean newState, String packageName) {
+        int logCategory = newState ? MetricsEvent.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_ALLOW
+                : MetricsEvent.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_DENY;
+        FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider().action(getContext(),
+                logCategory, packageName);
+    }
+
+    @Override
+    protected boolean refreshUi() {
+        if (mPackageInfo == null || mPackageInfo.applicationInfo == null) {
+            return false;
+        }
+        mWifiSettingsState = mAppBridge.getWifiSettingsInfo(mPackageName,
+                mPackageInfo.applicationInfo.uid);
+
+        boolean canChange = mWifiSettingsState.isPermissible();
+        mSwitchPref.setChecked(canChange);
+        // you can't ask a user for a permission you didn't even declare!
+        mSwitchPref.setEnabled(mWifiSettingsState.permissionDeclared);
+        return true;
+    }
+
+    public static CharSequence getSummary(Context context, AppEntry entry) {
+        WifiSettingsState state;
+        if (entry.extraInfo instanceof WifiSettingsState) {
+            state = (WifiSettingsState) entry.extraInfo;
+        } else if (entry.extraInfo instanceof PermissionState) {
+            state = new WifiSettingsState((PermissionState) entry.extraInfo);
+        } else {
+            state = new AppStateChangeWifiStateBridge(context, null, null).getWifiSettingsInfo(
+                    entry.info.packageName, entry.info.uid);
+        }
+        return getSummary(context, state);
+    }
+
+    public static CharSequence getSummary(Context context, WifiSettingsState wifiSettingsState) {
+        return context.getString(wifiSettingsState.isPermissible()
+                ? R.string.app_permission_summary_allowed
+                : R.string.app_permission_summary_not_allowed);
+    }
+}
diff --git a/tests/robotests/assets/grandfather_not_implementing_indexable b/tests/robotests/assets/grandfather_not_implementing_indexable
index 748dc94..3751222 100644
--- a/tests/robotests/assets/grandfather_not_implementing_indexable
+++ b/tests/robotests/assets/grandfather_not_implementing_indexable
@@ -71,3 +71,4 @@
 com.android.settings.UserCredentialsSettings
 com.android.settings.TestingSettings
 com.android.settings.applications.DirectoryAccessDetails
+com.android.settings.wifi.ChangeWifiStateDetails
diff --git a/tests/robotests/assets/grandfather_slice_controller_not_in_xml b/tests/robotests/assets/grandfather_slice_controller_not_in_xml
index f11027e..1a67726 100644
--- a/tests/robotests/assets/grandfather_slice_controller_not_in_xml
+++ b/tests/robotests/assets/grandfather_slice_controller_not_in_xml
@@ -1 +1,2 @@
-com.android.settings.testutils.FakeToggleController
\ No newline at end of file
+com.android.settings.testutils.FakeToggleController
+com.android.settings.core.TogglePreferenceControllerTest$FakeToggle
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceControllerTest.java
index 70b9cc9..7d5eb31 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceControllerTest.java
@@ -18,18 +18,27 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.doNothing;
 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.BroadcastReceiver;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.support.v7.preference.PreferenceScreen;
 
@@ -111,14 +120,16 @@
     }
 
     @Test
-    public void displayPreference_shouldSetButton2Invisible() {
+    public void displayPreference_shouldInitializeForceStopButton() {
         final PreferenceScreen screen = mock(PreferenceScreen.class);
         final ActionButtonPreference preference = spy(new ActionButtonPreference(mContext));
         when(screen.findPreference(mController.getPreferenceKey())).thenReturn(preference);
 
         mController.displayPreference(screen);
 
-        verify(preference).setButton2Visible(false);
+        verify(preference).setButton2Positive(false);
+        verify(preference).setButton2Text(R.string.force_stop);
+        verify(preference).setButton2Enabled(false);
     }
 
     @Test
@@ -127,12 +138,14 @@
         final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
         final ApplicationInfo info = new ApplicationInfo();
         appEntry.info = info;
+        doNothing().when(mController).checkForceStop(appEntry, packageInfo);
         doNothing().when(mController).initUninstallButtons(appEntry, packageInfo);
         when(mFragment.getAppEntry()).thenReturn(appEntry);
         when(mFragment.getPackageInfo()).thenReturn(packageInfo);
 
         mController.refreshUi();
 
+        verify(mController).checkForceStop(appEntry, packageInfo);
         verify(mController).initUninstallButtons(appEntry, packageInfo);
     }
 
@@ -185,6 +198,71 @@
         assertThat(mController.initUninstallButtonForUserApp()).isFalse();
     }
 
+    // Tests that we don't show the force stop button for instant apps (they aren't allowed to run
+    // when they aren't in the foreground).
+    @Test
+    public void checkForceStop_instantApps_shouldNotShowForceStop() {
+        // Make this app appear to be instant.
+        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
+                (InstantAppDataProvider) (i -> true));
+        final PackageInfo packageInfo = mock(PackageInfo.class);
+        final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
+        final ApplicationInfo info = new ApplicationInfo();
+        appEntry.info = info;
+
+        mController.checkForceStop(appEntry, packageInfo);
+
+        verify(mController.mActionButtons).setButton2Visible(false);
+    }
+
+    @Test
+    public void checkForceStop_hasActiveAdmin_shouldDisableForceStop() {
+        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
+                (InstantAppDataProvider) (i -> false));
+        final String packageName = "Package1";
+        final PackageInfo packageInfo = new PackageInfo();
+        packageInfo.packageName = packageName;
+        final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
+        when(mDevicePolicyManager.packageHasActiveAdmins(packageName)).thenReturn(true);
+
+        mController.checkForceStop(appEntry, packageInfo);
+
+        verify(mController.mActionButtons).setButton2Enabled(false);
+    }
+
+    @Test
+    public void checkForceStop_appRunning_shouldEnableForceStop() {
+        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
+                (InstantAppDataProvider) (i -> false));
+        final PackageInfo packageInfo = mock(PackageInfo.class);
+        final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
+        final ApplicationInfo info = new ApplicationInfo();
+        appEntry.info = info;
+
+        mController.checkForceStop(appEntry, packageInfo);
+
+        verify(mController.mActionButtons).setButton2Enabled(true);
+    }
+
+    @Test
+    public void checkForceStop_appStopped_shouldQueryPackageRestart() {
+        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
+                (InstantAppDataProvider) (i -> false));
+        final PackageInfo packageInfo = mock(PackageInfo.class);
+        final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
+        final ApplicationInfo info = new ApplicationInfo();
+        appEntry.info = info;
+        info.flags = ApplicationInfo.FLAG_STOPPED;
+        info.packageName = "com.android.setting";
+
+        mController.checkForceStop(appEntry, packageInfo);
+
+        verify(mContext).sendOrderedBroadcastAsUser(argThat(intent-> intent != null
+                        && intent.getAction().equals(Intent.ACTION_QUERY_PACKAGE_RESTART)),
+                any(UserHandle.class), nullable(String.class), any(BroadcastReceiver.class),
+                nullable(Handler.class), anyInt(), nullable(String.class), nullable(Bundle.class));
+    }
+
     @Test
     public void handleDisableable_appIsHomeApp_buttonShouldNotWork() {
         final ApplicationInfo info = new ApplicationInfo();
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java
index 7108ef0..ee870b7 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java
@@ -42,9 +42,7 @@
 import com.android.settings.TestConfig;
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
-import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
@@ -55,7 +53,6 @@
 import org.robolectric.Robolectric;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -106,8 +103,7 @@
         appEntry.info = info;
         when(mFragment.getAppEntry()).thenReturn(appEntry);
         when(mFragment.getPackageInfo()).thenReturn(packageInfo);
-        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
-            (InstantAppDataProvider) (i -> false));
+
 
         final TextView title = mHeader.findViewById(R.id.entity_header_title);
         final TextView summary = mHeader.findViewById(R.id.entity_header_summary);
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/ForceStopOptionsMenuControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/ForceStopOptionsMenuControllerTest.java
deleted file mode 100644
index 4719008..0000000
--- a/tests/robotests/src/com/android/settings/applications/appinfo/ForceStopOptionsMenuControllerTest.java
+++ /dev/null
@@ -1,215 +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.applications.appinfo;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Mockito.doNothing;
-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.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.wrapper.DevicePolicyManagerWrapper;
-import com.android.settingslib.applications.AppUtils;
-import com.android.settingslib.applications.ApplicationsState.AppEntry;
-import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
-
-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;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-    manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION
-)
-public final class ForceStopOptionsMenuControllerTest {
-
-    private static final String PACKAGE_NAME = "test_package_name";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private UserManager mUserManager;
-    @Mock
-    private SettingsActivity mActivity;
-    @Mock
-    private DevicePolicyManagerWrapper mDevicePolicyManager;
-    @Mock
-    private PackageManager mPackageManager;
-
-    private AppInfoDashboardFragment mFragment;
-    private ForceStopOptionsMenuController mController;
-    private Context mShadowContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mShadowContext = spy(RuntimeEnvironment.application);
-        mFragment = spy(new AppInfoDashboardFragment());
-        ReflectionHelpers.setField(mFragment, "mDpm", mDevicePolicyManager);
-        ReflectionHelpers.setField(mFragment, "mUserManager", mUserManager);
-        doReturn(mActivity).when(mFragment).getActivity();
-        doReturn(mShadowContext).when(mFragment).getContext();
-        doReturn(mPackageManager).when(mActivity).getPackageManager();
-        when(mShadowContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        mController = spy(new ForceStopOptionsMenuController(
-            mShadowContext, mFragment, mDevicePolicyManager,
-            null /* metricsFeatureProvider */, null /* lifecycle */));
-
-        // Default to not considering any apps to be instant (individual tests can override this).
-        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
-                (InstantAppDataProvider) (i -> false));
-    }
-
-    @Test
-    public void onCreateOptionsMenu_shouldAddForceStop() {
-        final Menu menu = mock(Menu.class);
-        when(menu.add(anyInt(), anyInt(), anyInt(), anyInt())).thenReturn(mock(MenuItem.class));
-
-        mController.onCreateOptionsMenu(menu, null /* inflater */);
-
-        verify(menu).add(anyInt(), eq(AppInfoDashboardFragment.FORCE_STOP_MENU), anyInt(),
-            eq(R.string.force_stop));
-    }
-
-    @Test
-    public void onPrepareOptionsMenu_shouldUpdateForceStopMenu() {
-        final Menu menu = mock(Menu.class);
-        doNothing().when(mController).updateForceStopMenu(any(), any());
-        doReturn(mock(AppEntry.class)).when(mFragment).getAppEntry();
-        doReturn(mock(PackageInfo.class)).when(mFragment).getPackageInfo();
-
-        mController.onPrepareOptionsMenu(menu);
-
-        verify(mController).updateForceStopMenu(any(), any());
-    }
-
-    @Test
-    public void onOptionsItemSelected_shouldHandleForceStopMenuClick() {
-        doReturn(mock(AppEntry.class)).when(mFragment).getAppEntry();
-        doNothing().when(mController).handleForceStopMenuClick();
-        final MenuItem menu = mock(MenuItem.class);
-        when(menu.getItemId()).thenReturn(AppInfoDashboardFragment.FORCE_STOP_MENU);
-
-        mController.onOptionsItemSelected(menu);
-
-        verify(mController).handleForceStopMenuClick();
-    }
-
-    // Tests that we don't show the force stop button for instant apps (they aren't allowed to run
-    // when they aren't in the foreground).
-    @Test
-    public void updateForceStopMenu_instantApps_shouldNotShowForceStop() {
-        when(mDevicePolicyManager.packageHasActiveAdmins(nullable(String.class))).thenReturn(false);
-        final MenuItem forceStopMenu = mock(MenuItem.class);
-        ReflectionHelpers.setField(mController, "mForceStopMenu", forceStopMenu);
-        // Make this app appear to be instant.
-        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
-            (InstantAppDataProvider) (i -> true));
-        final PackageInfo packageInfo = mock(PackageInfo.class);
-        final AppEntry appEntry = mock(AppEntry.class);
-        final ApplicationInfo info = new ApplicationInfo();
-        appEntry.info = info;
-
-        mController.updateForceStopMenu(appEntry, packageInfo);
-
-        verify(forceStopMenu).setVisible(false);
-    }
-
-    @Test
-    public void updateForceStopMenu_hasActiveAdmin_shouldDisableForceStop() {
-        when(mDevicePolicyManager.packageHasActiveAdmins(nullable(String.class))).thenReturn(false);
-        final MenuItem forceStopMenu = mock(MenuItem.class);
-        ReflectionHelpers.setField(mController, "mForceStopMenu", forceStopMenu);
-        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
-            (InstantAppDataProvider) (i -> false));
-        final String packageName = "Package1";
-        final PackageInfo packageInfo = new PackageInfo();
-        packageInfo.packageName = packageName;
-        final AppEntry appEntry = mock(AppEntry.class);
-        when(mDevicePolicyManager.packageHasActiveAdmins(packageName)).thenReturn(true);
-
-        mController.updateForceStopMenu(appEntry, packageInfo);
-
-        verify(forceStopMenu).setEnabled(false);
-    }
-
-    @Test
-    public void updateForceStopMenu_appRunning_shouldEnableForceStop() {
-        when(mDevicePolicyManager.packageHasActiveAdmins(nullable(String.class))).thenReturn(false);
-        final MenuItem forceStopMenu = mock(MenuItem.class);
-        ReflectionHelpers.setField(mController, "mForceStopMenu", forceStopMenu);
-        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
-            (InstantAppDataProvider) (i -> false));
-        final PackageInfo packageInfo = mock(PackageInfo.class);
-        final AppEntry appEntry = mock(AppEntry.class);
-        final ApplicationInfo info = new ApplicationInfo();
-        appEntry.info = info;
-
-        mController.updateForceStopMenu(appEntry, packageInfo);
-
-        verify(forceStopMenu).setEnabled(true);
-    }
-
-    @Test
-    public void updateForceStopMenu_appStopped_shouldQueryPackageRestart() {
-        when(mDevicePolicyManager.packageHasActiveAdmins(nullable(String.class))).thenReturn(false);
-        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
-            (InstantAppDataProvider) (i -> false));
-        final PackageInfo packageInfo = mock(PackageInfo.class);
-        final AppEntry appEntry = mock(AppEntry.class);
-        final ApplicationInfo info = new ApplicationInfo();
-        appEntry.info = info;
-        info.flags = ApplicationInfo.FLAG_STOPPED;
-        info.packageName = "com.android.setting";
-
-        mController.updateForceStopMenu(appEntry, packageInfo);
-
-        verify(mShadowContext).sendOrderedBroadcastAsUser(argThat(intent-> intent != null
-                && intent.getAction().equals(Intent.ACTION_QUERY_PACKAGE_RESTART)),
-            any(UserHandle.class), nullable(String.class), any(BroadcastReceiver.class),
-            nullable(Handler.class), anyInt(), nullable(String.class), nullable(Bundle.class));
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java
index 3c0740b..3949652 100644
--- a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java
@@ -24,6 +24,7 @@
 import static org.mockito.Mockito.when;
 
 import com.android.settings.TestConfig;
+import com.android.settings.slices.SliceData;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
@@ -126,4 +127,9 @@
 
         assertThat(mPreferenceController.isSupported()).isTrue();
     }
+
+    @Test
+    public void getSliceType_shouldReturnIntent() {
+        assertThat(mPreferenceController.getSliceType()).isEqualTo(SliceData.SliceType.INTENT);
+    }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java
index 099c9ba..ab770f1 100644
--- a/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java
@@ -17,20 +17,16 @@
 
 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.support.v14.preference.SwitchPreference;
 
 import com.android.settings.TestConfig;
+import com.android.settings.slices.SliceData;
 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;
 
@@ -38,35 +34,34 @@
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class TogglePreferenceControllerTest {
 
-    @Mock
-    TogglePreferenceController mTogglePreferenceController;
+    FakeToggle mToggleController;
 
     Context mContext;
     SwitchPreference mPreference;
 
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
         mPreference = new SwitchPreference(mContext);
+        mToggleController = new FakeToggle(mContext, "key");
     }
 
     @Test
     public void testSetsPreferenceValue_setsChecked() {
-        when(mTogglePreferenceController.isChecked()).thenReturn(true);
+        mToggleController.setChecked(true);
         mPreference.setChecked(false);
 
-        mTogglePreferenceController.updateState(mPreference);
+        mToggleController.updateState(mPreference);
 
         assertThat(mPreference.isChecked()).isTrue();
     }
 
     @Test
     public void testSetsPreferenceValue_setsNotChecked() {
-        when(mTogglePreferenceController.isChecked()).thenReturn(false);
+        mToggleController.setChecked(false);
         mPreference.setChecked(true);
 
-        mTogglePreferenceController.updateState(mPreference);
+        mToggleController.updateState(mPreference);
 
         assertThat(mPreference.isChecked()).isFalse();
     }
@@ -74,18 +69,51 @@
     @Test
     public void testUpdatesPreferenceOnChange_turnsOn() {
         boolean newValue = true;
+        mToggleController.setChecked(!newValue);
 
-        mTogglePreferenceController.onPreferenceChange(mPreference, newValue);
+        mToggleController.onPreferenceChange(mPreference, newValue);
 
-        verify(mTogglePreferenceController).setChecked(newValue);
+        assertThat(mToggleController.isChecked()).isEqualTo(newValue);
     }
 
     @Test
     public void testUpdatesPreferenceOnChange_turnsOff() {
         boolean newValue = false;
+        mToggleController.setChecked(!newValue);
 
-        mTogglePreferenceController.onPreferenceChange(mPreference, newValue);
+        mToggleController.onPreferenceChange(mPreference, newValue);
 
-        verify(mTogglePreferenceController).setChecked(newValue);
+        assertThat(mToggleController.isChecked()).isEqualTo(newValue);
+    }
+
+    @Test
+    public void testSliceType_returnsSliceType() {
+        assertThat(mToggleController.getSliceType()).isEqualTo(
+                SliceData.SliceType.SWITCH);
+    }
+
+    private static class FakeToggle extends TogglePreferenceController {
+
+        private boolean checkedFlag;
+
+        public FakeToggle(Context context, String preferenceKey) {
+            super(context, preferenceKey);
+        }
+
+        @Override
+        public boolean isChecked() {
+            return checkedFlag;
+        }
+
+        @Override
+        public boolean setChecked(boolean isChecked) {
+            checkedFlag = isChecked;
+            return true;
+        }
+
+        @Override
+        public int getAvailabilityStatus() {
+            return AVAILABLE;
+        }
     }
 }
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
index b85afaa..427f1d0 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
@@ -139,31 +139,6 @@
     }
 
     @Test
-    public void testSuggestionDismissed_moreThanTwoSuggestions_shouldNotCrash() {
-        final RecyclerView data = new RecyclerView(RuntimeEnvironment.application);
-        final View itemView = mock(View.class);
-        when(itemView.findViewById(R.id.suggestion_list)).thenReturn(data);
-        when(itemView.findViewById(android.R.id.summary)).thenReturn(mock(TextView.class));
-        when(itemView.findViewById(android.R.id.title)).thenReturn(mock(TextView.class));
-        final DashboardAdapter.SuggestionContainerHolder holder =
-            new DashboardAdapter.SuggestionContainerHolder(itemView);
-        final List<Suggestion> suggestions = makeSuggestionsV2("pkg1", "pkg2", "pkg3", "pkg4");
-        final DashboardAdapter adapter = spy(new DashboardAdapter(mContext,
-            null /*savedInstance */, null /* conditions */,
-            null /* suggestionControllerMixin */,
-            null /* lifecycle */));
-        adapter.setSuggestions(suggestions);
-        adapter.onBindSuggestion(holder, 0);
-
-        adapter.onSuggestionClosed(suggestions.get(1));
-
-        // verify operations that access the lists will not cause ConcurrentModificationException
-        assertThat(holder.data.getAdapter().getItemCount()).isEqualTo(3);
-        adapter.setSuggestions(suggestions);
-        // should not crash
-    }
-
-    @Test
     public void testSuggestionDismissed_onlySuggestion_updateDashboardData() {
         DashboardAdapter adapter =
             spy(new DashboardAdapter(mContext, null /* savedInstanceState */,
@@ -206,38 +181,6 @@
     }
 
     @Test
-    public void testBindSuggestion_shouldSetSummary() {
-        mDashboardAdapter = new DashboardAdapter(mContext, null /* savedInstanceState */,
-            null /* conditions */, null /* suggestionControllerMixin */, null /* lifecycle */);
-        final List<Suggestion> suggestions = makeSuggestionsV2("pkg1");
-
-        mDashboardAdapter.setSuggestions(suggestions);
-
-        final RecyclerView data = mock(RecyclerView.class);
-        when(data.getResources()).thenReturn(mResources);
-        when(data.getContext()).thenReturn(mContext);
-        when(mResources.getDisplayMetrics()).thenReturn(mock(DisplayMetrics.class));
-        final View itemView = mock(View.class);
-        when(itemView.findViewById(R.id.suggestion_list)).thenReturn(data);
-        final TextView summary = mock(TextView.class);
-        when(itemView.findViewById(android.R.id.summary)).thenReturn(summary);
-        when(itemView.findViewById(android.R.id.title)).thenReturn(mock(TextView.class));
-        final DashboardAdapter.SuggestionContainerHolder holder =
-            new DashboardAdapter.SuggestionContainerHolder(itemView);
-
-        mDashboardAdapter.onBindSuggestion(holder, 0);
-
-        verify(summary).setText("1");
-
-        suggestions.addAll(makeSuggestionsV2("pkg2", "pkg3", "pkg4"));
-        mDashboardAdapter.setSuggestions(suggestions);
-
-        mDashboardAdapter.onBindSuggestion(holder, 0);
-
-        verify(summary).setText("4");
-    }
-
-    @Test
     public void onBindTile_internalTile_shouldNotUseGenericBackgroundIcon() {
         final Context context = RuntimeEnvironment.application;
         final View view = LayoutInflater.from(context).inflate(R.layout.dashboard_tile, null);
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 512ac64..d96e660 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
@@ -94,8 +94,6 @@
             .thenReturn(10);
         when(mResources.getDimensionPixelOffset(R.dimen.suggestion_card_outer_margin))
             .thenReturn(20);
-        when(mResources.getDimensionPixelOffset(R.dimen.suggestion_card_width_multiple_cards))
-            .thenReturn(120);
         mConfig = spy(SuggestionAdapter.CardConfig.get(mActivity));
 
         mFeatureFactory = FakeFeatureFactory.setupForTest();
@@ -238,40 +236,12 @@
     }
 
     @Test
-    public void onBindViewHolder_iconNotTintable_shouldNotTintIcon()
-            throws PendingIntent.CanceledException {
-        final Icon icon = mock(Icon.class);
-        final Suggestion suggestion = new Suggestion.Builder("pkg1")
-            .setPendingIntent(mock(PendingIntent.class))
-            .setIcon(icon)
-            .build();
-        final List<Suggestion> suggestions = new ArrayList<>();
-        suggestions.add(suggestion);
-        mSuggestionAdapter = new SuggestionAdapter(mActivity, mSuggestionControllerMixin,
-            null /* savedInstanceState */, null /* callback */, null /* lifecycle */);
-        mSuggestionAdapter.setSuggestions(suggestions);
-        mSuggestionHolder = mSuggestionAdapter.onCreateViewHolder(
-            new FrameLayout(RuntimeEnvironment.application),
-            mSuggestionAdapter.getItemViewType(0));
-        IconCache cache = mock(IconCache.class);
-        final Drawable drawable = mock(Drawable.class);
-        when(cache.getIcon(icon)).thenReturn(drawable);
-        ReflectionHelpers.setField(mSuggestionAdapter, "mCache", cache);
-
-        mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
-
-        verify(drawable, never()).setTint(anyInt());
-    }
-
-    @Test
-    public void onBindViewHolder_iconTintable_shouldTintIcon()
-            throws PendingIntent.CanceledException {
+    public void onBindViewHolder_shouldTintIcon() throws PendingIntent.CanceledException {
         final Icon icon = mock(Icon.class);
         final int FLAG_ICON_TINTABLE = 1 << 1;
         final Suggestion suggestion = new Suggestion.Builder("pkg1")
             .setPendingIntent(mock(PendingIntent.class))
             .setIcon(icon)
-            .setFlags(FLAG_ICON_TINTABLE)
             .build();
         final List<Suggestion> suggestions = new ArrayList<>();
         suggestions.add(suggestion);
@@ -309,23 +279,12 @@
     }
 
     @Test
-    public void setCardLayout_oneCard_shouldSetCardWidthToMatchParent() {
-        final List<Suggestion> suggestions = makeSuggestions("pkg1");
-        setupSuggestions(mContext, suggestions);
-
-        mConfig.setCardLayout(mSuggestionHolder, 1, 0);
-
-        assertThat(mSuggestionHolder.itemView.getLayoutParams().width)
-            .isEqualTo(LinearLayout.LayoutParams.MATCH_PARENT);
-    }
-
-    @Test
     public void setCardLayout_twoCards_shouldSetCardWidthToHalfScreenMinusPadding() {
         final List<Suggestion> suggestions = makeSuggestions("pkg1");
         setupSuggestions(mContext, suggestions);
         doReturn(200).when(mConfig).getScreenWidth();
 
-        mConfig.setCardLayout(mSuggestionHolder, 2, 0);
+        mConfig.setCardLayout(mSuggestionHolder, 0);
 
         /*
          * card width = (screen width - left margin - inner margin - right margin) / 2
@@ -335,17 +294,6 @@
         assertThat(mSuggestionHolder.itemView.getLayoutParams().width).isEqualTo(75);
     }
 
-
-    @Test
-    public void setCardLayout_multipleCards_shouldSetCardWidthFromResource() {
-        final List<Suggestion> suggestions = makeSuggestions("pkg1");
-        setupSuggestions(mContext, suggestions);
-
-        mConfig.setCardLayout(mSuggestionHolder, 3, 0);
-
-        assertThat(mSuggestionHolder.itemView.getLayoutParams().width).isEqualTo(120);
-    }
-
     private void setupSuggestions(Context context, List<Suggestion> suggestions) {
         mSuggestionAdapter = new SuggestionAdapter(context, mSuggestionControllerMixin,
             null /* savedInstanceState */, null /* callback */, null /* lifecycle */);
diff --git a/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java
new file mode 100644
index 0000000..e520a7b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java
@@ -0,0 +1,83 @@
+/*
+ * 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.datausage;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import com.android.settings.TestConfig;
+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)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class CellDataPreferenceTest {
+
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private SubscriptionInfo mSubInfo;
+
+    private Context mContext;
+    private PreferenceViewHolder mHolder;
+    private CellDataPreference mPreference;
+    private SubscriptionManager.OnSubscriptionsChangedListener mListener;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+        mPreference = new CellDataPreference(mContext, null);
+        mListener = mPreference.mOnSubscriptionsChangeListener;
+
+        LayoutInflater inflater = LayoutInflater.from(mContext);
+        final View view = inflater.inflate(mPreference.getLayoutResource(),
+                new LinearLayout(mContext), false);
+
+        mHolder = PreferenceViewHolder.createInstanceForTests(view);
+    }
+
+    @Test
+    public void noActiveSub_shouldDisable() {
+        mPreference.mSubscriptionManager = mSubscriptionManager;
+        mListener.onSubscriptionsChanged();
+        assertThat(mPreference.isEnabled()).isFalse();
+
+        when(mSubscriptionManager.getActiveSubscriptionInfo(anyInt()))
+                .thenReturn(mSubInfo);
+        mListener.onSubscriptionsChanged();
+        assertThat(mPreference.isEnabled()).isTrue();
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java
index 15df916..f4c4c6f 100644
--- a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java
@@ -119,20 +119,6 @@
         verify(mController).updateState(mPreference);
     }
 
-    @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
-
-    @Test
-    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
-        mController.onDeveloperOptionsSwitchDisabled();
-
-        verify(mPreference).setEnabled(false);
-    }
-
     static class AbstractBluetoothA2dpPreferenceControllerImpl extends
             AbstractBluetoothA2dpPreferenceController {
 
diff --git a/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java
index ddcd850..cc3a567 100644
--- a/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java
@@ -79,14 +79,6 @@
     }
 
     @Test
-    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
-        when(mUserManager.isAdminUser()).thenReturn(true);
-        mController.onDeveloperOptionsEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
-
-    @Test
     public void onAdbDialogConfirmed_shouldEnableAdbSetting() {
         mController.onAdbDialogConfirmed();
         final int mode = Settings.System.getInt(mContext.getContentResolver(),
diff --git a/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java
index e23c4cc..4b7d2a2 100644
--- a/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java
@@ -114,11 +114,4 @@
         verify(mPreference).setChecked(false);
         verify(mPreference).setEnabled(false);
     }
-
-    @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java
index 5acaf0a..4b6eece 100644
--- a/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java
@@ -126,11 +126,4 @@
         verify(mWindowManager).setAnimationScale(ANIMATOR_DURATION_SCALE_SELECTOR, DEFAULT_VALUE);
         verify(mPreference).setEnabled(false);
     }
-
-    @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() throws RemoteException {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java
index 15c84b5..ce2e03e 100644
--- a/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java
@@ -113,11 +113,4 @@
         verify(mPreference).setChecked(false);
         verify(mPreference).setEnabled(false);
     }
-
-    @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java
index b384cd0..fc36577 100644
--- a/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java
@@ -124,13 +124,6 @@
     }
 
     @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
-
-    @Test
     public void onDeveloperOptionsSwitchDisabled_shouldDisableAndResetPreference()
             throws RemoteException {
         mController.onDeveloperOptionsSwitchDisabled();
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java
index 09e6e9c..02cf13f 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java
@@ -114,11 +114,4 @@
         verify(mPreference).setEnabled(false);
         verify(mPreference).setChecked(false);
     }
-
-    @Test
-    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java
index 07d0e50..1df4339 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java
@@ -129,18 +129,4 @@
         verify(mPreference).setValue(mListValues[0]);
         verify(mPreference).setSummary(mListSummaries[0]);
     }
-
-    @Test
-    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
-        mController.onDeveloperOptionsSwitchDisabled();
-
-        verify(mPreference).setEnabled(false);
-    }
-
-    @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothDelayReportsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothDelayReportsPreferenceControllerTest.java
index e8dfba3..a2d1ca5 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothDelayReportsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothDelayReportsPreferenceControllerTest.java
@@ -114,16 +114,4 @@
         assertThat(mPreference.isEnabled()).isFalse();
         assertThat(mPreference.isChecked()).isFalse();
     }
-
-    @Test
-    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsEnabled();
-
-        final boolean mode = SettingsShadowSystemProperties.getBoolean(
-                BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY, false /* default */);
-
-        assertThat(mode).isFalse();
-        assertThat(mPreference.isEnabled()).isTrue();
-        assertThat(mPreference.isChecked()).isFalse();
-    }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java
index 4e4d8fa..da7a415 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java
@@ -113,11 +113,4 @@
         verify(mPreference).setEnabled(false);
         verify(mPreference).setChecked(false);
     }
-
-    @Test
-    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothInbandRingingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothInbandRingingPreferenceControllerTest.java
index d0552ec..817b222 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothInbandRingingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothInbandRingingPreferenceControllerTest.java
@@ -128,11 +128,4 @@
         verify(mPreference).setEnabled(false);
         verify(mPreference).setChecked(false);
     }
-
-    @Test
-    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java
index 4fa991b..37ceaa2 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java
@@ -107,11 +107,4 @@
         verify(mPreference).setEnabled(false);
         verify(mPreference).setChecked(false);
     }
-
-    @Test
-    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java
index 7c8f318..b4202ce 100644
--- a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java
@@ -150,13 +150,6 @@
     }
 
     @Test
-    public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabled() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
-
-    @Test
     public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeEnabled() {
         mController.onDeveloperOptionsSwitchDisabled();
 
diff --git a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java
index c4be569..f7a763c 100644
--- a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java
@@ -173,16 +173,6 @@
     }
 
     @Test
-    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
-        SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true));
-        doReturn(true).when(mController).isAdminUser();
-        mController.displayPreference(mScreen);
-        mController.onDeveloperOptionsSwitchDisabled();
-
-        verify(mPreference).setEnabled(false);
-    }
-
-    @Test
     public void onClearAdbKeysConfirmed_shouldClearKeys() throws RemoteException {
         mController.onClearAdbKeysConfirmed();
 
diff --git a/tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerTest.java
index 5e99ec9..46c2e9a 100644
--- a/tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerTest.java
@@ -199,13 +199,6 @@
     }
 
     @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
-
-    @Test
     public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
         mController.onDeveloperOptionsSwitchDisabled();
 
diff --git a/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java
index 1362212..5284e1a 100644
--- a/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java
@@ -110,13 +110,6 @@
     }
 
     @Test
-    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
-
-    @Test
     @Config(qualifiers = "mcc999")
     public void isAvailable_shouldBeFalse() {
         assertThat(mController.isAvailable()).isFalse();
diff --git a/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java
index 2a35993..faba049 100644
--- a/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java
@@ -124,18 +124,4 @@
         verify(mPreference).setValue(mListValues[0]);
         verify(mPreference).setSummary(mListSummaries[0]);
     }
-
-    @Test
-    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
-        mController.onDeveloperOptionsSwitchDisabled();
-
-        verify(mPreference).setEnabled(false);
-    }
-
-    @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java
index 585fe51..cb90e6f 100644
--- a/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java
@@ -127,18 +127,4 @@
         verify(mPreference).setValue(mListValues[0]);
         verify(mPreference).setSummary(mListSummaries[0]);
     }
-
-    @Test
-    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
-        mController.onDeveloperOptionsSwitchDisabled();
-
-        verify(mPreference).setEnabled(false);
-    }
-
-    @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java
index 76efa90..3fd3e81 100644
--- a/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java
@@ -108,11 +108,4 @@
         verify(mPreference).setChecked(false);
     }
 
-    @Test
-    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
-
 }
diff --git a/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java
index b4e0755..dfba782 100644
--- a/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java
@@ -110,11 +110,4 @@
         verify(mPreference).setChecked(false);
     }
 
-    @Test
-    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
-
 }
diff --git a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java
index 64f7c8c..de7b87a 100644
--- a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java
@@ -21,6 +21,7 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -28,6 +29,7 @@
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
 import android.view.DisplayCutout;
 
 import com.android.settings.TestConfig;
@@ -126,18 +128,11 @@
     }
 
     @Test
-    public void onDeveloperOptionsSwitchEnabled() throws Exception {
-        mockCurrentOverlays();
-
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-        verify(mOverlayManager, never()).setEnabledExclusiveInCategory(any(), anyInt());
-    }
-
-    @Test
     public void onDeveloperOptionsSwitchDisabled() throws Exception {
         mockCurrentOverlays(ONE_ENABLED, TWO_DISABLED);
+        final PreferenceScreen screen = mock(PreferenceScreen.class);
+        when(screen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(screen);
 
         mController.onDeveloperOptionsSwitchDisabled();
 
diff --git a/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java
index 95fd111..c363fec 100644
--- a/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java
@@ -114,11 +114,4 @@
         verify(mPreference).setChecked(false);
         verify(mPreference).setEnabled(false);
     }
-
-    @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java
index 9cc5f61..5e96f3d 100644
--- a/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java
@@ -114,11 +114,4 @@
         verify(mPreference).setChecked(false);
         verify(mPreference).setEnabled(false);
     }
-
-    @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java
index 66060a8..64249a4 100644
--- a/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java
@@ -117,11 +117,4 @@
         verify(mPreference).setEnabled(false);
         verify(mPreference).setChecked(false);
     }
-
-    @Test
-    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java
index ca1ff08..f48e809 100644
--- a/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java
@@ -112,15 +112,4 @@
         verify(mPreference).setEnabled(false);
         verify(mPreference).setChecked(false);
     }
-
-    @Test
-    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsEnabled();
-
-        final boolean mode = SettingsShadowSystemProperties.getBoolean(
-                ForceMSAAPreferenceController.MSAA_PROPERTY, false /* default */);
-
-        assertThat(mode).isFalse();
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java
index b4a4212..212f9c4 100644
--- a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java
@@ -122,13 +122,6 @@
     }
 
     @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
-
-    @Test
     public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
         mController.onDeveloperOptionsSwitchDisabled();
 
diff --git a/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java
index ecb0da5..c8a95a8 100644
--- a/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java
@@ -113,15 +113,4 @@
         verify(mPreference).setEnabled(false);
         verify(mPreference).setChecked(false);
     }
-
-    @Test
-    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsEnabled();
-
-        final boolean mode = SettingsShadowSystemProperties.getBoolean(
-                ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, false /* default */);
-
-        assertThat(mode).isFalse();
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java
index 9288df9..6d3b9b7 100644
--- a/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java
@@ -113,15 +113,4 @@
         verify(mPreference).setEnabled(false);
         verify(mPreference).setChecked(false);
     }
-
-    @Test
-    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsEnabled();
-
-        final boolean mode = SettingsShadowSystemProperties.getBoolean(
-                ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, false /* default */);
-
-        assertThat(mode).isFalse();
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java
index 8522b99..80382f0 100644
--- a/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java
@@ -127,11 +127,4 @@
         verify(mPreference, never()).setChecked(anyBoolean());
         verify(mPreference).setEnabled(false);
     }
-
-    @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java
index 434941c..486318a 100644
--- a/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java
@@ -147,18 +147,4 @@
         verify(mPreference).setValue(mValues[1]);
         verify(mPreference).setSummary(mSummaries[1]);
     }
-
-    @Test
-    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
-        mController.onDeveloperOptionsSwitchDisabled();
-
-        verify(mPreference).setEnabled(false);
-    }
-
-    @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java
index 02a5df6..a880d71 100644
--- a/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java
@@ -110,11 +110,4 @@
         verify(mPreference).setEnabled(false);
         verify(mPreference).setChecked(false);
     }
-
-    @Test
-    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java
index 57978a6..bc386b1 100644
--- a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.development;
 
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -63,7 +64,7 @@
         mContext = RuntimeEnvironment.application;
         mLifecycleOwner = () -> mLifecycle;
         mLifecycle = new Lifecycle(mLifecycleOwner);
-        mController = new LogPersistPreferenceController(mContext, mFragment, mLifecycle);
+        mController = spy(new LogPersistPreferenceController(mContext, mFragment, mLifecycle));
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
         SystemProperties.set("ro.debuggable", "1");
         mController.displayPreference(mScreen);
@@ -75,16 +76,9 @@
     }
 
     @Test
-    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+    public void onDeveloperOptionsSwitchDisabled_shouldResetLogOption() {
         mController.onDeveloperOptionsSwitchDisabled();
 
-        verify(mPreference).setEnabled(false);
-    }
-
-    @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
+        verify(mController).writeLogpersistOption(null, true);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java
index f7be653..a1a1581 100644
--- a/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java
@@ -87,11 +87,4 @@
         verify(mPreference).setSummary(mListSummaries[2]);
         verify(mPreference).setEnabled(false);
     }
-
-    @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java
index 01ed435..483aedd 100644
--- a/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java
@@ -98,13 +98,6 @@
     }
 
     @Test
-    public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabled() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
-
-    @Test
     public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeDisabled() {
         mController.onDeveloperOptionsSwitchDisabled();
         final int mode = Settings.System.getInt(mContext.getContentResolver(),
diff --git a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java
index 0aab0db..54c855f 100644
--- a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java
@@ -149,18 +149,4 @@
 
         assertThat(mController.handlePreferenceTreeClick(mPreference)).isFalse();
     }
-
-    @Test
-    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
-        mController.onDeveloperOptionsSwitchDisabled();
-
-        verify(mPreference).setEnabled(false);
-    }
-
-    @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java
index 5ad0329..e7a67a9 100644
--- a/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java
@@ -141,11 +141,4 @@
         verify(mPreference).setChecked(false);
         verify(mPreference).setEnabled(false);
     }
-
-    @Test
-    public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabled() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java
index c25faa9..a9ff56f 100644
--- a/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java
@@ -192,20 +192,6 @@
     }
 
     @Test
-    public void onDeveloperOptionsDisabled_preferenceShouldCheckRestriction() {
-        mController = spy(mController);
-        doReturn(true).when(mController).isOemUnlockedAllowed();
-        doReturn(false).when(mController).isOemUnlockAllowedByUserAndCarrier();
-        doReturn(false).when(mController).isBootloaderUnlocked();
-        when(mPreference.isEnabled()).thenReturn(true);
-
-        mController.onDeveloperOptionsDisabled();
-
-        verify(mPreference).checkRestrictionAndSetDisabled(UserManager.DISALLOW_FACTORY_RESET);
-
-    }
-
-    @Test
     public void onOemUnlockConfirmed_oemManagerShouldSetUnlockAllowedByUser() {
         mController.onOemUnlockConfirmed();
 
diff --git a/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java
index 6a6cd2c..5222d19 100644
--- a/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java
@@ -111,13 +111,6 @@
     }
 
     @Test
-    public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabled() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
-
-    @Test
     public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeEnabled() {
         mController.onDeveloperOptionsSwitchDisabled();
 
diff --git a/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java
index 8175110..67009df 100644
--- a/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java
@@ -127,18 +127,4 @@
         verify(mPreference).setValue(mListValues[0]);
         verify(mPreference).setSummary(mListSummaries[0]);
     }
-
-    @Test
-    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
-        mController.onDeveloperOptionsSwitchDisabled();
-
-        verify(mPreference).setEnabled(false);
-    }
-
-    @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java
index 1289aec..a849b7b 100644
--- a/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java
@@ -114,11 +114,4 @@
         verify(mPreference).setChecked(false);
         verify(mPreference).setEnabled(false);
     }
-
-    @Test
-    public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabled() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java
index 808e2a7..bb26fb5 100644
--- a/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java
@@ -106,13 +106,6 @@
     }
 
     @Test
-    public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabled() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
-
-    @Test
     public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeEnabled() {
         mController = spy(mController);
         doNothing().when(mController).updateLocales();
diff --git a/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java
index 485e441..91a0b3c 100644
--- a/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java
@@ -138,11 +138,4 @@
         verify(mPreference).setValue(mListValues[0]);
         verify(mPreference).setSummary(mListSummaries[0]);
     }
-
-    @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java
index 03f4972..8ede652 100644
--- a/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java
@@ -128,13 +128,6 @@
     }
 
     @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
-
-    @Test
     public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
         mController.onDeveloperOptionsSwitchDisabled();
 
diff --git a/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java
index c691b55..6779511 100644
--- a/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java
@@ -115,13 +115,6 @@
     }
 
     @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        assertThat(mPreference.isEnabled()).isTrue();
-    }
-
-    @Test
     public void onShowFirstCrashDialogGlobalOff_shouldEnablePreference() {
         Settings.Global.putInt(mContext.getContentResolver(),
                 Settings.Global.SHOW_FIRST_CRASH_DIALOG, SETTING_VALUE_OFF);
diff --git a/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java
index 2eb1070..bfe72c6 100644
--- a/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java
@@ -117,11 +117,4 @@
         verify(mPreference).setEnabled(false);
         verify(mPreference).setChecked(false);
     }
-
-    @Test
-    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java
index 32768b6..c1c110e 100644
--- a/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java
@@ -127,11 +127,4 @@
         verify(mPreference).setChecked(false);
         verify(mPreference).setEnabled(false);
     }
-
-    @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java
index 40e2fbd..3db3cba 100644
--- a/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java
@@ -107,13 +107,6 @@
     }
 
     @Test
-    public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabled() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
-
-    @Test
     public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeEnabled() {
         mController.onDeveloperOptionsSwitchDisabled();
 
diff --git a/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java
index 23c6e4c..21b70f5 100644
--- a/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java
@@ -164,11 +164,4 @@
         assertThat(settingValue).isEqualTo(SETTING_VALUE_OFF);
         verify(mPreference).setEnabled(false);
     }
-
-    @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java
index 41b9fde..9cdbf25 100644
--- a/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java
@@ -147,11 +147,4 @@
         verify(mPreference).setEnabled(false);
         verify(mPreference).setChecked(false);
     }
-
-    @Test
-    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java
index 0f839c1..d21161c 100644
--- a/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java
@@ -117,11 +117,4 @@
         verify(mPreference).setChecked(false);
         verify(mPreference).setEnabled(false);
     }
-
-    @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldTurnOnPreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java
index e044f2a..26e1fcb 100644
--- a/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java
@@ -109,11 +109,4 @@
         verify(mPreference).setEnabled(false);
         verify(mPreference).setChecked(false);
     }
-
-    @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java
index e8f9980..ebff811 100644
--- a/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java
@@ -128,11 +128,4 @@
                 DEFAULT_VALUE);
         verify(mPreference).setEnabled(false);
     }
-
-    @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() throws RemoteException {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java
index 4b7e82b..2df917d 100644
--- a/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java
@@ -104,13 +104,6 @@
     }
 
     @Test
-    public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabled() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
-
-    @Test
     public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeEnabled() {
         mController.onDeveloperOptionsSwitchDisabled();
 
diff --git a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java
index e396ebe..2fdd935 100644
--- a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java
@@ -200,12 +200,4 @@
 
         assertThat(mode).isEqualTo(VerifyAppsOverUsbPreferenceController.SETTING_VALUE_OFF);
     }
-
-    @Test
-    public void onDeveloperOptionsEnabled_shouldUpdateState() {
-        mController = spy(mController);
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mController).updateState(mPreference);
-    }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java
index e1d96d1..1896ba6 100644
--- a/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java
@@ -192,11 +192,4 @@
         verify(mPreference).setChecked(false);
         verify(mPreference).setEnabled(false);
     }
-
-    @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java
index c2727cc..0158b13 100644
--- a/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java
@@ -92,18 +92,4 @@
 
         verify(mPreference).setSummary(R.string.app_list_preference_none);
     }
-
-    @Test
-    public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeDisabled() {
-        mController.onDeveloperOptionsSwitchDisabled();
-
-        verify(mPreference).setEnabled(false);
-    }
-
-    @Test
-    public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabled() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java
index 9a80c5c..390f261 100644
--- a/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java
@@ -113,13 +113,6 @@
     }
 
     @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        assertThat(mPreference.isEnabled()).isTrue();
-    }
-
-    @Test
     public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
         mController.onDeveloperOptionsSwitchDisabled();
 
diff --git a/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java
index c049bc1..d14fb1e 100644
--- a/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java
@@ -109,11 +109,4 @@
         verify(mPreference).setEnabled(false);
         verify(mPreference).setChecked(false);
     }
-
-    @Test
-    public void onDeveloperOptionsEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java
index f8a9b87..4b71767 100644
--- a/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java
@@ -91,13 +91,6 @@
     }
 
     @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
-
-    @Test
     public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
         mController.onDeveloperOptionsSwitchDisabled();
 
diff --git a/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java
index 0fbff3b..ba35e04 100644
--- a/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java
@@ -125,11 +125,4 @@
         verify(mWindowManager).setAnimationScale(WINDOW_ANIMATION_SCALE_SELECTOR, DEFAULT_VALUE);
         verify(mPreference).setEnabled(false);
     }
-
-    @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() throws RemoteException {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
index 68937b2..1ed691b 100644
--- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
@@ -20,13 +20,17 @@
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.os.Bundle;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
 
 import com.android.internal.app.ColorDisplayController;
 import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.applications.LayoutPreference;
 import com.android.settings.R;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -37,6 +41,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
@@ -145,4 +150,17 @@
         verify(mFragment).addPreferencesFromResource(R.xml.color_mode_settings);
     }
 
+    @Test
+    public void addStaticPreferences_shouldAddPreviewImage() {
+        PreferenceScreen mockPreferenceScreen = Mockito.mock(PreferenceScreen.class);
+        LayoutPreference mockPreview = Mockito.mock(LayoutPreference.class);
+
+        ArgumentCaptor<Preference> preferenceCaptor = ArgumentCaptor.forClass(Preference.class);
+
+        mFragment.configureAndInstallPreview(mockPreview, mockPreferenceScreen);
+        Mockito.verify(mockPreview, times(1)).setSelectable(false);
+        Mockito.verify(mockPreferenceScreen, times(1)).addPreference(preferenceCaptor.capture());
+
+        assertThat(preferenceCaptor.getValue()).isEqualTo(mockPreview);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/location/LocationSettingsTest.java b/tests/robotests/src/com/android/settings/location/LocationSettingsTest.java
new file mode 100644
index 0000000..acb2b84
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/location/LocationSettingsTest.java
@@ -0,0 +1,59 @@
+/*
+ * 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 android.os.Bundle;
+import com.android.settings.SettingsActivity;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.widget.SwitchBar;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class LocationSettingsTest {
+
+    @Mock
+    private SettingsActivity mActivity;
+    @Mock
+    private SwitchBar mSwitchBar;
+
+    private LocationSettings mLocationSettings;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mLocationSettings = spy(new LocationSettings());
+        doReturn(mActivity).when(mLocationSettings).getActivity();
+        doReturn(mSwitchBar).when(mActivity).getSwitchBar();
+    }
+
+    @Test
+    public void onActivityCreated_shouldShowSwitchBar() {
+        mLocationSettings.onActivityCreated(new Bundle());
+
+        verify(mSwitchBar).show();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java
index 4410d6f..88c243b 100644
--- a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java
@@ -71,19 +71,17 @@
     }
 
     @Test
-    public void onStart_shouldShowSwitchBarAndAddOnSwitchChangeListener() {
+    public void onStart_shouldAddOnSwitchChangeListener() {
         mController.onStart();
 
-        verify(mSwitchBar).show();
         verify(mSwitchBar).addOnSwitchChangeListener(mController);
     }
 
     @Test
-    public void onStop_shouldHideSwitchBarAndRemoveOnSwitchChangeListener() {
+    public void onStop_shouldRemoveOnSwitchChangeListener() {
         mController.onStart();
         mController.onStop();
 
-        verify(mSwitchBar).hide();
         verify(mSwitchBar).removeOnSwitchChangeListener(mController);
     }
 
diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java
index 1bacd5b..3c90989 100644
--- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java
@@ -86,7 +86,7 @@
         mController = spy(new RecentLocationRequestPreferenceController(
                 mContext, mFragment, mLifecycle, mRecentLocationApps));
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mCategory);
-        when(mScreen.findPreference(mController.KEY_SEE_ALL)).thenReturn(mSeeAllButton);
+        when(mScreen.findPreference(mController.KEY_SEE_ALL_BUTTON)).thenReturn(mSeeAllButton);
         final String key = mController.getPreferenceKey();
         when(mCategory.getKey()).thenReturn(key);
         when(mCategory.getContext()).thenReturn(mContext);
diff --git a/tests/robotests/src/com/android/settings/slices/FakePreferenceController.java b/tests/robotests/src/com/android/settings/slices/FakePreferenceController.java
index f62380f..6c861db 100644
--- a/tests/robotests/src/com/android/settings/slices/FakePreferenceController.java
+++ b/tests/robotests/src/com/android/settings/slices/FakePreferenceController.java
@@ -30,4 +30,9 @@
     public int getAvailabilityStatus() {
         return AVAILABLE;
     }
+
+    @Override
+    public int getSliceType() {
+        return SliceData.SliceType.SLIDER;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
index 1d0ac41..98a7d6c 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
@@ -90,5 +90,6 @@
         assertThat(fakeSlice.getUri()).isNull();
         assertThat(fakeSlice.getFragmentClassName()).isEqualTo(fakeFragmentClassName);
         assertThat(fakeSlice.getPreferenceController()).isEqualTo(fakeControllerName);
+        assertThat(fakeSlice.getSliceType()).isEqualTo(SliceData.SliceType.SLIDER);
     }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/slices/SliceDataTest.java b/tests/robotests/src/com/android/settings/slices/SliceDataTest.java
index 82183e4..ee6fe96 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceDataTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceDataTest.java
@@ -40,6 +40,7 @@
     private final int ICON = 1234; // I declare a thumb war
     private final Uri URI = Uri.parse("content://com.android.settings.slices/test");
     private final String PREF_CONTROLLER = "com.android.settings.slices.tester";
+    private final int SLICE_TYPE = SliceData.SliceType.SWITCH;
 
     @Test
     public void testBuilder_buildsMatchingObject() {
@@ -51,7 +52,8 @@
                 .setIcon(ICON)
                 .setFragmentName(FRAGMENT_NAME)
                 .setUri(URI)
-                .setPreferenceControllerClassName(PREF_CONTROLLER);
+                .setPreferenceControllerClassName(PREF_CONTROLLER)
+                .setSliceType(SLICE_TYPE);
 
         SliceData data = builder.build();
 
@@ -63,6 +65,7 @@
         assertThat(data.getFragmentClassName()).isEqualTo(FRAGMENT_NAME);
         assertThat(data.getUri()).isEqualTo(URI);
         assertThat(data.getPreferenceController()).isEqualTo(PREF_CONTROLLER);
+        assertThat(data.getSliceType()).isEqualTo(SLICE_TYPE);
     }
 
     @Test(expected = IllegalStateException.class)
diff --git a/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java b/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java
new file mode 100644
index 0000000..bd4c558
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.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.wifi;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+
+import android.app.AppOpsManager;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+import com.android.settingslib.applications.ApplicationsState.AppFilter;
+
+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)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AppStateChangeWifiStateBridgeTest {
+
+    @Mock
+    private AppEntry mEntry;
+    @Mock
+    private AppStateChangeWifiStateBridge.WifiSettingsState mState;
+    private Context mContext;
+    private AppFilter mFilter;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+        mFilter = AppStateChangeWifiStateBridge.FILTER_CHANGE_WIFI_STATE;
+    }
+
+    @Test
+    public void testFilterApp_inputNull_returnFalse() {
+        assertThat(mFilter.filterApp(null)).isFalse();
+    }
+
+    @Test
+    public void testFilterApp_extraInfoNull_returnFalse() {
+        mEntry.extraInfo = null;
+        assertThat(mFilter.filterApp(mEntry)).isFalse();
+    }
+
+    @Test
+    public void testFilterApp_permissionedDeclaredTrue_returnTrue() {
+        mState.permissionDeclared = true;
+        mEntry.extraInfo = mState;
+        assertThat(mFilter.filterApp(mEntry)).isTrue();
+    }
+
+    @Test
+    public void testFilterApp_permissionedDeclaredFalse_returnFalse() {
+        mState.permissionDeclared = false;
+        mEntry.extraInfo = mState;
+        assertThat(mFilter.filterApp(mEntry)).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java b/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java
new file mode 100644
index 0000000..4a8bbef
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java
@@ -0,0 +1,93 @@
+/**
+ * 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.wifi;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+
+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)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ChangeWifiStateDetailsTest {
+    private static final String PACKAGE_NAME = "app";
+    private FakeFeatureFactory mFeatureFactory;
+    private ChangeWifiStateDetails mFragment;
+    private Context mContext;
+
+    @Mock
+    private AppEntry mAppEntry;
+    @Mock
+    private AppStateChangeWifiStateBridge.WifiSettingsState mState;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+        mFeatureFactory = FakeFeatureFactory.setupForTest();
+        mFragment = new ChangeWifiStateDetails();
+    }
+
+    @Test
+    public void testLogSpecialPermissionChange_setTrue_returnAllow() {
+        mFragment.logSpecialPermissionChange(true /*newState*/, PACKAGE_NAME);
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
+                eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_ALLOW),
+                eq(PACKAGE_NAME));
+    }
+
+    @Test
+    public void testLogSpecialPermissionChange_setFalse_returnDeny() {
+        mFragment.logSpecialPermissionChange(false /*newState*/, PACKAGE_NAME);
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
+                eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_DENY),
+                eq(PACKAGE_NAME));
+    }
+
+    @Test
+    public void testGetSummary_permissibleTrue_returnAllowed() {
+        when(mState.isPermissible()).thenReturn(true);
+        assertThat(mFragment.getSummary(mContext, mState)).isEqualTo(
+                mContext.getString(R.string.app_permission_summary_allowed));
+    }
+
+    @Test
+    public void testGetSummary_permissibleFalse_returnNotAllowed() {
+        when(mState.isPermissible()).thenReturn(false);
+        assertThat(mFragment.getSummary(mContext, mState)).isEqualTo(
+                mContext.getString(R.string.app_permission_summary_not_allowed));
+    }
+}
diff --git a/tests/unit/AndroidManifest.xml b/tests/unit/AndroidManifest.xml
index eccbac3..0563753 100644
--- a/tests/unit/AndroidManifest.xml
+++ b/tests/unit/AndroidManifest.xml
@@ -26,6 +26,7 @@
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
     <uses-permission android:name="android.permission.UPDATE_APP_OPS_STATS" />
+    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
 
     <application>
         <uses-library android:name="android.test.runner" />
diff --git a/tests/unit/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java b/tests/unit/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java
new file mode 100644
index 0000000..886f4f0
--- /dev/null
+++ b/tests/unit/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java
@@ -0,0 +1,141 @@
+/*
+ * 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.accessibility;
+
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.collection.IsIn.oneOf;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.ViewMatchers.hasDescendant;
+import static android.support.test.espresso.matcher.ViewMatchers.isChecked;
+import static android.support.test.espresso.matcher.ViewMatchers.isNotChecked;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static android.support.test.espresso.matcher.ViewMatchers.withParent;
+
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.content.Context;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.widget.CompoundButton;
+
+import com.android.settings.R;
+import com.android.settings.Settings.AccessibilitySettingsActivity;
+import com.android.settings.core.InstrumentedPreferenceFragment;
+import com.android.settings.core.SubSettingLauncher;
+
+import org.hamcrest.Matcher;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class AccessibilityShortcutPreferenceFragmentTest {
+    @Rule
+    public final ActivityTestRule<AccessibilitySettingsActivity> mActivityRule =
+            new ActivityTestRule<>(AccessibilitySettingsActivity.class, true);
+
+    private final Instrumentation mInstrumentation = InstrumentationRegistry.getInstrumentation();
+    private AccessibilityShortcutPreferenceFragment mAccessibilityShortcutPreferenceFragment;
+    private AccessibilitySettingsActivity mActivity;
+
+    @Before
+    public void setUp() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    @Test
+    public void lockScreenPreference_defaultBeforeDialogShown_isOff() {
+        setDialogShown(false);
+        setOnLockscreen(null);
+        startFragment();
+        assertLockscreenSwitchIsCheckedIs(false);
+    }
+
+    @Test
+    public void lockScreenPreference_setOnBeforeDialogShown_isOn() {
+        setDialogShown(false);
+        setOnLockscreen(true);
+        startFragment();
+        assertLockscreenSwitchIsCheckedIs(true);
+    }
+
+    @Test
+    public void lockScreenPreference_defaultAfterDialogShown_isOn() {
+        setDialogShown(true);
+        setOnLockscreen(null);
+        startFragment();
+        assertLockscreenSwitchIsCheckedIs(true);
+    }
+
+    @Test
+    public void lockScreenPreference_setOffAfterDialogShown_isOn() {
+        setDialogShown(true);
+        setOnLockscreen(false);
+        startFragment();
+        assertLockscreenSwitchIsCheckedIs(false);
+    }
+
+    private void startFragment() {
+        mInstrumentation.runOnMainSync(() -> {
+            new SubSettingLauncher(mActivity)
+                    .setDestination(AccessibilityShortcutPreferenceFragment.class.getName())
+                    .setArguments(new Bundle())
+                    .setSourceMetricsCategory(
+                            InstrumentedPreferenceFragment.METRICS_CATEGORY_UNKNOWN)
+                    .launch();
+        });
+    }
+
+    private void setDialogShown(boolean shown) {
+        Settings.Secure.putInt(mActivity.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN, shown ? 1 : 0);
+    }
+
+    private void setOnLockscreen(Boolean onLockscreen) {
+        if (onLockscreen == null) {
+            Settings.Secure.putString(mActivity.getContentResolver(),
+                    Settings.Secure.ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN, null);
+        } else {
+            Settings.Secure.putInt(mActivity.getContentResolver(),
+                    Settings.Secure.ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN, onLockscreen ? 1 : 0);
+        }
+    }
+
+    private void assertLockscreenSwitchIsCheckedIs(boolean isChecked) {
+        // Identify the switch by looking for a grandparent that has a descendent with the
+        // switch label. To disambiguate, make sure that grandparent doesn't also have a descendant
+        // with the title of the main switch
+        final String lockScreenSwitchTitle =
+                mActivity.getString(R.string.accessibility_shortcut_service_on_lock_screen_title);
+        final String mainSwitchTitle =
+                mActivity.getString(R.string.accessibility_service_master_switch_title);
+        Matcher isCheckedMatcher = (isChecked) ? isChecked() : isNotChecked();
+        Matcher hasLockScreenTitleDescendant = hasDescendant(withText(lockScreenSwitchTitle));
+        Matcher noMainSwitchTitleDescendant = not(hasDescendant(withText(mainSwitchTitle)));
+        onView(allOf(withParent(withParent(allOf(
+                hasLockScreenTitleDescendant, noMainSwitchTitleDescendant))),
+                instanceOf(CompoundButton.class))).check(matches(isCheckedMatcher));
+    }
+}
diff --git a/tests/unit/src/com/android/settings/core/SettingsGatewayTest.java b/tests/unit/src/com/android/settings/core/SettingsGatewayTest.java
index abce2c8..ed49b2e 100644
--- a/tests/unit/src/com/android/settings/core/SettingsGatewayTest.java
+++ b/tests/unit/src/com/android/settings/core/SettingsGatewayTest.java
@@ -16,44 +16,101 @@
 
 package com.android.settings.core;
 
+import static android.content.pm.PackageManager.GET_ACTIVITIES;
+import static android.content.pm.PackageManager.GET_META_DATA;
+import static android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS;
+import static com.android.settings.SettingsActivity.META_DATA_KEY_FRAGMENT_CLASS;
+import static com.google.common.truth.Truth.assertThat;
+import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertFalse;
+
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.os.Bundle;
+import android.platform.test.annotations.Presubmit;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.settings.core.gateway.SettingsGateway;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertFalse;
-
 @SmallTest
 @RunWith(AndroidJUnit4.class)
 public class SettingsGatewayTest {
 
     private static final String TAG = "SettingsGatewayTest";
 
+    private Context mContext;
+    private PackageManager mPackageManager;
+    private String mPackageName;
+
+    @Before
+    public void setUp() {
+        mContext = InstrumentationRegistry.getTargetContext();
+        mPackageManager = mContext.getPackageManager();
+        mPackageName = mContext.getPackageName();
+    }
+
     @Test
+    @Presubmit
     public void allRestrictedActivityMustBeDefinedInManifest() {
-        final Context context = InstrumentationRegistry.getTargetContext();
-        final PackageManager packageManager = context.getPackageManager();
-        final String packageName = context.getPackageName();
         for (String className : SettingsGateway.SETTINGS_FOR_RESTRICTED) {
             final Intent intent = new Intent();
-            intent.setComponent(new ComponentName(packageName, className));
-            List<ResolveInfo> resolveInfos = packageManager.queryIntentActivities(intent,
-                    PackageManager.MATCH_DISABLED_COMPONENTS);
-            Log.d(TAG, packageName + "/" + className + "; resolveInfo size: "
+            intent.setComponent(new ComponentName(mPackageName, className));
+            List<ResolveInfo> resolveInfos = mPackageManager.queryIntentActivities(intent,
+                    MATCH_DISABLED_COMPONENTS);
+            Log.d(TAG, mPackageName + "/" + className + "; resolveInfo size: "
                     + resolveInfos.size());
             assertFalse(className + " is not-defined in manifest", resolveInfos.isEmpty());
         }
     }
+
+    @Test
+    @Presubmit
+    public void publicFragmentMustAppearInSettingsGateway()
+            throws PackageManager.NameNotFoundException {
+        final List<String> whitelistedFragment = new ArrayList<>();
+        final StringBuilder error = new StringBuilder();
+
+        for (String fragment : SettingsGateway.ENTRY_FRAGMENTS) {
+            whitelistedFragment.add(fragment);
+        }
+        final PackageInfo pi = mPackageManager.getPackageInfo(mPackageName,
+                GET_META_DATA | MATCH_DISABLED_COMPONENTS | GET_ACTIVITIES);
+        final List<ActivityInfo> activities = Arrays.asList(pi.activities);
+
+        for (ActivityInfo activity : activities) {
+            final Bundle metaData = activity.metaData;
+            if (metaData == null || !metaData.containsKey(META_DATA_KEY_FRAGMENT_CLASS)) {
+                continue;
+            }
+            final String fragmentName = metaData.getString(META_DATA_KEY_FRAGMENT_CLASS);
+
+            assertThat(fragmentName).isNotNull();
+            if (!whitelistedFragment.contains(fragmentName)) {
+                error.append("SettingsGateway.ENTRY_FRAGMENTS must contain " + fragmentName
+                        + " because this fragment is used in manifest for " + activity.name)
+                        .append("\n");
+            }
+        }
+        final String message = error.toString();
+        if (!TextUtils.isEmpty(message)) {
+            fail(message);
+        }
+    }
 }